Commit Graph

494 Commits

Author SHA1 Message Date
fanmin shi 521922f133 Use Renderer context manager format in tutorial.py 2024-06-30 22:44:17 +00:00
Yuval Tassa 62e2842116 Skip deprecated mju_rotVecMat and mju_rotVecMatT in Python bindings.
PiperOrigin-RevId: 647275284
Change-Id: I371236182b22eb399041959901085bb82af3f670
2024-06-27 05:06:01 -07:00
Nimrod Gileadi 2188cba4cd Fix a memory leak when copy.deepcopy(data) is called.
In MjDataWrapper.__deepcopy__ use the Python implementation of MjModelWrapper.__deepcopy__ to make an object that Python knows about and can release later.

Fixes google-deepmind/mujoco#1572.

PiperOrigin-RevId: 644967999
Change-Id: I95d093c672e136122e1939f69463a4d29dad82e8
2024-06-20 03:46:16 -07:00
Google DeepMind c8cc2d51b0 Allow the viewer handle to return the mjModel/mjData objects from the simulation.
PiperOrigin-RevId: 643982026
Change-Id: Ida5ccb851c46f7352e724798738006be6badad0a
2024-06-17 06:12:22 -07:00
Abhishek Joshi 09b00cec5d updating rotation matrix function for shapes 2024-06-17 12:37:10 +05:30
Abhishek Joshi ea128c15de Merge branch 'google-deepmind:main' into tendons 2024-06-16 23:40:10 -05:00
Yuval Tassa 6067048537 Deprecate mju_rotVecMat and mju_rotVecMatT in favor of mju_mulMatVec3 and mju_mulMatTVec3.
These functions names and argument ordering are more consistent with the rest of the API.

PiperOrigin-RevId: 643788290
Change-Id: I783eda8021b80b82098e23ed95669b102bb82508
2024-06-16 10:02:36 -07:00
Abhishek Joshi 64b64f4169 clearing init file 2024-06-13 19:50:35 +05:30
Yuval Tassa c9bcf8371e Add mj_setKeyframe function to save current state in k-th model keyframe.
Fixes #1719.

Also improve documentation of `mju_sigmoid`, was previously only documented in changelog.

PiperOrigin-RevId: 642637458
Change-Id: I811a0bf8f881c8b76c9a62d2faec8fdec4e7585b
2024-06-12 09:22:52 -07:00
fanmin shi a660051a4c Consistent spacing in python/tutorial.ipynb 2024-06-11 21:07:52 -05:00
Yuval Tassa 07fc95ca9a Add orthographic cameras.
Orthographic cameras are specified by setting the `orthographic` attribute of the `<camera>` element. The `fovy` attribute is still used to specify the field-of-view, but its semantic is different for orthographic cameras. For orthographic cameras, the field-of-view is expressed in units of length, rather than degrees.

Other related changes:

* Fix bug in the ordering of `cam_xxx` elements in `mjModel`.
* Make camera visualization translucent only when the frustum is visualized.
* Added a button to `simulate` to toggle between perspective and orthographic free cameras.

https://youtu.be/ZXBTEIDWHhs

