e03f8f5f65
Merge branch 'main' into usd-fixes
2024-08-25 19:15:17 -04:00
505d01a1c1
Add error handling to mj_recompile.
...
This CL adds error handling to the mj_recompile function. If the recompile fails, the function will return -1 and set the error message in the spec. The Python wrapper for mj_recompile will catch the error and raise a ValueError exception.
PiperOrigin-RevId: 666784579
Change-Id: I225eca1769ea839c782be3c03fc4ff1ea5885a48
2024-08-23 07:18:28 -07:00
85d19e189b
Adding usd-core optional dependency
2024-08-20 21:39:24 -05:00
2425358c3b
Merge pull request #1796 from google-deepmind:dependabot/pip/python/zipp-3.19.1
...
PiperOrigin-RevId: 665308489
Change-Id: I2db78ac1445cd12a3a4c0ea5d8f4f4fa2403517f
2024-08-20 05:11:29 -07:00
5d91231d31
Rename mjBuffer to mjByteVec.
...
PiperOrigin-RevId: 664872558
Change-Id: I7b003374c390958667635fb21089faf2ece54b14
2024-08-19 10:40:26 -07:00
f358cf664b
Removing unused logging import
2024-08-19 11:23:43 -05:00
69eac7a43f
Merge branch 'usd-fixes' of github.com:abhihjoshi/mujoco into usd-fixes
2024-08-19 11:20:39 -05:00
492cb7d078
Remove try catch in exporter test
2024-08-19 11:19:18 -05:00
1a66c5cca7
Merge branch 'google-deepmind:main' into usd-fixes
2024-08-17 11:13:36 -05:00
0bffd744f9
Add nativeccd flag. When this flag is enabled, general convex collision detection is handled natively, as opposed to using libccd.
...
PiperOrigin-RevId: 663859009
Change-Id: Ife18bb1de62f2154e4725fdf764484a18586b836
2024-08-16 14:08:35 -07:00
9dd0042887
Merge branch 'google-deepmind:main' into usd-fixes
2024-08-16 15:47:16 -05:00
39cbe5d5b0
Updating USD golden file and exporter_test.py
2024-08-16 12:06:25 -05:00
e0e134ca63
Add plugin tests for mjSpec.
...
Fixes #1903 .
PiperOrigin-RevId: 663352920
Change-Id: I3a9e17aec5694e49c20b542f4b0a4402f88a2f17
2024-08-15 10:19:53 -07:00
58dc62c4ec
Fixing USD pipeline after copybara changes
2024-08-13 11:09:02 -07:00
98cd49d529
Merge pull request #1827 from abhihjoshi:open3d-removal
...
PiperOrigin-RevId: 662510404
Change-Id: I79b356eecddb3402c444cb16a305516bd724aef6
2024-08-13 07:33:23 -07:00
851bb6eef4
Add option to mjspec for creating a texture directly from a buffer.
...
PiperOrigin-RevId: 662186527
Change-Id: I469c876681d52964ac971c0bb2ec3517224d3a3d
2024-08-12 12:29:08 -07:00
2c56946547
Increase mjVERSIONSTRING to 3.2.3 after release.
...
PiperOrigin-RevId: 660891033
Change-Id: I2bda69d11cab60a83b0c77bb53214240eacaea62
2024-08-08 10:31:57 -07:00
ebc48d2783
Update the MuJoCo version to v3.2.2 following the 3.2.1 release.
...
PiperOrigin-RevId: 660036707
Change-Id: I7e649e5a0ce6db863bcb99dc4fc1aa851b3f5140
2024-08-06 11:39:30 -07:00
828b900358
Update dependency versions.
...
PiperOrigin-RevId: 659624959
Change-Id: I21bb1f352107ed399a1029aa1d7f5b6ed29ab3cf
2024-08-05 11:37:14 -07:00
e0483c2f86
Updating for PR comments
2024-08-02 15:13:25 -05:00
d538bf994d
Update version to 3.2.1 following the 3.2.0 release.
...
PiperOrigin-RevId: 658412236
Change-Id: I4bd6ccb5dee18059eb6fc0d187afe62598845793
2024-08-01 08:35:42 -07:00
30b98fbe6a
Merge branch 'main' into open3d-removal
2024-07-30 16:32:01 -05:00
a470f26a4b
Reverting to Union for python 3.9
2024-07-30 15:30:16 -05:00
b341bd391d
Fix a bug with mjs_delete functions.
...
PiperOrigin-RevId: 657615906
Change-Id: Ic70eaa9a5c20337db3897cf882a60e9d94f2869b
2024-07-30 09:13:57 -07:00
5ac5cfb618
Support directories in VFS via mj_addBufferVFS.
...
PiperOrigin-RevId: 655286683
Change-Id: I846376a0571d8df28d979beb5981a0cbccd7a04f
2024-07-23 13:39:18 -07:00
d7447c4a84
Partial cube mapping implementation in USD
2024-07-21 17:00:16 -05:00
d1ff008a4f
Adding UV maps only when texture present
2024-07-21 11:14:00 -05:00
5abdeb8a71
Correcting utils_module import name
2024-07-20 22:17:49 -05:00
e79aeb6306
Using correct imports
2024-07-20 22:16:01 -05:00
5c79313b21
Implementing texture scaling for 2D textures
2024-07-20 21:44:57 -05:00
34060fcc49
Removing Open3D dependency
2024-07-20 19:33:11 -05:00
db1d51a1f5
Add more fields to mjx.Option and mjx.Statistic for MuJoCo compatibility.
...
Also add metadata fields to the Python bindings of mjModel and mjOption,
and fix dtype of a number of fields.
PiperOrigin-RevId: 654138876
Change-Id: If2bbe41bf3dfdb350d60b5289afc65fffb397ce9
2024-07-19 15:13:01 -07:00
796173170c
Add support in mjModel for tagging textures with different roles, and use the slot index of a texture to designate its role.
...
PiperOrigin-RevId: 654030065
Change-Id: I34a5b132a7f91a6bb8f260500c1b9c128a03b596
2024-07-19 09:29:22 -07:00
e92af73cbf
Add mjmodel support for textures with different number of channels.
...
PiperOrigin-RevId: 653974959
Change-Id: Ia280e0bdb21027646249f104f21bedee792ba7e5
2024-07-19 05:22:19 -07:00
70ac76bb4b
Add assets to MjSpec.compile()
...
PiperOrigin-RevId: 653965318
Change-Id: Ib9ec1c70a7241f7ee547b799a08cc58e7d4bace7
2024-07-19 04:34:38 -07:00
384ed8097a
Various fixes in mujoco/usd
...
PiperOrigin-RevId: 653610253
Change-Id: Ibe57c19c6a7326266f51c5cda39cd564bd456c54
2024-07-18 07:20:28 -07:00
7f46e936f6
Update setuptools to version 70.3.0.
...
Addresses CVE-2024-6345.
PiperOrigin-RevId: 652857861
Change-Id: Iea5f6cb58b825b226ba61d259775ddbee05acd6d
2024-07-16 08:38:56 -07:00
22ce22ac8a
Update the MuJoCo version number ahead of the 3.2.0 release.
...
PiperOrigin-RevId: 652578624
Change-Id: I8ed6f66ff1247ff7421e3ed0521cf15e1c0b6c79
2024-07-15 13:16:06 -07:00
cb4cb7d09b
Update version hashes in MuJoCo CMake files ahead of the 3.2.0 release.
...
PiperOrigin-RevId: 652555501
Change-Id: I4279ea670e837414adbfc69f6e1e96a4c635f17d
2024-07-15 12:00:25 -07:00
5d51b4cd5f
Check that element is a nullptr before casting.
...
The bug was caused by the fact that the `mjs_as*` functions would return a pointer to a `mjC*` object, even if the input `mjsElement` pointer was null. This would cause a segfault.
PiperOrigin-RevId: 651802736
Change-Id: Ibec00d269a4befadff8a68e0513fd381c7e38a2a
2024-07-12 09:46:16 -07:00
a0df72f43f
Raise memory limit so test passes with dynamic linking
...
The memory leak test fails with `RAW: mmap error: 12` when dynamic
linking is enabled. This is probabably because
of the additional memory overhead dynamic linking incurs. Raising it slightly
appears to satisfy the test.
Tested:
TAP --sample ran all affected tests and none failed
http://test/OCL:650692833:BASE:650634362:1720548680801:c55c6a68
PiperOrigin-RevId: 651750900
Change-Id: Ia63d153b326ff7451391789e2d7cae50a62be723
2024-07-12 06:10:37 -07:00
e7301edd20
Copy arena contents in mj_copyData.
...
Fixes #1710 .
PiperOrigin-RevId: 651351384
Change-Id: I56e3204b30bb18f48278117e85e90464177da973
2024-07-11 03:54:44 -07:00
60afda949c
Merge pull request #1714 from abhihjoshi:tendons
...
PiperOrigin-RevId: 651048034
Change-Id: If5b7cb55ff0007c3c6f932e62f068d1168778a33
2024-07-10 09:26:54 -07:00
143196ee79
Bump zipp from 3.17.0 to 3.19.1 in /python
...
Bumps [zipp](https://github.com/jaraco/zipp ) from 3.17.0 to 3.19.1.
- [Release notes](https://github.com/jaraco/zipp/releases )
- [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst )
- [Commits](https://github.com/jaraco/zipp/compare/v3.17.0...v3.19.1 )
---
updated-dependencies:
- dependency-name: zipp
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-07-09 18:59:23 +00:00
9d0812911c
Add a test for type attribute.
...
PiperOrigin-RevId: 649635359
Change-Id: Ibe5d9fcb5f14371e5f154d645b838a9d012331d5
2024-07-05 06:16:46 -07:00
e734527e7b
Fixing formatting for USD scripts
2024-07-04 16:25:44 -05:00
fcb247e35b
Merge remote-tracking branch 'upstream/main' into tendons
2024-07-04 15:10:29 -05:00
c79ae6f242
fixing frame rate bug in demo file
2024-07-04 15:06:25 -05:00
d029e4ff99
Get rid of unnecessary return value policy specification.
...
PiperOrigin-RevId: 649437250
Change-Id: I61f8db0af526ebf667244124fcd4984881c6ef13
2024-07-04 09:45:22 -07:00
47d25bc4ac
Add missing id attributes in Python bindings of mjsElements.
...
PiperOrigin-RevId: 649435098
Change-Id: I16383958c25cb8fdc16a107d5abef8626a675632
2024-07-04 09:32:33 -07:00
Abhishek Joshi