Commit Graph

1653 Commits

Author SHA1 Message Date
Yuval Tassa 5d26b50fce Remove native sensor noise sampling.
PiperOrigin-RevId: 620075316
Change-Id: I6a0a1d63834e7c8bfd290f89d86fea791d794739
2024-03-28 15:33:03 -07:00
Yuval Tassa 47ba72ea59 Add actuatorgravcomp joint attribute, to treat gravity compensation forces as applied by actuators, rather than passive buoyancy.
PiperOrigin-RevId: 620049593
Change-Id: I2c8a9dc152c087b408e4f904838034271a7dd910
2024-03-28 14:01:52 -07:00
Baruch Tabanpour d258d5e152 Check all edge pairs in convex-convex.
PiperOrigin-RevId: 620004680
Change-Id: I5d75c0fd21ed3d3e420eed762cfc5a7e04896032
2024-03-28 11:33:46 -07:00
Yuval Tassa a8db22f0d0 Add local vector clamping function in engine_forward.c
PiperOrigin-RevId: 619948315
Change-Id: Ie4b92f5c8facaa2c169f01982940e84a0248b9c9
2024-03-28 08:57:34 -07:00
Alessio Quaglino 96f923282c Add SetNuser function.
PiperOrigin-RevId: 619892712
Change-Id: Id528620d6af19976d965f34a3be95a48a1f9c0b2
2024-03-28 05:26:41 -07:00
Alessio Quaglino dfe2b75378 Convert mjElement to struct rather than opaque pointer.
By making mjElement the parent of mjCBase, mjCModel, and mjCDef, this CL enables safer casting using static_cast instead of reinterpret_cast and C-style casting.

PiperOrigin-RevId: 619526291
Change-Id: Ifa2b4bd3ecd95bade61f41a7005c62212f456c00
2024-03-27 07:37:49 -07:00
Alessio Quaglino e6bf6fc327 Fix a bug in the ellipsoid SDF gradient.
PiperOrigin-RevId: 619512430
Change-Id: Ia4c2f01d1767f36313177334ceda02d3a9e2e495
2024-03-27 06:35:40 -07:00
Copybara-Service 297dc76b32 Merge pull request #1541 from wangcongrobot:main
PiperOrigin-RevId: 619241318
Change-Id: Ic9e6a13eabc6f8c7cbb6fa387ab97af47557e618
2024-03-26 10:46:38 -07:00
Google DeepMind 4f0293c6cb Added support for msh2.2
Now we can load flex with format 2.2 binary and ASCII.
There are two different parsing strategies. One for gmsh app and the other is for ftetwild.

Used the shark model from Scanned Objects by Google Research:
https://app.gazebosim.org/GoogleResearch/fuel/models/Weisshai_Great_White_Shark

PiperOrigin-RevId: 619229499
Change-Id: I6eb876afcbc8a00631914b093c45bde10c0caaf6
2024-03-26 10:12:13 -07:00
Yuval Tassa 4d2aa46e56 Rename mjmDefault -> mjsDefault
PiperOrigin-RevId: 619180662
Change-Id: Id7cedf82fbb022f08accc7c9a547495ed8eecba0
2024-03-26 07:20:03 -07:00
Yuval Tassa fa8893b443 Improve hash function for names.
PiperOrigin-RevId: 619173787
Change-Id: I7889ea71ebe7bdbe682042842c521d6631521a35
2024-03-26 06:51:31 -07:00
Kyle Bayes 709719911e Make SameVector return early.
PiperOrigin-RevId: 619128273
Change-Id: Ic47613b8322b9ff5a6a1f557cc9626a20aaee794
2024-03-26 03:19:30 -07:00
Alessio Quaglino 357ff8bbdc Remove mjCAlternative and user_objects dependency from xml_urdf.
PiperOrigin-RevId: 618832482
Change-Id: I626bb956cd3eb35317811b9b577cc7db128262ea
2024-03-25 07:21:03 -07:00
Matthew Bennice 7875e93fea Improve error text when a mesh face references an invalid vertex.
PiperOrigin-RevId: 618715730
Change-Id: I28fae1e1570d359db4be98e9c5b7713169eaf34f
2024-03-24 20:59:16 -07:00
Yuval Tassa bb42ff1657 Fix order of enable flag strings. Before this change, using the UI to toggle the "InvDiscrete" and "Sensornoise" flags would toggle the opposite flag.
PiperOrigin-RevId: 618658133
Change-Id: I35d4b9da2fdf68fed24efd518a30af60d3a806eb
2024-03-24 13:13:21 -07:00
Baruch Tabanpour 2019d42ca6 Small change to testspeed file.
PiperOrigin-RevId: 618323795
Change-Id: I3a6307b8ae6d9af0d17c0ae85eae673d60112ddf
2024-03-22 17:04:49 -07:00
Cong Wang 31d48d3e44 Update fluid.rst 2024-03-22 16:07:57 +01:00
Yuval Tassa 4660a297d1 rename mjspec api structs and functions mjm -> mjs
PiperOrigin-RevId: 618017976
Change-Id: I5f790167e5ca670f8d5f92e8e1c920db8d236144
2024-03-21 18:04:50 -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
Alessio Quaglino c3fb8e7f35 Do not attach elements not referenced in the subtree.
PiperOrigin-RevId: 617849280
Change-Id: I391fe7c00f67d020d7394ddd31219d727b2eaa94
2024-03-21 08:22:03 -07:00
Alessio Quaglino b0daccc234 Allow meshes with flipped faces if exactmeshinertia is false.
Fixes #1529.

