Commit Graph

601 Commits

Author SHA1 Message Date
Copybara-Service 2ba80206ab Merge pull request #1479 from jmargeta:fix-record-command-docs
PiperOrigin-RevId: 613927858
Change-Id: I8fe30db8677811c98ed4f881b51a0f430d93dd3b
2024-03-08 07:29:57 -08:00
Yuval Tassa b97110967f Add Performance Tuning section.
Fixes #1471.

PiperOrigin-RevId: 613867065
Change-Id: I947284300709e0fd6633068d9690a4b19812141f
2024-03-08 02:31:07 -08:00
Baruch Tabanpour 22cd96fbbc Speed up convex-convex collisions.
PiperOrigin-RevId: 613450874
Change-Id: Ie66e0a078e2ff51a136b949dd9459847e1fe957d
2024-03-06 21:48:51 -08:00
Jan Margeta 32dc89b425 Rename depthoverlay to adddepth 2024-03-06 21:17:43 +01:00
Jan Margeta f287372467 Add url to relevant offscreen buffer attributes 2024-03-06 19:46:51 +01:00
Jan Margeta 548177d46c Rename depthoverlay argument 2024-03-06 19:14:32 +01:00
Jan Margeta 39edea3a6c Add an explicit note on recording resolution 2024-03-06 19:01:25 +01:00
Jan Margeta be68f90190 Make depth overlay in video recording optional
Add docs for the record arguments
2024-03-06 18:47:14 +01:00
Jan Margeta fe2215384b Update docs on the video recordings's resolution
This fixes the the ffmpeg command to correspond to the default humanoid.xml resolution (2560x1440).
2024-03-06 18:47:14 +01:00
Meghha Dhoke 106453fa2b Updated version number to be (v3.1.4) ahead of current release (v3.1.3)
PiperOrigin-RevId: 613236845
Change-Id: I3ee759493f27cfa1e367c71e3e073b54738b73d4
2024-03-06 09:07:25 -08:00
Jan Margeta b475337e02 Update docs of ffmpeg raw video conversion
Makes it work well with the given humanoid example
2024-03-06 14:34:15 +01:00
Jan Margeta 8e0998dcbd Fix docs for the record command
Renames the non-existent "render" command to "record"
2024-03-06 01:36:13 +01:00
Meghha Dhoke eb2e064915 Updated version number to match the latest release v3.1.3 and date for mujoco release v3.1.3
PiperOrigin-RevId: 612899279
Change-Id: I891a2a86a3d03491210e1dc259549d6484041928
2024-03-05 10:55:21 -08:00
Copybara-Service 6b7d714291 Merge pull request #1450 from v-r-a:angmomMat
PiperOrigin-RevId: 612835207
Change-Id: I8e7b01cc433563556a3ae4bbdd0c53612cc15e97
2024-03-05 07:35:15 -08:00
Alessio Quaglino 49ddb7ca2e Update changelog for 3.1.0.
Fixes #1472.

PiperOrigin-RevId: 612787350
Change-Id: Ia5609266462b5d537ce0c03efa764f1f32bc9389
2024-03-05 04:13:52 -08:00
Yuval Tassa e142bca7f2 Remove special handling of mjModel and mjData strings in autogenerated functions.rst
PiperOrigin-RevId: 612714709
Change-Id: Ie6c139d2c41488cd19c9bf5152b912a51b2f3a34
2024-03-04 23:00:35 -08:00
Yuval Tassa 3d24bdb217 Small improvements to MJX performance tuning section.
PiperOrigin-RevId: 612377295
Change-Id: I542aba7a33372556b62e3cdb4bf0c1c4d97dc98a
2024-03-04 02:49:11 -08:00
Baruch Tabanpour 419be4c605 Add crude broadphase impl.
PiperOrigin-RevId: 611643683
Change-Id: Id7816dadd7e9f1b8855268b815353c61540c4e0c
2024-02-29 17:12:58 -08:00
Copybara-Service 789188d51d Merge pull request #1434 from traversaro:patch-32
PiperOrigin-RevId: 611046247
Change-Id: I05fa95c13c9c0a9bf5b6b50bb3d201ffbc556dd6
2024-02-28 03:30:02 -08:00
Baruch Tabanpour 2067e2083a Add cameras to MJX. Fixes #1422
PiperOrigin-RevId: 610870732
Change-Id: Iaa39bd00f56046c595dc961281ac23446ca5bdf2
2024-02-27 14:17:21 -08:00
Kyle Bayes a4a621f6e3 Add checksums (used as a timestamp) to VFS.
Deprecate mj_makeEmptyFileVFS in favor of mj_addBufferVFS.

