Merge branch 'main' into usd-integration
This commit is contained in:
+4
-4
@@ -6,11 +6,11 @@
|
||||
"id": "bR2IJtzSilBv"
|
||||
},
|
||||
"source": [
|
||||
"\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"# \u003ch1\u003e\u003ccenter\u003eLQR tutorial \u003ca href=\"https://colab.research.google.com/github/deepmind/mujoco/blob/main/python/LQR.ipynb\"\u003e\u003cimg src=\"https://colab.research.google.com/assets/colab-badge.svg\" width=\"140\" align=\"center\"/\u003e\u003c/a\u003e\u003c/center\u003e\u003c/h1\u003e\n",
|
||||
"# \u003ch1\u003e\u003ccenter\u003eLQR tutorial \u003ca href=\"https://colab.research.google.com/github/google-deepmind/mujoco/blob/main/python/LQR.ipynb\"\u003e\u003cimg src=\"https://colab.research.google.com/assets/colab-badge.svg\" width=\"140\" align=\"center\"/\u003e\u003c/a\u003e\u003c/center\u003e\u003c/h1\u003e\n",
|
||||
"\n",
|
||||
"This notebook provides an example of an LQR controller using [**MuJoCo** physics](https://github.com/deepmind/mujoco#readme).\n",
|
||||
"This notebook provides an example of an LQR controller using [**MuJoCo** physics](https://github.com/google-deepmind/mujoco#readme).\n",
|
||||
"\n",
|
||||
"**A Colab runtime with GPU acceleration is required.** If you're using a CPU-only runtime, you can switch using the menu \"Runtime \u003e Change runtime type\".\n"
|
||||
]
|
||||
@@ -153,7 +153,7 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"print('Getting MuJoCo humanoid XML description from GitHub:')\n",
|
||||
"!git clone https://github.com/deepmind/mujoco\n",
|
||||
"!git clone https://github.com/google-deepmind/mujoco\n",
|
||||
"with open('mujoco/model/humanoid/humanoid.xml', 'r') as f:\n",
|
||||
" xml = f.read()"
|
||||
]
|
||||
|
||||
+2
-2
@@ -8,7 +8,7 @@
|
||||
[pypi]: https://pypi.org/project/mujoco/
|
||||
|
||||
This package is the canonical Python bindings for the
|
||||
[MuJoCo physics engine](https://github.com/deepmind/mujoco).
|
||||
[MuJoCo physics engine](https://github.com/google-deepmind/mujoco).
|
||||
These bindings are developed and maintained by Google DeepMind, and is kept
|
||||
up-to-date with the latest developments in MuJoCo itself.
|
||||
|
||||
@@ -52,7 +52,7 @@ further detail on the package's API.
|
||||
|
||||
We recommend going through the tutorial notebook which covers the basics of
|
||||
MuJoCo using Python:
|
||||
[](https://colab.research.google.com/github/deepmind/mujoco/blob/main/python/tutorial.ipynb)
|
||||
[](https://colab.research.google.com/github/google-deepmind/mujoco/blob/main/python/tutorial.ipynb)
|
||||
|
||||
## Versioning
|
||||
|
||||
|
||||
+1
-1
@@ -354,7 +354,7 @@ SETUP_KWARGS = dict(
|
||||
description='MuJoCo Physics Simulator',
|
||||
long_description=get_long_description(),
|
||||
long_description_content_type='text/markdown',
|
||||
url='https://github.com/deepmind/mujoco',
|
||||
url='https://github.com/google-deepmind/mujoco',
|
||||
license='Apache License 2.0',
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
"id": "MpkYHwCqk7W-"
|
||||
},
|
||||
"source": [
|
||||
"\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"# \u003ch1\u003e\u003ccenter\u003eTutorial \u003ca href=\"https://colab.research.google.com/github/deepmind/mujoco/blob/main/python/tutorial.ipynb\"\u003e\u003cimg src=\"https://colab.research.google.com/assets/colab-badge.svg\" width=\"140\" align=\"center\"/\u003e\u003c/a\u003e\u003c/center\u003e\u003c/h1\u003e\n",
|
||||
"# \u003ch1\u003e\u003ccenter\u003eTutorial \u003ca href=\"https://colab.research.google.com/github/google-deepmind/mujoco/blob/main/python/tutorial.ipynb\"\u003e\u003cimg src=\"https://colab.research.google.com/assets/colab-badge.svg\" width=\"140\" align=\"center\"/\u003e\u003c/a\u003e\u003c/center\u003e\u003c/h1\u003e\n",
|
||||
"\n",
|
||||
"This notebook provides an introductory tutorial for [**MuJoCo** physics](https://github.com/deepmind/mujoco#readme), using the native Python bindings.\n",
|
||||
"This notebook provides an introductory tutorial for [**MuJoCo** physics](https://github.com/google-deepmind/mujoco#readme), using the native Python bindings.\n",
|
||||
"\n",
|
||||
"**A Colab runtime with GPU acceleration is required.** If you're using a CPU-only runtime, you can switch using the menu \"Runtime \u003e Change runtime type\".\n",
|
||||
"\n",
|
||||
@@ -198,7 +198,7 @@
|
||||
"source": [
|
||||
"## mjModel\n",
|
||||
"\n",
|
||||
"MuJoCo's `mjModel`, contains the *model description*, i.e., all quantities which *do not change over time*. The complete description of `mjModel` can be found at the end of the header file [`mjmodel.h`](https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjmodel.h). Note that the header files contain short, useful inline comments, describing each field.\n",
|
||||
"MuJoCo's `mjModel`, contains the *model description*, i.e., all quantities which *do not change over time*. The complete description of `mjModel` can be found at the end of the header file [`mjmodel.h`](https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjmodel.h). Note that the header files contain short, useful inline comments, describing each field.\n",
|
||||
"\n",
|
||||
"Examples of quantities that can be found in `mjModel` are `ngeom`, the number of geoms in the scene and `geom_rgba`, their respective colors:"
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user