PiperOrigin-RevId: 617824308
Change-Id: I926c385475dd79f07e88fe1925ecbb2adb4f8917
2024-03-21 06:36:07 -07:00
Baruch Tabanpour 624becca52 Fix some more bugs in sphere/capsule-convex collisions.
PiperOrigin-RevId: 617646119
Change-Id: Ie0c99ccbe1dd2a18663d45a111e77fed4112e638
2024-03-20 15:46:13 -07:00
Alessio Quaglino 07da7336e8 Set mesh visual flag regardless of discardvisual.
PiperOrigin-RevId: 617428859
Change-Id: I427d888e6caa2fe1ae6597ca7165c600c9779cc7
2024-03-20 01:15:52 -07:00
Erik Frey 9b86329797 Add 01-10 humanoids for benchmarking.
PiperOrigin-RevId: 617318016
Change-Id: Ic5dc0623266d4d6bef6da97d03370010e2817a2a
2024-03-19 15:48:48 -07:00
Matthew Bennice 20c8e3e43b Implement basic USD test
PiperOrigin-RevId: 617302442
Change-Id: Ic598df9757288640b5f35c4e740958884b1b4698
2024-03-19 14:53:18 -07:00
Baruch Tabanpour b4694ee331 Fix bug in MJX viewer.
PiperOrigin-RevId: 617297574
Change-Id: I34fb797db47308a8b2f29a6c54f2b59d77f84a32
2024-03-19 14:36:15 -07:00
Alessio Quaglino cc85a38f3c Add mjm_attachBody to the C API.
PiperOrigin-RevId: 617207000
Change-Id: I1fe59ba0d79938a4a383b115997c31dd6c71b8e5
2024-03-19 10:01:00 -07:00
Yuval Tassa 91192393a0 Add material and nonzero elevation data to hfield in testdata/model.xml
PiperOrigin-RevId: 617011327
Change-Id: I46f4fdbd67027003a710a365d0ad29f9158ff85f
2024-03-18 18:26:13 -07:00
Kevin Zakka c16a23d6c5 Fix typo in least squares notebook.
PiperOrigin-RevId: 616927630
Change-Id: I06f361a6ec55f37123bd9eced29111e1920b9dc7
2024-03-18 13:23:07 -07:00
Alessio Quaglino 372aa021d0 Add copy constructor and assignment to mjCModel.
PiperOrigin-RevId: 616850780
Change-Id: I7fedab2efa2a90fd7ce952eac4e195f77c5ff5bc
2024-03-18 09:25:27 -07:00
Nimrod Gileadi de918a8b2d Small cosmetic fixes to MakeBVH.
Remove the index member of BVElement, since it's redundant for the purpose of sorting. BVElement is now 32 bytes instead of 40, which should make things a bit better, as this data gets moved around during MakeBVH. Unfortunately, this has no measurable effect on the benchmark.