PiperOrigin-RevId: 608915388
Change-Id: Id9e9b042799bc1bf547f0795ae6f386447d53cdd
2024-02-21 02:25:36 -08:00
Silvio Traversaro 8c63a8b8c7 Fix mjpResourceProvider example 2024-02-20 23:56:43 +01:00
Saran Tunyasuvunakool abf6d41b7f Fix incorrect data types in Python bindings of certain arrays.
The mismatch between the `py::array_t` template argument and the type of the MuJoCo struct member being wrapped caused the `py::array_t` to be constructed via an unintended constructor overload, which in turn triggered `use-after-poison` under asan.

This bug affected the `geom`, `flex`, `elem`, and `vert` arrays in `mjContact`, and all array members in `mjrContext`.

PiperOrigin-RevId: 608632860
Change-Id: Ic227f691041b004a0fcf0cb6fa3d62c44861d9aa
2024-02-20 09:26:19 -08:00
Nimrod Gileadi f1d4f8f0a1 Test that mj_resetDataKeyframe treats negative keyframe IDs as a normal reset.
PiperOrigin-RevId: 607655812
Change-Id: Ia9bb1031468f04e8f9563b9228a46983356dafef
2024-02-16 05:09:05 -08:00
Yuval Tassa 05150546e3 Add inheritrange attribute to position and intvelocity actuators.
PiperOrigin-RevId: 607650147
Change-Id: Ibc1846f89179786d4f93435c3924687b4c5d1432
2024-02-16 04:42:44 -08:00
Erik Frey 6a346c42e8 Adds support for mjOption.impratio to MJX.
PiperOrigin-RevId: 607456034
Change-Id: I7f6549a4332fd2bc0331d76a8906b971ce28dbcf
2024-02-15 14:28:36 -08:00
Yuval Tassa bafe490ea8 Sort assets in schema according to order in docs.
PiperOrigin-RevId: 607272771
Change-Id: Ifd1220671a59effd0a841babbe746dd23d02eefd
2024-02-15 03:10:43 -08:00
Erik Frey 47bb4a828e Fixes to the MJX Euler integrator and Newton solver, and test improvements to catch future bugs like this.
PiperOrigin-RevId: 606389094
Change-Id: I50d0143f338fe29a823c930dba82995ce8a64ce2
2024-02-12 15:46:27 -08:00
Yuval Tassa b6873ec8a2 Move mjModel.mesh_{pos,quat} before mesh_pathadr so all attributes related to original asset data are next to each other.
PiperOrigin-RevId: 606277473
Change-Id: Ia4f6df552192c8a2847126975b6a1a31df63cf65
2024-02-12 09:37:48 -08:00
Yuval Tassa 72cf304e2b Improve documentation of mesh pre-processing.
PiperOrigin-RevId: 606268723
Change-Id: I1d939cbb214036ab477e12ae3fd266a25ff89399
2024-02-12 09:04:18 -08:00
Kevin Zakka 4b8363de6d Update docs with new Menagerie models.
PiperOrigin-RevId: 606126764
Change-Id: I677e7860798e60b2b65d7054f60ad2bc5c4c05b1
2024-02-11 20:42:59 -08:00
Yuval Tassa 4ad1dc4b84 Mention the roles of "center" and "extent" in visual/global/{azimuth,elevation}. Fixes #1407.
PiperOrigin-RevId: 605649532
Change-Id: I0ca0142a3c164a502fefb6b91d204c4bb3d25a95
2024-02-09 09:22:50 -08:00
Erik Frey e77c3cb258 Update MJX viewer to use mjx.get_data_into and fix bad function parameters.
PiperOrigin-RevId: 605461208
Change-Id: I7a4f6a1ed92382e522d50224e7b5cd73d8842750
2024-02-08 16:32:27 -08:00
Erik Frey 4933a2c7b6 Improve performance of getting and putting MJX device data by reducing cost of ncon.
PiperOrigin-RevId: 605454760
Change-Id: I5c52a84c12ab67d042fe43f6ada284b51a762294
2024-02-08 16:06:58 -08:00
Erik Frey 3e2d62c248 Improve performance of getting and putting MJX device data with large numpy arrays.
ndarray.tobytes() is faster than converting arrays to tuples by orders of magnitude.

