4c7c68e518
add glfw3 install back to cmake
2025-07-01 18:17:21 -05:00
ef8da59cb3
Merge branch 'original/main' into vidur/remove-installing-glfw3-headers
2025-07-01 16:27:15 -05:00
641d95313a
Remove installing glfw3 headers
2025-07-01 16:25:07 -05:00
072b327430
Fix the parsing of USD scenes that use ResetXformStack
...
Also add a new test for it
PiperOrigin-RevId: 778114814
Change-Id: Ib019768ac45ecf7ec6d437199a3d1427557b2f06
2025-07-01 11:07:07 -07:00
50de1b3c2c
Read new Mujoco-specific JointAPI when converting USD.
...
PiperOrigin-RevId: 778037519
Change-Id: Idd81dc5dc14e2dfb40ba7db4404fd09f9ff50a9f
2025-07-01 07:40:23 -07:00
9dc67b50cd
Write new Mujoco-specific JointAPI data to USD.
...
PiperOrigin-RevId: 778035661
Change-Id: I945aa38fc58973023d78ab0ab5fad7783d23e1ef
2025-07-01 07:35:34 -07:00
862436f9b3
Add JointAPI schema in mjcPhysics.
...
PiperOrigin-RevId: 778030981
Change-Id: I22a4bf2a550fb78e47bef0ff171b10ce5912887e
2025-07-01 07:22:05 -07:00
3db03dcce5
Don't output a warning about duplicate geom names for unnamed geoms in URDF.
...
PiperOrigin-RevId: 777998616
Change-Id: Id87533e30567fe5a0e372220ba57819383d42236
2025-07-01 05:36:17 -07:00
9eb0745968
Fix comment typo in getimpedance.
...
PiperOrigin-RevId: 777997980
Change-Id: I0fe87196360e6771db10f4d9b08d43448ea5f54e
2025-07-01 05:33:47 -07:00
5c1f1f9dba
Add octree to meshes of SDF geoms.
...
PiperOrigin-RevId: 777634862
Change-Id: I3210c2f8d73fd30ceecb0a11abd1d82e086b3d5d
2025-06-30 10:50:15 -07:00
106df98946
Create Keyframe schema in mjcPhysics.
...
PiperOrigin-RevId: 777568003
Change-Id: I036fd54e2926c138f9ca8de87040b263b8427df3
2025-06-30 07:48:48 -07:00
1c98dfd86e
Remove unused header
...
PiperOrigin-RevId: 777505320
Change-Id: I39d4ccf47a49bfb6f74090e59c68373e76a0bcf5
2025-06-30 04:09:10 -07:00
2ce5caa239
Update MJX rne_postconstraint with contributions from equality connect and equality weld constraints.
...
PiperOrigin-RevId: 777491801
Change-Id: Ib32dda4178def7a96d31e91787f3d0866a56cd76
2025-06-30 03:21:45 -07:00
57b3d6d0f4
Make island discovery compatible with flex
...
PiperOrigin-RevId: 777490642
Change-Id: Iae2f4e8297cc24bded833e04ebfe32895f3a5460
2025-06-30 03:16:57 -07:00
c945247e7c
Don't write limited and actuatorfrclimited attributes when "true" is not a valid value.
...
Saved XMLs are filled with
```
<joint type="free" limited="false" actuatorforcelimited="false"/>
```
but since these are hardcoded to "false" at compile time, there is no point in saving them to XML.
PiperOrigin-RevId: 776606516
Change-Id: Iac61c5126231f776077a8c265be732f9215fbfbb
2025-06-27 09:07:30 -07:00
e80a62c6d5
Allow loading USD files into simulate.
...
PiperOrigin-RevId: 776584803
Change-Id: I66a5277b3752d69ba5d44ed419204951edb18d41
2025-06-27 07:59:21 -07:00
e97e5d31d0
Replace box SDF with a smooth approximation.
...
This approximation is equivalent to the exact SDF on the surface and externally, but it is smooth on the inside, rotating the gradient from radial at the box center to normal to the faces at the surface, and interpolated linearly (using two Euler angles) in between. This enables stable contact gradients for deeper penetrations.
PiperOrigin-RevId: 776574022
Change-Id: I562976e9f0535b0067aa12b2bc9d48eccb6472e9
2025-06-27 07:21:30 -07:00
931ea6938c
Add parsing tests for joints.
...
Also remove the not properly supported SphericalJoint (ball joint).
PiperOrigin-RevId: 776550199
Change-Id: I863dfa89c4cb564cf453e57c19df563ddade92b8
2025-06-27 06:01:19 -07:00
2e8e38b492
Add double quotes when setting rpath property fixing handling of lists.
...
PiperOrigin-RevId: 776549203
Change-Id: I51375c536729356f023076037ec1f5335d407fa4
2025-06-27 05:57:36 -07:00
09f44b3c92
Explain why mjpython is needed on MacOS
...
PiperOrigin-RevId: 776500649
Change-Id: Ifc4c944284f541cdb3a7027365ee27caaee39731
2025-06-27 03:01:10 -07:00
09f7154e57
Add option to only sync the state to improve sync performance in passive mode.
...
By default this option is off, which preserves the current behavior of syncing all of `mjModel` and `mjData`.
PiperOrigin-RevId: 776498017
Change-Id: I02127c9397efbabebb89b0e0d139b00b6e665d35
2025-06-27 02:49:58 -07:00
8f6a13aa8f
Add support for displayColor/Opacity (convert to rgba)
...
PiperOrigin-RevId: 776488857
Change-Id: I34713748ac553b5fdfad736801cdaa7dc2b7f1b0
2025-06-27 02:16:49 -07:00
24789f8fe5
Apply articulation API to the correct body when converting to USD.
...
PiperOrigin-RevId: 776206773
Change-Id: I84b5687a9900b42fd208124414ac98feaaa9f8c4
2025-06-26 11:07:11 -07:00
1e319aebed
Support joint actuator authoring in Mjcf SdfFileFormat plugin.
...
PiperOrigin-RevId: 776202325
Change-Id: I8503dd98c1b64502550b879e70039ae568517508
2025-06-26 10:55:49 -07:00
21bae3a388
Report which body has too-small mass/inertia in compilation error.
...
PiperOrigin-RevId: 776196017
Change-Id: Ib81efb170347a57cdc4b446c14cd7b8f5357958c
2025-06-26 10:40:40 -07:00
afc35451a0
Expose ability to go from USD stage to MjSpec.
...
PiperOrigin-RevId: 776184388
Change-Id: I0325b347c9896183d148a196897e1e5d0c4bbde2
2025-06-26 10:09:55 -07:00
672746f509
Use brackets for USD schema code.
...
PiperOrigin-RevId: 776157077
Change-Id: Id8c55a98dc695348430a99ca59ec509a6db26403
2025-06-26 08:54:55 -07:00
3441e0aa03
mj_usd plugin: add joints export.
...
Note that ball joint is missing, will come later.
PiperOrigin-RevId: 776057523
Change-Id: I8d13c3ea9e7f3d894af73a4640eb93202f8a2a03
2025-06-26 03:02:17 -07:00
48205fb570
Symmetrize dense matrices before cho_factor, since the jax.scipy.linalg.cho_factor API had a breaking change in https://github.com/jax-ml/jax/commit/a981e1c4b99b7628efe2bf70a75c0422a70e9524 .
...
PiperOrigin-RevId: 775740310
Change-Id: I1a172ec4851b5d6a7f3d56179c54fec5d4c9e0c5
2025-06-25 10:15:00 -07:00
18d5d5d03f
Improve documentation related to mjSpec element deletion.
...
PiperOrigin-RevId: 775677830
Change-Id: I02e51b57956b0b6a20c654326b54e001b498dd96
2025-06-25 07:23:51 -07:00
d0faa3624e
Update MJX inverse dynamics for tendon armature.
...
PiperOrigin-RevId: 775658246
Change-Id: Ie6a71b971d4b165e0235689b7b4ee3246486e10d
2025-06-25 06:14:46 -07:00
da831f5d3e
Add support for separate occlusion, roughness and metallic textures
...
PiperOrigin-RevId: 775632047
Change-Id: I40ba0b3d4ecb0c0a03534b8d93f85d279febbc9c
2025-06-25 04:37:19 -07:00
81d16b7ccc
Add some comments to the material construction code
...
Grouped similar lines together, since they have become separated.
PiperOrigin-RevId: 775595031
Change-Id: Id75e87e07eb2e6b745698a57ea048daaff34f35c
2025-06-25 02:22:42 -07:00
9089059517
Move headers from src/experimental/usd to include/experimental/usd
...
PiperOrigin-RevId: 775269423
Change-Id: Ifca6c3ead32b9fb3f02784ed38a9efae300be410
2025-06-24 09:33:26 -07:00
78df2ae7fa
Add support mjcf emissive layer materials
...
Mujoco supports emission as a constant coefficient, and emissive, an rgb texture. This cl supports the rgb emissive texture for usd.
PiperOrigin-RevId: 775236677
Change-Id: I0e2ce1d9f68d79b6e9d2c28eecab22b2692f061c
2025-06-24 08:06:32 -07:00
a0614fff1f
Fix tinyxml2 includes.
...
PiperOrigin-RevId: 775204246
Change-Id: Ia5c692eb29b2a670cb01e3efdeb85fd6e1474b99
2025-06-24 06:18:00 -07:00
8d9556db7c
Update MJX feature parity.
...
PiperOrigin-RevId: 775147260
Change-Id: I48097c2ac4ef17b7f17f6fd8a894ae00a25abf63
2025-06-24 02:54:23 -07:00
862300def5
Fix comment typo in _resetData.
...
PiperOrigin-RevId: 774705647
Change-Id: Id933cae9a219798eae266b36bd3efba2a3b88163
2025-06-23 03:49:55 -07:00
a00bfa819c
Raise error when binding to a removed element.
...
PiperOrigin-RevId: 774462737
Change-Id: I820c0e1c010ae9fbf6d9667c3364d4b65bf21002
2025-06-22 10:15:31 -07:00
419cdf1ff3
Add mesh fit image to XMLreference
...
PiperOrigin-RevId: 774458193
Change-Id: I3bae60e431c628ccc4cb96f96cc7b045dc365698
2025-06-22 09:54:44 -07:00
2707eadc00
Refactor mj_crb and mj_tendonArmature to use CSR M.
...
PiperOrigin-RevId: 774077388
Change-Id: Id57118a5d66c074766f5c69fd3b889ebc625cbf7
2025-06-21 04:49:06 -07:00
14dc7c2a60
Add "cameraid" attribute to visual/global specifying the default camera to use at model load.
...
PiperOrigin-RevId: 773783069
Change-Id: I2fff2abdceedc982d89cee8d14b95abceea1c113
2025-06-20 11:41:27 -07:00
7dc7a349c5
Move detach from mjs_delete to mjs_detach.
...
PiperOrigin-RevId: 773686024
Change-Id: Ida2c032a6329104df80ed134cf904dde7259bd1e
2025-06-20 07:04:12 -07:00
a2acd2d4ed
Rename detach_default and detach_body to delete in the mjSpec bindings.
...
PiperOrigin-RevId: 773674361
Change-Id: I3977060e19e9ff0afc65ad91693c017958576b78
2025-06-20 06:23:30 -07:00
e23b39fbfa
Increase test tolerance in engine_solver_test
...
PiperOrigin-RevId: 773647308
Change-Id: I11605518c4bb1d257763b7f3334de358bacc194c
2025-06-20 04:48:09 -07:00
60955d7e88
Fix rollout notebook, update light.directional to light.type.
...
PiperOrigin-RevId: 773646227
Change-Id: I3bb54e548b1a74d7523aaa91be0fc3cb980866f3
2025-06-20 04:43:59 -07:00
0488d9f4eb
Replace mjs_detachBody and mjs_detachDefault with mjs_detach.
...
In a follow-up, mjs_detach will be changed to only remove without deleting an element.
PiperOrigin-RevId: 773637351
Change-Id: I9ee4d3584ba88ccc225591337cf036bab806e25c
2025-06-20 04:12:27 -07:00
4ce6293217
Fix bug in inverse dynamics when tendon armature is present.
...
PiperOrigin-RevId: 773604419
Change-Id: Iaffe3d831c6a5aba8a0a99c05aa76cbd862745f5
2025-06-20 02:25:04 -07:00
2ca9602d3c
Remove crank site from ActuatorAPI generated code.
...
The generated code was stale and no longer reflected the current schema.
PiperOrigin-RevId: 773369007
Change-Id: Ife3fa373309e668430453351f6fd10998edfdd8a
2025-06-19 09:31:10 -07:00
86e6a0415b
Add missing PLUG_INFO_LIBRARY_PATH to mjcPhysics plugInfo.json
...
This gets replaced during build installation time to have the actual path to the plugin shared lib.
PiperOrigin-RevId: 773354944
Change-Id: Ib4a78d6308f97654fdd995460ac05c1c4cfbd70f
2025-06-19 08:31:05 -07:00
Vidur