PiperOrigin-RevId: 616806520
Change-Id: I3b8a28c42a4a21dc25985e63ac57764fdb669afa
2024-03-18 06:19:33 -07:00
Alessio Quaglino acaf86a96f Fix input array size in mju_mulMatMat3.
PiperOrigin-RevId: 616802192
Change-Id: I4dbc07d392b23a7014331ab850b685c1b82d3dcf
2024-03-18 06:00:45 -07:00
Yuval Tassa 8afcfd0fa1 Add custom elements to testdata/model.xml
PiperOrigin-RevId: 616752352
Change-Id: Iaaee19657e97f4962d9a2fe6e7671f3ce832264a
2024-03-18 01:58:52 -07:00
Yuval Tassa dd2580e546 Add internal functions for 3x3 matmul.
PiperOrigin-RevId: 616749614
Change-Id: I7f3ac2ffc826076b6c97424324f03ecd9ccd4655
2024-03-18 01:44:10 -07:00
Copybara-Service 398fd108b4 Merge pull request #1508 from Balint-H:fix/limit-auto-parsing
PiperOrigin-RevId: 616680348
Change-Id: I55edeec1d522ab6f04514747b3c4ad5dfb2cd45f
2024-03-17 18:39:26 -07:00
Baruch Tabanpour e95159b4f6 Small fix to mjx tutorial.
PiperOrigin-RevId: 616235636
Change-Id: I38675c032bdca8f26ab0550896928d097ee86653
2024-03-15 14:00:28 -07:00
Kyle Bayes 74d3d8cb4e Cache OBJ files in MuJoCo compiler.
PiperOrigin-RevId: 616211896
Change-Id: I3b765f4529957914e6154f0e62ef36fd9df93c96
2024-03-15 12:32:06 -07:00
Yuval Tassa bf66801bc9 Move printing of model BVH data to the end, make it more compact.
PiperOrigin-RevId: 616186922
Change-Id: Id6368a5efd831698f182fe97251b9608312c663c
2024-03-15 11:10:15 -07:00
Nimrod Gileadi c5aa22b177 Speed up MakeBVH.
1. Avoid creating unnecessary temporary vectors for the left and right sides of the recursive call, since std::nth_element already splits the array in the right way.
2. Filter contype and conaffinity before calling MakeBVH. This only affects the top level of the MakeBVH recursion.
3. Avoid repeatedly computing mju_rotVecQuat for each element at each nesting level.

This is roughly a 2x speedup.

PiperOrigin-RevId: 616152673
Change-Id: I6ce7d99cd4a923c43156beb3f2493c649602260e
2024-03-15 09:24:40 -07:00
Kyle Bayes c7a8b104f9 Add modified callback for VFS resource provider.
PiperOrigin-RevId: 616152275
Change-Id: I417f9b204eaa1eb9fc68a15927f86031dcd20575
2024-03-15 09:23:29 -07:00
Kyle Bayes c42868a91b Update logic for OS filesystem timestamps for caching.
PiperOrigin-RevId: 616138153
Change-Id: I0ce966546bc4af04e57b983e27bbd75a94377237
2024-03-15 08:31:56 -07:00
Yuval Tassa a23cb4d22c Cite Vaxenburg et al. in fluid force documentation.
PiperOrigin-RevId: 616114884
Change-Id: I0e7db61820c6ece118dee6871b8a526fdb79fb02
2024-03-15 06:57:49 -07:00
Kyle Bayes 9fef77193f Fix V -> B typo in lookup table for encoding Base64.
PiperOrigin-RevId: 615968363
Change-Id: I1dae697462afcae48442610b1fe4acab93b6d62d
2024-03-14 18:29:21 -07:00
Baruch Tabanpour 2386353b02 Throw an error for margin/gap with meshes.
PiperOrigin-RevId: 615937263
Change-Id: I3289cf1b1fec93385cc78a01e53866427453db59
2024-03-14 16:21:05 -07:00
Erik Frey 02c62c118c Fix bug where treedef for mjx.make_data doesn't match mjx.put_data.
PiperOrigin-RevId: 615928973
Change-Id: I08af97ac0300b9d51c1f4b46d48dde98d24197fa
2024-03-14 15:51:15 -07:00
Baruch Tabanpour e5811ce2b4 Further improve edge contact for capsule-convex.
PiperOrigin-RevId: 615900645
Change-Id: I7fd495b10b7b3121da7aa5ed15cde413d916bc84
2024-03-14 14:15:44 -07:00
Baruch Tabanpour f818a16ae4 Fix the bugfix for capsule-convex collisions.
PiperOrigin-RevId: 615809115
Change-Id: I183336630a76a9ada5b0730559b49779dd94f8e5
2024-03-14 09:41:33 -07:00