chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,542 Commits 2 Branches 1 Tag
ff7c94de8a4c29884b988be4283ada43e8c18b6d
Commit Graph

754 Commits

Author SHA1 Message Date
Abhishek Joshi 8f247d5ed6 Merge branch 'google-deepmind:main' into usd-integration 2024-01-15 15:10:49 -05:00
Nimrod Gileadi ca023a6f28 Update EGL init code for Python 3.12. 
Fixes google-deepmind/mujoco#1299.

PiperOrigin-RevId: 595982512
Change-Id: Ib0261483a7f6cb8addf04f5010f09d3554c8bf45
 2024-01-05 06:50:55 -08:00
Kevin Zakka 1c7809e542 Free MjrContext in Renderer destructor. Fixes #1186. 
PiperOrigin-RevId: 595125644
Change-Id: I5dadc3508ec296ba8844fed2a8f5d2de7e53221d
 2024-01-02 08:38:46 -08:00
Yuval Tassa 4c066a26b5 Change mjVISSTRING of connect and weld equality constraints from "Constraint" to "Equality". This is more consistent with the 'E' shortcut key and with mjDISABLESTRING ("constraint" means all constraints, "equality" means bilateral constraints). 
Also remove unused ampersands from `mjVISSTRING` names, these are a remnant from a very old version of the UI framework.

PiperOrigin-RevId: 593469811
Change-Id: I0f6f73c9f5d2c61b2280f395f76434b0710ce4f3
 2023-12-24 12:06:59 -08:00
Google DeepMind 7fb448613f Post release version update: Update to V3.1.2 
PiperOrigin-RevId: 592019826
Change-Id: I64fd7da628bf3312ede4970b9b10ef5d0cc75b45
 2023-12-18 15:03:37 -08:00
Yuval Tassa 38fa756a20 Add mjGEOM_LINEBOX, used in visualization of collision trees. 
PiperOrigin-RevId: 591224734
Change-Id: I09ad8c4b711021ff4dd5548ba5381d25d5a3d7f8
 2023-12-15 05:36:35 -08:00
Google DeepMind c2c76195dd Updating Mujoco Release version number to v3.1.1 
PiperOrigin-RevId: 590712172
Change-Id: Ibf32322222212c1bf098e75bbb2e145344c57b93
 2023-12-13 14:26:08 -08:00
Baruch Tabanpour 0d37670698 Fix eigen3 commit hash. 
PiperOrigin-RevId: 590335535
Change-Id: I90819d420e5ef54dfc5b202ce0407e1ea833a8a4
 2023-12-12 14:22:45 -08:00
Google DeepMind 0df1c9c733 Updated version number in cmakelist, mujcodepencies.cmake for v 3.1.0 
PiperOrigin-RevId: 590312529
Change-Id: Ie4fb2a76f88d5032c53365995a2bb7b691485e96
 2023-12-12 13:17:35 -08:00
Google DeepMind fcebdf4d09 Update MuJoCo to v3.1.0 for release. 
PiperOrigin-RevId: 590256664
Change-Id: I42ad788d609dde0ff00b13a2e456b2a8d3d9e952
 2023-12-12 10:37:47 -08:00
Kevin Zakka 53883ce86a Add a close() method to mujoco.Renderer which explicitly frees the gl context. 
PiperOrigin-RevId: 590221484
Change-Id: I07392f9c53f662a37a57ab23acfef9aa5a98a49b
 2023-12-12 08:59:46 -08:00
Yuval Tassa 822b03446c Improve pipeline documentation, expose mj_implicit function to public header. 
PiperOrigin-RevId: 586380774
Change-Id: I3fafa563ebc852e17e1233288455b96f4499027b
 2023-11-29 10:18:57 -08:00
Copybara-Service 20eeb75086 Merge pull request #1187 from tmplt:ref/cmake-system-pybind 
PiperOrigin-RevId: 584560576
Change-Id: I1c16fbf80e3ba7175cf4d1d89a459e817100e1f8
 2023-11-22 02:20:02 -08:00
Viktor Sonesten 0ea316ed71 cmake: support system-wide pybind11 
Original behavior remains.
 2023-11-20 14:43:46 +01:00
Abhishek Joshi 08bdc9f691 Merge branch 'google-deepmind:main' into usd-integration 2023-11-19 10:33:14 -06:00
Baruch Tabanpour 23cdfef7fe Update C++ dependency versions. 
PiperOrigin-RevId: 583105482
Change-Id: Ieeffd477a3b3baafd1d7f622881c81944298d233
 2023-11-16 11:15:01 -08:00