PiperOrigin-RevId: 605437697
Change-Id: I7d42c10e178b1aec80ff38a82e863e0701c15e62
2024-02-08 15:02:21 -08:00
Erik Frey 38cbc9e543 Improve MJX performance on NVIDIA GPU by enabling Triton GEMM.
PiperOrigin-RevId: 604691509
Change-Id: Iba11a9e1b79848624a1ef6eb4e61e2093d36e662
2024-02-06 10:31:49 -08:00
Meghha Dhoke f763254a00 Updating Mujoco Release version number to v3.1.3
PiperOrigin-RevId: 604459311
Change-Id: I766f704c28740cf751cb935bb48fb6954fccf024
2024-02-05 15:59:20 -08:00
Meghha Dhoke 81adba763e Update title - Version number and date to Version 3.1.2 (February 05, 2024)
PiperOrigin-RevId: 604371807
Change-Id: I55638fea18e05a322a99332f020f255be218c763
2024-02-05 11:04:33 -08:00
Nimrod Gileadi 41ad07c4ff Fix numbering in changelog.rst
PiperOrigin-RevId: 604347513
Change-Id: Id9dda4d6de2dc0a6175a8c6137a4b99b1ebe947e
2024-02-05 09:50:19 -08:00
Copybara-Service 55cbbd00af Merge pull request #1381 from ryanwhite04:patch-1
PiperOrigin-RevId: 604293006
Change-Id: Ic81506e82c11c789df95e688ca590769aa88d964
2024-02-05 05:57:19 -08:00
Yuval Tassa 2bbf5424e4 Improve option/actuatorgroupdisable documentation.
PiperOrigin-RevId: 604266156
Change-Id: I7fd112085fc46214173628db8ebfd295e13df342
2024-02-05 03:26:52 -08:00
Tom Erez ced37ffbb2 Add refsite to list of non-defaultable attributes.
PiperOrigin-RevId: 604195547
Change-Id: Id14b5b571e320f995a38d2ad16f3325c70d37d78
2024-02-04 20:47:23 -08:00
Saran Tunyasuvunakool fe57ae498f Fix typo and improve code snippet in documentation for user_scn.flags.
PiperOrigin-RevId: 603685657
Change-Id: Ia6af7a62db3d8955048fae4cbc30209bb1f7efd7
2024-02-02 07:50:38 -08:00
Saran Tunyasuvunakool 7bb0ce4211 [Python Viewer] Allow users to override rendering flags via user_scn.
Fixes #1190

PiperOrigin-RevId: 603672602
Change-Id: I3ff1bb0dca7e913b36f1b241aaea8b8bb95cadff
2024-02-02 06:39:08 -08:00
Yuval Tassa 58e9fb0baa Docs: fix link to slider-crank example model.
PiperOrigin-RevId: 603400948
Change-Id: I49e4a58ba0cd450950a35cccb749f04d34190cfc
2024-02-01 09:56:37 -08:00
Ryan White 38b441b777 Update XMLreference.rst
eq_active is a member of mjData, not mjModel
2024-01-31 19:45:19 +08:00
Baruch Tabanpour 508669a9f2 Raise not implemented for frictionloss for now. #1344
PiperOrigin-RevId: 602453907
Change-Id: I0ea506b54f96c4fadc0f29f9ed0a21b0b6a7e5d9
2024-01-29 11:45:36 -08:00
Yuval Tassa e143b3dbc0 Allow height-field elevation data to be specified in XML.
PiperOrigin-RevId: 602374498
Change-Id: I2d3364d68876a35799b24aca1051e2f5aebdda75
2024-01-29 06:59:28 -08:00
josephrocca e6847f843d Copybara import of the project:
--
18821cb87ded727ef38e1bac8ba8561b19632899 by josephrocca <1167575+josephrocca@users.noreply.github.com>:

Ellipsoid has 3 sizes rather than one

COPYBARA_INTEGRATE_REVIEW=https://github.com/google-deepmind/mujoco/pull/1374 from josephrocca:patch-1 18821cb87ded727ef38e1bac8ba8561b19632899
PiperOrigin-RevId: 602370557
Change-Id: I014226a1cbae926c8ad02f27b706fa0b3e8f2c8e
2024-01-29 06:39:53 -08:00
Yuval Tassa 70021a7236 Improve ordering of asset documentation, sort by category and usefulness.
- Old: texture, hfield, mesh, skin, material.
- New: mesh, hfield, skin, texture, material.

Rationale: First 3D assets, then surface assets. Mesh is the most common asset type. Materials reference textures so should come right after.
PiperOrigin-RevId: 602075615
Change-Id: I13e4404640184fb0717a442827cd76da31705648
2024-01-27 17:24:31 -08:00