PiperOrigin-RevId: 642293435
Change-Id: Id090a421ad88ab404b5b27ddbbd6bfc81ad49bc5
2024-06-11 09:23:18 -07:00
Meghha Dhoke 1bf90af0e0 Bumping mjVERSIONSTRING from 3.1.6 to next version 3.1.7
PiperOrigin-RevId: 639959152
Change-Id: I7b88bae6ea56b0173f00c6f0899ba4a156614f01
2024-06-04 15:27:47 +01:00
Abhishek Joshi 428ec9caaf fixing imports 2024-06-03 11:38:13 -05:00
Abhishek Joshi 0cfdc89c5b Merge branch 'google-deepmind:main' into tendons 2024-06-03 11:14:21 -05:00
Abhishek Joshi ee82810ad3 removing temp.py 2024-06-02 21:17:23 -05:00
Abhishek Joshi ba842fc0d1 decoupling tendons to subcomponents and fixing tendon scaling issue 2024-06-02 21:16:58 -05:00
Abhishek Joshi 1bbf44c99a adding resolution parameter 2024-05-27 10:26:17 -05:00
Kevin Zakka f0b633de6a Fix typos in least_squares notebook.
PiperOrigin-RevId: 635696410
Change-Id: Iba9a2c8f121ca4994678ba933e19dce5323da27b
2024-05-20 23:48:39 -07:00
Kyle Bayes d58010c3b9 Update numpy sha256 hash in build requirements.txt.
PiperOrigin-RevId: 634546683
Change-Id: I319be1fab020dff2b44658ea402684a268ec6a33
2024-05-16 15:24:14 -07:00
Yuval Tassa 02d015458c Add mj_geomDistance API function and sensors for geometric distance, normal direction and segment between between two geoms. Fixes #51
PiperOrigin-RevId: 632458301
Change-Id: I65b7e5bb0df59008028114cf4a07e0d6365ff3d3
2024-05-10 04:52:43 -07:00
Yuval Tassa 31de1dad9d Update requirements.txt for mujoco and mjx.
PiperOrigin-RevId: 632441444
Change-Id: Ia9ff35b453476b2f1f5a7a8facc819a8925dcd8b
2024-05-10 03:30:53 -07:00
Abhishek Joshi bb2c7ae556 adding initial tendon logic 2024-05-09 08:42:29 -05:00
Meghha Dhoke 4eca3b048d Bumping mjVERSIONSTRING from 3.1.5 to version 3.1.6
PiperOrigin-RevId: 631544334
Change-Id: Iadf8fa25e30da5b00172c8212786b1f9edb22e1a
2024-05-07 14:11:38 -07:00
Meghha Dhoke efbcd86e29 Update abseil to LTS 20240116.2.
This is a minor update to the previous version, LTS 20240116.1. The only change is a fix for a bug in the `absl::StrFormat` function.

PiperOrigin-RevId: 631495397
Change-Id: I28aec52fb526a2168900a4ee93ffc6e11650a3be
2024-05-07 11:40:44 -07:00
Yuval Tassa 8d896529f0 Replace .copy() with list() in minimize.py
PiperOrigin-RevId: 631413376
Change-Id: I06dd3e3897078b57b0a0668b2182fa62dcd4a74e
2024-05-07 07:16:30 -07:00
Yuval Tassa a40de1b230 Move notebook copyright notice into HTML comment.
PiperOrigin-RevId: 631222581
Change-Id: I2fe86425677cf14cbfb72cb9d32b645682edc47f
2024-05-06 16:36:45 -07:00
Yuval Tassa 34e537e557 Updates to minimize.least_squares. Fixes #1585
- Residual callable is vectorized for easy multithreading by the user. Internally all vectors are now explicitly column vectors.
- Removed central findiff option, it wasn't applicable at the bounds anyway and just complicated the code.
- Added optional user-provided norm function for non-quadratic (robust) norms.
- Added an iter_callback callable for user convenience.
- Added option to internally check user-provided Jacobian and norm against finite differences.
- Updated the notebook accordingly.

PiperOrigin-RevId: 631205889
Change-Id: I3b9f8893756e329640de464e6f2e26a39e7dbd9e
2024-05-06 15:36:01 -07:00
Abhishek Joshi f6ee435005 updating geom visibility logic; fixing infinite plane texture bug; adding frame skip arg to demo 2024-05-04 13:47:02 -05:00
Abhishek Joshi 2d6c263687 removing outdated comments 2024-05-02 17:29:18 -05:00
Abhishek Joshi 7a1e2bf61e adding demo file and unnamed geom fix 2024-05-02 17:23:48 -05:00
Abhishek Joshi 545c6fdc99 Merge branch 'google-deepmind:main' into main 2024-05-01 16:27:16 -05:00
Yuval Tassa caf215e342 Add metallic and roughness scalar attributes to materials.
Rename `light_radius` -> `light_bulbradius`, make the default value 0.02.