Baruch Tabanpour 1554048856 Bump dev version number to 3.0.2. 
PiperOrigin-RevId: 582773849
Change-Id: I07a70911578fabb556eec1a4d8aa6fcb6557513f
 2023-11-15 12:51:04 -08:00
Abhishek Joshi 1491ac15d8 Merge branch 'google-deepmind:main' into usd-integration 2023-11-15 12:38:46 -06:00
Alessio Quaglino 9ae40e718e Define mj_multiRay bindings explicitly. 
Fixes #1184.

PiperOrigin-RevId: 581956413
Change-Id: I6c611ac7537442a65e6961430ec724326ee6095a
 2023-11-13 07:31:22 -08:00
Abhishek Joshi c37212138e Updating output file structure and adding compression functionality 2023-11-07 18:04:40 -06:00
Yuval Tassa c45996bba8 Add cell to tutorial colab demonstrating procedural camera control. 
https://youtu.be/cE3s_IfO4g4

PiperOrigin-RevId: 579466532
Change-Id: I433db285bcfa2b9fab0c11e1fef1e25af8187901
 2023-11-04 07:43:06 -07:00
Saran Tunyasuvunakool f7bdd5dc0e Upgrade pip to version 23.3.1. 
PiperOrigin-RevId: 579062729
Change-Id: Id6a78e6002a7aabb0f947d7722d5c178d5d9ca62
 2023-11-02 21:20:55 -07:00
Nimrod Gileadi 084facc9ab Python bindings: Store a reference to MjModel in MjDataWrapper. 
Before this change, MjDataWrapper contained a custom data structure called MjDataMetadata, which contained the sizes of various arrays needed to create MjData. This was used for serialization and deserialization, as well as copying MjData instances.

This worked fine for native MuJoCo models, but as soon as plugins were used, there was information in the model that was needed and not available in MjDataMetadata. Since plugins are so general, keeping MjDataMetadata was untenable.

PiperOrigin-RevId: 578205355
Change-Id: I11b9ee797d1da5aaf1fecbbe170b3b0f1f1a3e6c
 2023-10-31 09:16:40 -07:00
Saran Tunyasuvunakool 4c24be9ee3 Make mjpython.py work with Python from CommandLineTools. 
PiperOrigin-RevId: 577305478
Change-Id: Iec4b23c97f80462e5c16aca5ac4450faf3181a0c
 2023-10-27 14:26:16 -07:00
Alessio Quaglino 1a47a97040 Disable shadows for geoms of category mjCAT_DECOR. Fixes #1114. 
Added `frustum` to `rgba` and `scale` in the `visual` section.

PiperOrigin-RevId: 576547599
Change-Id: I69bf528680e3d4a59d6e04f6db99a6d345001d1d
 2023-10-25 09:08:20 -07:00
Abhishek Joshi 35097a6afa Merge branch 'usd-integration' of github.com:awesome-aj0123/mujoco into usd-integration 2023-10-19 12:25:52 -05:00
Abhishek Joshi 57b14f178b Merge branch 'google-deepmind:main' into usd-integration 2023-10-19 12:30:36 -05:00
Abhishek Joshi f094f964ed Merge branch 'usd-integration' of github.com:awesome-aj0123/mujoco into usd-integration 2023-10-19 12:25:14 -05:00
Abhishek Joshi 49e8cd0fd3 Updating output file structure for USD frames 2023-10-19 12:24:57 -05:00
Saran Tunyasuvunakool 269d88ad92 Bump dev version number to 3.0.1. 
PiperOrigin-RevId: 574451745
Change-Id: Iedbbb3304b88876f31a6196d690a1f05c6428e2f
 2023-10-18 15:01:21 +01:00
Erik Frey 8f9c690c85 Add MJX and bump version number to 3.0.0. 
Co-authored-by: Baruch Tabanpour <btaba@google.com>
PiperOrigin-RevId: 574327508
Change-Id: Ia9b62fbc929c6869dfcec87636b2e10d405a1060
 2023-10-18 10:33:29 +01:00
Abhishek Joshi 495a9ac8c0 Merge branch 'google-deepmind:main' into usd-integration 2023-10-14 12:23:40 -05:00
Kevin Zakka e90b347cbf Add mesh conversion utilities. 
PiperOrigin-RevId: 573343028
Change-Id: I4b258f91a11d1994659b0129de5ddb2077689f01
 2023-10-13 16:13:24 -07:00
Saran Tunyasuvunakool efdc89e347 Update dependency versions. 
PiperOrigin-RevId: 573323079
Change-Id: I01fbcc582626b179ce72b2aabcac0f389801a97f
 2023-10-13 14:41:48 -07:00
