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
f1b3897ea7
Fix missing namespace in test_utils.
...
PiperOrigin-RevId: 773354912
Change-Id: Ic19ba6f1ed4c3ae37a9c143f64da8b7ddc3b3e86
2025-06-19 08:29:34 -07:00
35665c5cb3
Skip mesh geoms in touch sensor.
...
Also, use geom_rbound for the sensor size and check that there is at least one collision geom.
PiperOrigin-RevId: 772928954
Change-Id: I56f1577df66213a70fb1dc12488fbcd2f8a4b8b4
2025-06-18 08:24:37 -07:00
335a9ce0c2
Use early-exit to improve readability of mj_instantiateEquality.
...
PiperOrigin-RevId: 772917213
Change-Id: I106402d063a8fd0e95154bd8608eb4359d4dfdab
2025-06-18 07:45:23 -07:00
92bc486558
Make mjs_findElement find textures by file name.
...
This is done if the model is uncompiled and their name is empty.
PiperOrigin-RevId: 772885774
Change-Id: I827d5b679637fa0571cfb0a69833ed688df16304
2025-06-18 05:54:12 -07:00
9e2c21a17d
Return stricter type from mjCModel::operator+=(mjDef&).
...
PiperOrigin-RevId: 772871198
Change-Id: I4c840389b38e2d8d6bcf92311fad3242324fa3af
2025-06-18 05:00:46 -07:00
6b309b5251
Display equality constraints in the simulate UI.
...
Add section for toggling constraint activity to the UI, similar to actuators or joint controls.
PiperOrigin-RevId: 772866923
Change-Id: I017b9195fcf67b5865e9d44d6c8aded64c8bc46d
2025-06-18 04:42:34 -07:00
bb1d313780
Update docs reflecting MJX now has good support for implicitfast.
...
PiperOrigin-RevId: 772660862
Change-Id: I2ba27b39bb6885b48f65ca1afdc6b83ec027a26d
2025-06-17 16:08:12 -07:00
a7559ed0ad
Merge pull request #2378 from Balint-H:feature/unity-obj
...
PiperOrigin-RevId: 772619174
Change-Id: I62a2bbeb0d8bb0fb007af1abc93d6e8b3449b3fe
2025-06-17 14:24:08 -07:00
a64f1fd335
Compute M in mjx._get_data_into.
...
PiperOrigin-RevId: 772594295
Change-Id: I7da992e9e5590c6060fbe1e2c1e40ccbd3c9b2b9
2025-06-17 13:21:22 -07:00
8084b06a35
Add tendon armature with sparse qM to MJX. Fixes #2681 .
...
PiperOrigin-RevId: 772583693
Change-Id: I827d61aacada33f53500bf54613ccb8145bc854b
2025-06-17 12:52:03 -07:00
3a035fc0a9
Remove trailing whitespaces from MjMeshfilter
2025-06-17 19:32:24 +02:00
d2501eff68
Use procedural model creation in plugin tests.
...
This will be useful for simplifying the mjSpec API for plugins.
PiperOrigin-RevId: 772505558
Change-Id: I8eb57d7e129e0f6430fb4c610a543e0dc0f3b295
2025-06-17 09:30:54 -07:00
d9aae1521a
Remove confusing operator overload in user_api.cc
...
Explicitly add const_cast. This doesn't change the previous behaviour, just makes it explicit.
PiperOrigin-RevId: 772486471
Change-Id: I942bd4effed93a366089411ca18461cad52bff88
2025-06-17 08:34:33 -07:00
998769a995
Return the total non-zeros from mju_sqrMatTDSparseCount.
...
PiperOrigin-RevId: 772414653
Change-Id: Ic1cac868af0034196f33d08b2456be77c72cbd50
2025-06-17 04:27:15 -07:00
ea949f1cee
Add support for ORM maps in mujoco file format plugin
...
The ORM texture is a packed-channel map, with ambient occlusion in Red, roughness in Green, and metallic in Blue channel.
PiperOrigin-RevId: 772367369
Change-Id: I88a4dee2477daa1e3c0b00197bfbe2b276ba9937
2025-06-17 01:45:10 -07:00
e2e2932fe6
Mark all single-argument constructors in user_objects.h as explicit.
...
This avoids accidental implicit conversions.
Also included some constructors with multiple arguments, where default values mean that the single-argument constructor is valid.
PiperOrigin-RevId: 772117936
Change-Id: I57e54a373593080e9d68961b00488c7a70f1aff8
2025-06-16 12:00:51 -07:00
1f0e4891c2
Add some autoformatting changes to mujoco_to_usd.cc
...
PiperOrigin-RevId: 772032458
Change-Id: I94a80e7f7928b2956e76268c0d89fb862a228c41
2025-06-16 08:15:00 -07:00
bb1b2db3a9
Add support for normal maps in mujoco file format plugin
...
PiperOrigin-RevId: 771992722
Change-Id: Ifeae9e12f1071018112e697402361caa84095ff2
2025-06-16 06:01:18 -07:00
3969cac614
Fix tinyxml include
...
This came up as a code suggestion, presumably for consistency.
PiperOrigin-RevId: 771966921
Change-Id: Ic29afc9a9eb1e0b87dd7d9ac04a5ad9790f86f0d
2025-06-16 04:26:41 -07:00
41eb966c9b
Resolve deprecation warnings in playground.
...
PiperOrigin-RevId: 771184565
Change-Id: Ic2056ad82a6a0c20897a02ea39c37b3f44a80513
2025-06-13 12:28:57 -07:00
a4ab35c194
update scrubs and set next version
...
PiperOrigin-RevId: 770740070
Change-Id: I6b2f1356706b1849872df2583adbbb3f72057884
2025-06-12 11:39:45 -07:00
65deedbc75
Rename backend_impl to impl. Remove _full_compat from callsites.
...
PiperOrigin-RevId: 770400560
Change-Id: I7bec79aeae07322a30b15cc04d4dd05077741a8b
2025-06-11 18:05:49 -07:00
f978b4eea3
Release notes for 3.3.3 + update git hashes.
...
- Upgraded dependencies versions.
- Added release date for 3.3.3
- Reordered changelog to be a numbered list.
PiperOrigin-RevId: 769808336
Change-Id: Iffa074f52ef2e3f9d450ce6973a7e85980417367
2025-06-10 14:49:17 -07:00
e5631c0bab
[MJX] Don't raise sparse qM error in tendon_armature if there are no tendons.
...
PiperOrigin-RevId: 769753590
Change-Id: I5dd7a953f08e0566c5e22c2c926d7bd9c2c57bd6
2025-06-10 12:46:47 -07:00
5f42078dc1
Do not write nameless frames whose class is "main".
...
PiperOrigin-RevId: 769685151
Change-Id: I3d993d7521db2b2adbf611c3e4eb5b4b293bdc30
2025-06-10 10:15:43 -07:00
bf56312c9d
Increase size of image in changelog
...
PiperOrigin-RevId: 769549620
Change-Id: I8666771ecf50b91342694deeb357b3edfa3f62d9
2025-06-10 03:34:17 -07:00
caaf7b3a69
Add tendon armature to MJX.
...
PiperOrigin-RevId: 769294284
Change-Id: Idfbd4f355eb26fba5035973ab989a9d3af05c85f
2025-06-09 14:27:18 -07:00
b8768aa1cd
Allow to fusestatic a body if it doesn't generate a referencing error.
...
PiperOrigin-RevId: 769189929
Change-Id: I62f512813ea330da088b28d39373df39be10a602
2025-06-09 10:05:57 -07:00
f75772587a
Add functions for setting an mjsActuator to a specific shortcut type.
...
PiperOrigin-RevId: 769049331
Change-Id: If5bb04966bd29a57569a2c17d712b9ae3d33324d
2025-06-09 02:17:02 -07:00
dd18dd2024
Apply metallic and roughness scaling factors.
...
PiperOrigin-RevId: 767518801
Change-Id: I7eff7b7a56cfbb9c6e46ac22011559eabf401c07
2025-06-05 03:03:16 -07:00
047df4e871
Add texture to rotating cylinders in pulley example.
...
PiperOrigin-RevId: 767260834
Change-Id: I3030be314b5b197163d75ef88a5fd99a940d9c67
2025-06-04 13:16:04 -07:00
3eb31f56cd
Copybara import of the project:
...
--
c9acc0a6f677951db34f2b607bd60fc18a43f72b by Levi Burner <leviburner@gmail.com >:
Fix race condition in Python viewers set_X methods
--
b89ab8f7a0f628ee7a02ebfbac2a97f113112076 by Levi Burner <leviburner@gmail.com >:
use std::swap to replace some copying
--
02625bed0cffbfc9ea4537f74689f0bbcb8bf44c by Levi Burner <leviburner@gmail.com >:
fix whitespace
COPYBARA_INTEGRATE_REVIEW=https://github.com/google-deepmind/mujoco/pull/2613 from aftersomemath:simulate-set-race 02625bed0cffbfc9ea4537f74689f0bbcb8bf44c
PiperOrigin-RevId: 766646168
Change-Id: I1e1dc16afbfb1e69fb958d54bd1075cc9aed3569
2025-06-03 07:01:31 -07:00
fe81373ffe
Enable WriteReadCompare for models with assets.
...
PiperOrigin-RevId: 765500742
Change-Id: I119dbea11ed6771839b5e81d04070e95a51d3ed0
2025-05-31 00:56:27 -07:00
84ad22a590
Add mj_copyBack for copying real-valued arrays from mjModel back to mjSpec.
...
Also add `SaveAndReadXML` function to test fixture using `mjSpec` as input.
PiperOrigin-RevId: 765393821
Change-Id: Ic257addd2fc89678fc11b226c168c077626cc51e
2025-05-30 17:17:14 -07:00
Google DeepMind