Commit Graph

1433 Commits

Author SHA1 Message Date
Saran Tunyasuvunakool dc40bbd1f5 Refactor global object tables logic.
This unifies the implementation for plugins and resource providers.

PiperOrigin-RevId: 605617372
Change-Id: I2ea52b4c53f48c4c59edd5fdc1c51c7edba7340e
2024-02-09 06:50:06 -08:00
Alessio Quaglino 6fa139a693 Add mjmActuator and mjmSensor.
PiperOrigin-RevId: 605600704
Change-Id: I0a2f5eb9d894c068ca9ee08940c752066021b6ec
2024-02-09 05:11:13 -08:00
Alessio Quaglino e3cbad280c Add mjmJoint, mjmCamera, and mjmLight to C API.
PiperOrigin-RevId: 605596008
Change-Id: Ie53ac4b99f5336380039ab5eb9b2ca4a82768b28
2024-02-09 04:44:58 -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
Alessio Quaglino 1fe258fb60 Add mjmGeom to C API.
PiperOrigin-RevId: 605302719
Change-Id: Ib4208e60cf4299473a96f62db2c9dc8c7a5b0b36
2024-02-08 06:53:01 -08:00
Baruch Tabanpour 3baab3784a Update MJX notebook to work with brax 0.10.0.
PiperOrigin-RevId: 605105172
Change-Id: Icd209ada7977439ed7d5213588412d37dd54ffc0
2024-02-07 14:49:17 -08:00
Matthew Bennice e4fada1963 Correct use of uninitialized value and clean up FullInertia function
PiperOrigin-RevId: 605049375
Change-Id: I7ffb6bd56b08111036e8490bf767fb9393499f13
2024-02-07 11:38:02 -08:00
Erik Frey ea69f20b43 Unrolled matmul for small matrices in MJX improves steps/sec by 10-20%.
PiperOrigin-RevId: 605033188
Change-Id: I9da723d01e1f6511abaf4522b4c8f829a8091772
2024-02-07 10:48:45 -08:00
Alessio Quaglino 8b17d260a3 Add user_init for setting default parameters.
PiperOrigin-RevId: 604942840
Change-Id: I746ac7bb28f508b606bc0b8544136f523ce50d4c
2024-02-07 04:42:41 -08:00
Alessio Quaglino a3e49d582e Add mjmBody and mjmPlugin and their compiler C APIs.
PiperOrigin-RevId: 604937231
Change-Id: Ib8a2105ce6c0500d6a610258b46f192d9e73169d
2024-02-07 04:17:30 -08:00
Matthew Bennice b9c50ad79c Move fullinertia from mjCAlternative to mjCBody with correction to handle URDF with 0 inertias.
PiperOrigin-RevId: 604812870
Change-Id: I018254d1362a654a4f99bf5e621d5abc7129a0c6
2024-02-06 17:21:31 -08:00
Copybara-Service 19c41aa965 Merge pull request #1401 from driesmarzougui:main
PiperOrigin-RevId: 604771114
Change-Id: I9389828e9b588c22eb24a4074a23283943ca748d
2024-02-06 14:49:35 -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
Matthew Bennice 84f20ffb66 Automated g4 rollback of changelist 604607692.
*** Reason for rollback ***

breakage resulting in "inertia must have positive eigenvalues" when parsing URDF's

*** Original change description ***

Move fullinertia from mjCAlternative to mjCBody.

***

PiperOrigin-RevId: 604677400
Change-Id: Iab8263b5b0aee310bd75404e314f3b707ce3300e
2024-02-06 09:47:04 -08:00
Alessio Quaglino 737342bdfe Move fullinertia from mjCAlternative to mjCBody.
PiperOrigin-RevId: 604607692
Change-Id: Ic2fcc08b9073d01ab190e7acacc3d827dbdfbca4
2024-02-06 04:43:12 -08:00
Alessio Quaglino 01439f28b3 Add AddFreeJoint and remove isfree from AddJoint.
PiperOrigin-RevId: 604597442
Change-Id: I2fe03cf0f9a59b425080cc5cc12b236fea9c020d
2024-02-06 03:49:49 -08:00
Alessio Quaglino 3b2dd06c54 Add compiler C API for mjmSite.
PiperOrigin-RevId: 604573450
Change-Id: I6ba7fcece0942ddc0d109413ba5684b2df3fab96
2024-02-06 01:50:47 -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 f75923a48d Updated version numbers to cmake files
build / windows-2022 (push) Has been cancelled
build / macos-12 (push) Has been cancelled
build / ubuntu-20.04-clang-10 (push) Has been cancelled
build / ubuntu-20.04-clang-11 (push) Has been cancelled
build / ubuntu-20.04-clang-12 (push) Has been cancelled
build / ubuntu-22.04-clang-13 (push) Has been cancelled
build / ubuntu-22.04-clang-14 (push) Has been cancelled
build / ubuntu-22.04-gcc-10 (push) Has been cancelled
build / ubuntu-22.04-gcc-11 (push) Has been cancelled
build / ubuntu-22.04-gcc-12 (push) Has been cancelled
build / ubuntu-22.04-gcc-9 (push) Has been cancelled
PiperOrigin-RevId: 604406364
Change-Id: I85ab41b048fff9484c81e858c2bbcfeb6066fd4b
2024-02-05 12:55:30 -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
Nimrod Gileadi e3dc54f609 Emit only one warning about ARB_depth_buffer_float or ARB_clip_control.
This code was warning on every frame, which was unhelpful.