Abhishek Joshi b785642b3f Adding support for in memory usd scenes 2023-10-12 14:40:39 -05:00
Copybara-Service 59164702ab Merge pull request #978 from aftersomemath:depth-precision-in-place 
PiperOrigin-RevId: 572961667
Change-Id: I69011ddf835ae286e30e7f84cca67867cfe94fa4
 2023-10-12 11:18:36 -07:00
Alessio Quaglino 5a70ad08ab Add Flex component. 
PiperOrigin-RevId: 572830650
Change-Id: I6908228087b7b9683be3506c8d9cdc725ed5dcd5
 2023-10-12 10:49:35 +01:00
Saran Tunyasuvunakool 649a474788 Migrate to pyproject.toml. 
PiperOrigin-RevId: 572726851
Change-Id: Iad254df70d15c962a5e58c8caf82b32530d26b06
 2023-10-11 16:55:34 -07:00
Saran Tunyasuvunakool f32219c37c Install locally built wheels with --no-deps --no-index. 
PiperOrigin-RevId: 572665469
Change-Id: I65c93e42155024d8dbfb42e45fd5b4be09f3528e
 2023-10-11 13:13:59 -07:00
Saran Tunyasuvunakool 7e549495d9 Fix macOS mjpython launcher to suppoer show_{left,right}_ui. 
PiperOrigin-RevId: 572377315
Change-Id: Iee734a6e49821b42e94dc19d9ed92a45ee605ea7
 2023-10-10 15:04:02 -07:00
Saran Tunyasuvunakool a84499e904 Fix non-graceful exiting behaviour in launch_passive. 
The viewer currently hard crashes when the user script loops on the passive viewer handle without paying attention to `is_running`. This is considered user error, however this change makes the user script hang on the loop rather than hard crashing.

Startblock:
   diffbase is submitted
PiperOrigin-RevId: 572336261
Change-Id: Id53126a158242b947584da1f946304ae8e792d4a
 2023-10-10 12:39:37 -07:00
Saran Tunyasuvunakool a1d0cbd654 Add show_{left,right}_ui kwarg to viewer.launch(_passive). 
Fixes #857

PiperOrigin-RevId: 572333909
Change-Id: I12247fe856afddf808eb8f386a594acac47c34b5
 2023-10-10 12:31:11 -07:00
Saran Tunyasuvunakool 2e15574b58 Allow user-defined visualization geoms to be added to the passive viewer. 
Fixes #1023, #1082

PiperOrigin-RevId: 572303635
Change-Id: Ia8399f816f311b38a7b137f5bd4f359f77a1da1c
 2023-10-10 10:52:21 -07:00
Google DeepMind df48624d0d Place mjx tutorial correctly in copybara excludes. 
PiperOrigin-RevId: 571390140
Change-Id: I8d0b9ac7b30391e4abaa1ba03fd941e028fd2991
 2023-10-06 11:29:54 -07:00
Google DeepMind 06670155c4 Add MJX training colab. 
PiperOrigin-RevId: 571066455
Change-Id: I8b0638181cdc751cf9fbacfb84c1ac551d7ce4bd
 2023-10-05 10:45:36 -07:00
Yuval Tassa e9613f0cc9 Rename simulate.fully_managed_ to simulate.is_passive_ with flipped semantics. 
PiperOrigin-RevId: 570815258
Change-Id: Iaffdb0e52bcdb31cff7bd29cb820913e3838f0ee
 2023-10-04 14:49:52 -07:00
Yuval Tassa 3e12f0d50c Add history scrubbing mechanism to simulate. 
[screen capture](https://www.youtube.com/watch?v=YSvWn_poqWs)

PiperOrigin-RevId: 570676968
Change-Id: Id9a1fccc9418b851e007ddcf3fa89acd4edff3e9
 2023-10-04 06:36:34 -07:00
Yuval Tassa ee78b8f76b Added mjData.eq_active user input variable, for enabling/disabling the state of equality constraints. 
Renamed `mjModel.eq_active` to `mjModel.eq_active0`, which now has the semantic of "initial value of `mjData.eq_active`".

Fixes #876.

PiperOrigin-RevId: 570410643
Change-Id: Id03171e751377c7cc453f143abee64239ee2e2ed
 2023-10-03 09:32:24 -07:00
Yuval Tassa 639e77876d Improved unpause behavior in simulate. 
PiperOrigin-RevId: 570030315
Change-Id: I5822f8686ba2fd7c5c59a9fa73fc29000a8406ec
 2023-10-02 05:00:40 -07:00
Levi Burner 9e51f20ce2 More fixups to mjtDepthMap names 2023-09-29 19:53:58 -04:00