91cedfd65c
Avoid square roots in barycentric coordinate computation.
...
Also add some `inline` qualifiers.
PiperOrigin-RevId: 676873457
Change-Id: I76f57dc870a8714bd86749a7dee1f10fc5e4be1c
2024-09-20 09:37:40 -07:00
ab3954d892
Set actuator_force in MJX. Fixes #2068 .
...
PiperOrigin-RevId: 676867005
Change-Id: I80514a050ff40cb6d43a95b74c4a36c4991db588
2024-09-20 09:16:55 -07:00
50f43b8745
Fix various issues with body inertial parsing and compiling.
...
- Add errors in body compiler for incorrect mixing of specifiers.
- Correctly process inertia orientation specifiers.
PiperOrigin-RevId: 676843326
Change-Id: I7e7eb22e25a6769754794f98fad5e0dcc0e5946f
2024-09-20 07:53:42 -07:00
78832db53f
Use designated initializers for mjCCDObj.
...
PiperOrigin-RevId: 676794693
Change-Id: Ie8a35415232e8a9f619713763c5d5a37a6f82935
2024-09-20 04:32:10 -07:00
7a92423cf2
Add height fields to list of discrete objects in NativeCCD.
...
PiperOrigin-RevId: 676452215
Change-Id: I5d6a0d1e26ee852c774b44f550c1d0531b7a269b
2024-09-19 09:48:41 -07:00
4998e7b392
Move flex damping to the engine and remove membrane and solid plugins.
...
PiperOrigin-RevId: 676434954
Change-Id: I24e8dbaa90afcffd613a9cf106ef8b7262195328
2024-09-19 09:01:30 -07:00
6c7e1095c5
Add mjsPlugin and mjsOrientation related keyword argument support for mjSpec Python bindings.
...
PiperOrigin-RevId: 676412967
Change-Id: I8cc1bfcc443327fde33246981400b375f8d4ff3d
2024-09-19 07:55:31 -07:00
f4381e12a2
Delete plugins when their corresponding objects are deleted, if their instance belonged the object.
...
Fixes #2061 .
PiperOrigin-RevId: 676402701
Change-Id: Ia4807d57a3763e2100702b7e7ec96c300d0a9cfb
2024-09-19 07:21:42 -07:00
f161b63a22
Set default body position to (0, 0, 0).
...
The "undefined" body position is a remnant of the now-removed `compiler/coordinate` attribute, see [documentation in version 2.3.3](https://mujoco.readthedocs.io/en/2.3.3/modeling.html#cframe ) (or older).
PiperOrigin-RevId: 676361485
Change-Id: I104c8da2a988a0430eb85fff8b9b60f8c1e08582
2024-09-19 04:36:39 -07:00
3839ad186e
Merge pull request #2050 from kevinzakka:doc-fix
...
PiperOrigin-RevId: 676339046
Change-Id: Ibefee71f7437999f9c78f7833bfaaa252e902ea4
2024-09-19 03:05:07 -07:00
aca4b3324d
Resolve default asset names while attaching a spec.
...
PiperOrigin-RevId: 676053538
Change-Id: I717b87be4bc18a5d9f8e5f2dc071bd93409eea81
2024-09-18 10:58:12 -07:00
1a5536ce5b
Make edges array const.
...
PiperOrigin-RevId: 676046588
Change-Id: Ica4bcdb49311bae8ccbf071717d7eb1c7cb55b87
2024-09-18 10:40:38 -07:00
66a9cacc90
Move elasticity force computation to the engine.
...
PiperOrigin-RevId: 676028775
Change-Id: I994e3dda8d6470815763c04df0c276e265aa1f54
2024-09-18 09:55:00 -07:00
e439b748a4
Replace calls to floor/ceil with mju_floor/mju_ceil.
...
PiperOrigin-RevId: 675988982
Change-Id: I5f4d09d957ac7030cd4ce70e72f78dd4f07a6090
2024-09-18 07:49:23 -07:00
ddbc083810
Move elasticity computation to mjCFlex.
...
PiperOrigin-RevId: 675949380
Change-Id: Ia48f4fd6ae1ede206ccacd1205914e7e4b3c7aec
2024-09-18 05:23:10 -07:00
0657e3e871
Fix bug in DeleteFace in NativeCCD.
...
PiperOrigin-RevId: 675948504
Change-Id: If9d967c8e75580a3a002fce9c10a2e1bfd0b5d46
2024-09-18 05:20:11 -07:00
bfda9f4ace
Add optional kwarg inputs to mjSpec Python bindings for mjSpec add constructors.
...
PiperOrigin-RevId: 675929024
Change-Id: Idd8c584276d8f585b79585230f5167f79760eaef
2024-09-18 04:02:10 -07:00
4975c35657
Fix typo in README.md
...
PiperOrigin-RevId: 675619380
Change-Id: Ifdc026b7cbd967645930d923f7de9a114121466f
2024-09-17 10:28:37 -07:00
317f480224
Properly initialize hfield mjCCDObj for collisions.
...
PiperOrigin-RevId: 675580798
Change-Id: I119258c46562f73af4b7a5d100f69d0e52fbe71c
2024-09-17 08:37:59 -07:00
bd811a44e7
Remove redundant copying in NativeCCD and refactor code for readability.
...
PiperOrigin-RevId: 675573079
Change-Id: If9f7bc21d9ee7806997f05a8985ebe6b1b3c8332
2024-09-17 08:14:10 -07:00
fb56d70dee
Add model with mixed geoms for CCD performance testing.
...
PiperOrigin-RevId: 675567065
Change-Id: I9629b0757270ca541a96bb64384b5c41e7a9b728
2024-09-17 07:56:35 -07:00
476599f8b6
Update pybind11 to v2.13.6
...
PiperOrigin-RevId: 675241879
Change-Id: Icaa0a957b7c7ac64daf5d29ccae1ab8bf89a8e1d
2024-09-16 12:09:02 -07:00
7f7c5ec943
Fix mismatch in mju_wrap function signature definition.
...
PiperOrigin-RevId: 675204328
Change-Id: I820f10237b6d3bfd36067a9c3aef82cb1908ef6a
2024-09-16 10:34:22 -07:00
e94bd8348c
Store polytope faces in heap in NativeCCD.
...
PiperOrigin-RevId: 675197250
Change-Id: Ibe9194d777d68729bffd085e36313fb33ee2756d
2024-09-16 10:17:20 -07:00
48fee9487e
Clean up tendon wrapping code.
...
PiperOrigin-RevId: 675185000
Change-Id: I3d93d7ce65b617c4869eb002dfe9440efa9abf66
2024-09-16 09:47:22 -07:00
ebcffaf121
Improve wording of changelog item.
...
PiperOrigin-RevId: 675176166
Change-Id: I3b902efcc618e5121fea33f9a746df57a3979710
2024-09-16 09:22:26 -07:00
ce3681a26d
Replace hard-coded mjNCATENARY with mjVisual.quality.numslices.
...
PiperOrigin-RevId: 675157138
Change-Id: I87ea16e4df8ed63b301ceaeac6e1b1d0513b77a0
2024-09-16 08:25:19 -07:00
4628a5e438
Remove vertex struct from NativeCCD and allocate fixed memory for vertices on MuJoCo stack.
...
PiperOrigin-RevId: 675144892
Change-Id: I23d3316b9346ce7137bcfe84265717b60950898a
2024-09-16 07:45:53 -07:00
f9401776d4
Add framelinacc and frameangacc sensors to MJX.
...
PiperOrigin-RevId: 675141513
Change-Id: Ie38dba3e8be82e0554c7c9e47c6d07f3cdad29b8
2024-09-16 07:34:16 -07:00
b0c7101f1c
Add optional kwarg inputs to mjSpec Python bindings for mjsBody add constructors.
...
PiperOrigin-RevId: 675141078
Change-Id: I8d735ae7d0a018ce7cd1aca56c899d1455586015
2024-09-16 07:32:55 -07:00
2ffa0fe942
Avoid freeing model and/or data twice in case of errors during the compilation process.
...
PiperOrigin-RevId: 675136721
Change-Id: Ibe01216f86893db44a8279c560c307726fb03f81
2024-09-16 07:18:15 -07:00
31abd7900a
Add edge ids to flex elements in mjModel.
...
PiperOrigin-RevId: 675130981
Change-Id: If2ccfb268142d235273b7a50e15740f6399903b2
2024-09-16 06:58:10 -07:00
9d73211757
Add force and torque sensors to MJX.
...
PiperOrigin-RevId: 675130978
Change-Id: I8a3b925c57f317aebc0c345578cebeb4210dc11d
2024-09-16 06:57:00 -07:00
b15de2c951
Add elasticity parameters to the schema.
...
PiperOrigin-RevId: 675115200
Change-Id: Ic6608ce61cbb857dca71b3d9cbdac057e8f1ac7a
2024-09-16 05:56:36 -07:00
015bdeb756
Disallow repeated nameless assets that use the same file, except for URDFs.
...
PiperOrigin-RevId: 675114055
Change-Id: I142811ac2d8ef9e12bb8a06d5f3a2fdac02946da
2024-09-16 05:50:50 -07:00
60a1921b34
Add site semantics to weld constraint. Fixes #1896
...
PiperOrigin-RevId: 675112981
Change-Id: Ie4c01440d54116075df89f480591700762892cbd
2024-09-16 05:46:01 -07:00
2da15cf137
Add flex elasticity stiffness matrix to mjModel.
...
PiperOrigin-RevId: 675101645
Change-Id: Ic169c108b9eece3657ea4ec211df357abe615b7e
2024-09-16 05:00:54 -07:00
c77babe046
Fix a bug in MuJoCo's user_mesh.cc that caused meshdir_ to be overwritten when a model was loaded with a nested model.
...
PiperOrigin-RevId: 675092713
Change-Id: Iad6336141749510bf5544cab9c06533ee1589c08
2024-09-16 04:22:13 -07:00
fd17b2144a
Replace double- or single-precision-denominated function calls in the engine with the equivalent mjtNum-denominated calls. This avoids unnecessary casting or precision loss when MuJoCo is compiled for 32-bit float precision. Accordingly, remove #include <math.h> from all engine source 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
Also, minor type-related fixes in `user_mesh.cc`.
PiperOrigin-RevId: 675082329
Change-Id: Icc5eb9f9eb4fbf09b08d7d4b9b2929f414e4a75c
2024-09-16 03:40:17 -07:00
dde25d039b
Update Mujoco dependencies to latest versions.
...
PiperOrigin-RevId: 674003245
Change-Id: Ib758fa361cb34a786dcd3d55fbf3e5a459b75a3f
2024-09-12 14:10:21 -07:00
577afd1e28
Improve wording of some items in the changelog.
...
PiperOrigin-RevId: 673890612
Change-Id: I731f9afcd5ec5f54f7ddc318dcea238f08d7a6bf
2024-09-12 09:54:15 -07:00
9f8f6947fc
Remove global linear search in favor of (almost constant time) local search when finding the convex hull of the polytope and new point in EPA for NativeCCD.
...
PiperOrigin-RevId: 673852140
Change-Id: Ib2ab64bad3cd2aa7d252b4016754f37ea30e1077
2024-09-12 08:11:30 -07:00
5144be2baa
Add unit tests for NativeCCD.
...
PiperOrigin-RevId: 673849092
Change-Id: Ie703c9f461bb483fd3335d1ba589211205c73c8c
2024-09-12 08:03:18 -07:00
8d165d5cc7
Fix early termination in GJK. It's possible for x_k to be the origin, so we should run the previous test to conclude that the objects are colliding.
...
PiperOrigin-RevId: 673834101
Change-Id: I596b30d2847670261f8067840b34dc13de401ecb
2024-09-12 07:17:53 -07:00
e3d3a24b36
Add spatial tendons with site wrapping to MJX.
...
PiperOrigin-RevId: 673783473
Change-Id: I09b13787e3e0914c8de21d81db0347c4638b2f1d
2024-09-12 04:17:16 -07:00
14f420069e
Make projectOriginPlane in NativeCCD numerically robust.
...
PiperOrigin-RevId: 673761409
Change-Id: I64304c89f768414d60e2dcf2e71feb8a6f9b2635
2024-09-12 03:01:15 -07:00
567793c26f
Store model paths in assets.
...
This enables to preserve the paths of the child spec during `attach`.
PiperOrigin-RevId: 673349237
Change-Id: Ibf075c7ec037ff5d540bc60d6e77c12f60269791
2024-09-11 05:20:14 -07:00
cf721def3a
Missing renames of mpr_ -> ccd_
...
PiperOrigin-RevId: 673330801
Change-Id: I1cd67454660aaea6dd41eb50a12638358676b8d0
2024-09-11 04:09:57 -07:00
8710126d08
Raise NotImplementedError for unsupported sensors in MJX. Update MJX feature parity docs to include fully supported sensors.
...
PiperOrigin-RevId: 673325233
Change-Id: Ib262bdd37937c5230765c11d1f61581e55e8c397
2024-09-11 03:50:46 -07:00
4e3dc14f8e
Remove model/humanoid100/humanoid100.xml (used <include>), replace with model/humanoid/humanoid100.xml (uses <attach>)
...
PiperOrigin-RevId: 673123895
Change-Id: I0c3c6dac69d9fc12a6ea76d586c34503fc167bad
2024-09-10 15:14:04 -07:00
Yuval Tassa