PiperOrigin-RevId: 604267726
Change-Id: Ied1d46e3d84d58f3b21201e3752e3c2d43ea3ba9
2024-02-05 03:36:23 -08:00
Yuval Tassa 2bbf5424e4 Improve option/actuatorgroupdisable documentation.
PiperOrigin-RevId: 604266156
Change-Id: I7fd112085fc46214173628db8ebfd295e13df342
2024-02-05 03:26:52 -08:00
Dries Marzougui ed36956b0d fix https://github.com/google-deepmind/mujoco/issues/1379 2024-02-05 10:59:08 +01: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
Copybara-Service 66a8bef6fa Merge pull request #1392 from alefram:fix-mj_forward-link
PiperOrigin-RevId: 604116464
Change-Id: If4de574e0206c46a98c03949e7123178be73f6c3
2024-02-04 09:49:27 -08:00
Yuval Tassa eb844a4b77 When computing suitable initial font scale for a display, let 250% be the maximum size. Workaround for #1274.
PiperOrigin-RevId: 603791510
Change-Id: I37aa3431dcaf42dae8daa77ed87e108ca4d78ea0
2024-02-02 14:41:12 -08:00
Alexis f3b48edf2b fix metadata and update mj_forward link 2024-02-02 18:26:32 -04:00
Alexis d8577bfc9a Revert "fix link of mj_forward on tutorial"
This reverts commit 40c0a91a40.
2024-02-02 17:39:44 -04:00
Alessio Quaglino 1ed8694dbe Replace xmlpos with info string for mjCError.
PiperOrigin-RevId: 603759456
Change-Id: I0d86d8e61e31a70da77169107268728d6c052778
2024-02-02 12:34:52 -08:00
Alessio Quaglino df76b55fe0 Add line error check to user_objects and xml_native_reader tests.
PiperOrigin-RevId: 603714614
Change-Id: Ic031f33a9a6eb45b3e61cb666e0d4890bfe08275
2024-02-02 09:57:49 -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 914a001753 Update UI when rendering flags are changed via user_scn.
PiperOrigin-RevId: 603679619
Change-Id: If094836f97c8086a7f70bd235b8c8cc8ab69c639
2024-02-02 07:16:37 -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
Alexis 40c0a91a40 fix link of mj_forward on tutorial 2024-02-01 23:28:40 -04:00
Alexis bfa359cb2e Revert "fix mj_forward link typo"
This reverts commit 9f006dccdb.
2024-02-01 23:25:56 -04:00
Alexis 9f006dccdb fix mj_forward link typo 2024-02-01 22:45:36 -04:00
Baruch Tabanpour 92c161a61b Add ncon to __init__.
PiperOrigin-RevId: 603468404
Change-Id: I20c622b8f6f84ecacb9f3cdd26ac9560cf2788be
2024-02-01 13:38:23 -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
Alessio Quaglino b3f93d436b Convert mjmStruct to a C-struct.
PiperOrigin-RevId: 603357871
Change-Id: I27918b0030fc6a589c361cad965611adc3bf7247
2024-02-01 06:57:47 -08:00
Alessio Quaglino 7a98038e88 Move mjCSite attributes to mjmSite struct.
PiperOrigin-RevId: 603051589
Change-Id: I31eeeccffa15b96e7393b8e64f6be8c964fc5948
2024-01-31 08:07:48 -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
Copybara-Service fae1f3e56d Merge pull request #1369 from Balint-H:feature/unity-events
PiperOrigin-RevId: 602671446
Change-Id: I7a21230152a0139e37f44578ca19ec5eaa02296e
2024-01-30 03:33:47 -08:00
Baruch Tabanpour 8be966cdf9 Avoid NaN in gradient of where. Fixes #1349.
PiperOrigin-RevId: 602461299
Change-Id: I7c976d3b7262027bdc63967dcc00674fb2802e70
2024-01-29 12:09:29 -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
Copybara-Service 4fe16dd44e Merge pull request #1353 from Balint-H:fix/unity-mesh-import
PiperOrigin-RevId: 602391543
Change-Id: I6d93c2beb672e8de7d5c9d17e77b4185dd137cb3
2024-01-29 08:13:04 -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