PiperOrigin-RevId: 627032170
Change-Id: I1e01e2eca028c0aefc2e7dc384e8b34abac184aa
2024-04-22 07:39:06 -07:00
Google DeepMind d2392efe6c Allow gl_context.GLContext to be None.
PiperOrigin-RevId: 625927487
Change-Id: I85d5658c8ea529716aaac12b17957c59319367cc
2024-04-17 23:38:06 -07:00
Yuval Tassa 2b4975811b Fix bug in Python binding of mj_saveModel
PiperOrigin-RevId: 625655183
Change-Id: I80d3390d739a8d6e280343087b79c15b543ff50a
2024-04-17 05:58:50 -07:00
Gabe Oppenheimer 225619c964 Update MuJoCo internal version to be the external version +1
PiperOrigin-RevId: 623607403
Change-Id: Ia8f6516bb6b2fb6a3ecb8273b59e61667098f308
2024-04-10 14:32:54 -07:00
Abhishek Joshi a2dfc6d17e updating imports 2024-04-10 14:21:46 -05:00
Abhishek Joshi 916b54b2b7 adding support for unnamed geoms 2024-04-10 12:20:10 -05:00
Abhishek Joshi bd41b69ebb removing test file 2024-04-10 12:03:22 -05:00
Abhishek Joshi 87a7da6cf0 updating capsule to consist of hemispheres instead of spheres 2024-04-10 12:00:05 -05:00
Yuval Tassa 5a365603f8 Add mju_euler2Quat.
PiperOrigin-RevId: 623469398
Change-Id: Ia86b29a764018cd4c3bc57d23616bed7393081f5
2024-04-10 06:02:50 -07:00
Gabe Oppenheimer 930d7b0487 Update MuJoCo Cmake dependency on PyBind11 to the latest release
PiperOrigin-RevId: 622853925
Change-Id: Ic2009c8ffd5441fbb87034915f6dd850a9836660
2024-04-08 08:32:25 -07:00
Abhishek Joshi f1fa9c0b8b combining shapes into one class 2024-04-04 21:10:15 -04:00
Abhishek Joshi a4b5355f46 merging with main mujoco repo 2024-04-02 16:39:04 -04:00
Abhishek Joshi 67a9f91c00 updating demo script 2024-04-02 15:11:37 -04:00
Yuval Tassa 5d26b50fce Remove native sensor noise sampling.
PiperOrigin-RevId: 620075316
Change-Id: I6a0a1d63834e7c8bfd290f89d86fea791d794739
2024-03-28 15:33:03 -07:00
Copybara-Service f0ad80f268 Merge pull request #1534 from aftersomemath:simulate-clear-load-error
PiperOrigin-RevId: 618005670
Change-Id: Id2d33463e01dfb4193c1b22155d42c792d5d4f7d
2024-03-21 17:06:47 -07:00
Levi Burner 848e014020 Copybara import of the project:
--
40996ab1a05f328c2b5d1b940abb189d43f646de by Levi Burner <leviburner@gmail.com>:

[Python Viewer] load mjb files, fixes #1421

COPYBARA_INTEGRATE_REVIEW=https://github.com/google-deepmind/mujoco/pull/1535 from aftersomemath:simulate-load-mjb 40996ab1a05f328c2b5d1b940abb189d43f646de
PiperOrigin-RevId: 617913250
Change-Id: I09e858495784122c29e0a3895ce43b95010003bc
2024-03-21 11:40:40 -07:00
Levi Burner af38845280 [Python Viewer] clear load error on successful reload, fixes #1116 2024-03-21 12:52:23 -04:00
Copybara-Service 67982c4961 Merge pull request #1509 from awesome-aj0123:camera-bug-fixes
PiperOrigin-RevId: 617864822
Change-Id: If8bca106ecf725f9a7103eb3e009af901d6495a4
2024-03-21 09:18:04 -07:00
Matthew Bennice 20c8e3e43b Implement basic USD test
PiperOrigin-RevId: 617302442
Change-Id: Ic598df9757288640b5f35c4e740958884b1b4698
2024-03-19 14:53:18 -07:00