Commit Graph

55 Commits

Author SHA1 Message Date
Copybara-Service 7e9481fbeb Merge pull request #2067 from abhihjoshi:documentation
PiperOrigin-RevId: 682364758
Change-Id: I3a5000a2851a560018ae0e04a2b7ad13415cb7c6
2024-10-04 10:15:19 -07:00
Abhishek Joshi 456dcc150c Updating documentation for comments 2024-09-23 14:10:48 -04:00
Copybara-Service 56bb3ca5de Merge pull request #1901 from abhihjoshi:usd-fixes
PiperOrigin-RevId: 671815757
Change-Id: I8a08385b63401c743253545d89389ab8aaac91bc
2024-09-06 10:31:09 -07:00
Abhishek Joshi fe1d6dad02 Using temp directory for usd exporter test 2024-09-04 18:18:37 -04:00
Abhishek Joshi c0dc787cee Removing mujoco renderer dependency 2024-08-30 18:23:13 -04:00
Abhishek Joshi 5dc9c07fa6 Removing scipy dependency 2024-08-30 12:56:25 -04:00
Abhishek Joshi f358cf664b Removing unused logging import 2024-08-19 11:23:43 -05:00
Abhishek Joshi 492cb7d078 Remove try catch in exporter test 2024-08-19 11:19:18 -05:00
Abhishek Joshi 39cbe5d5b0 Updating USD golden file and exporter_test.py 2024-08-16 12:06:25 -05:00
Abhishek Joshi 58dc62c4ec Fixing USD pipeline after copybara changes 2024-08-13 11:09:02 -07:00
Copybara-Service 98cd49d529 Merge pull request #1827 from abhihjoshi:open3d-removal
PiperOrigin-RevId: 662510404
Change-Id: I79b356eecddb3402c444cb16a305516bd724aef6
2024-08-13 07:33:23 -07:00
Abhishek Joshi e0483c2f86 Updating for PR comments 2024-08-02 15:13:25 -05:00
Abhishek Joshi a470f26a4b Reverting to Union for python 3.9 2024-07-30 15:30:16 -05:00
Abhishek Joshi d7447c4a84 Partial cube mapping implementation in USD 2024-07-21 17:00:16 -05:00
Abhishek Joshi d1ff008a4f Adding UV maps only when texture present 2024-07-21 11:14:00 -05:00
Abhishek Joshi 5abdeb8a71 Correcting utils_module import name 2024-07-20 22:17:49 -05:00
Abhishek Joshi e79aeb6306 Using correct imports 2024-07-20 22:16:01 -05:00
Abhishek Joshi 5c79313b21 Implementing texture scaling for 2D textures 2024-07-20 21:44:57 -05:00
Abhishek Joshi 34060fcc49 Removing Open3D dependency 2024-07-20 19:33:11 -05:00
Tom Erez 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
Tom Erez 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
Alessio Quaglino 384ed8097a Various fixes in mujoco/usd
PiperOrigin-RevId: 653610253
Change-Id: Ibe57c19c6a7326266f51c5cda39cd564bd456c54
2024-07-18 07:20:28 -07:00
Copybara-Service 60afda949c Merge pull request #1714 from abhihjoshi:tendons
PiperOrigin-RevId: 651048034
Change-Id: If5b7cb55ff0007c3c6f932e62f068d1168778a33
2024-07-10 09:26:54 -07:00
Abhishek Joshi e734527e7b Fixing formatting for USD scripts 2024-07-04 16:25:44 -05:00
Abhishek Joshi fcb247e35b Merge remote-tracking branch 'upstream/main' into tendons 2024-07-04 15:10:29 -05:00
Abhishek Joshi c79ae6f242 fixing frame rate bug in demo file 2024-07-04 15:06:25 -05:00
Abhishek Joshi 59303bb161 Fixing formatting for usd files and adding pylint configuration 2024-07-03 18:32:59 -05:00
Tom Erez df7ea3ed33 Add support for multiple textures in one material (mjModel).
PiperOrigin-RevId: 648732764
Change-Id: I29b60dd62a069789a32017ff0d55e36b57e0052b
2024-07-02 08:50:23 -07:00
Tom Erez 3b73dfe33b Add textured materials to render context, and refactor mjvGeom to refer to those textures.
PiperOrigin-RevId: 648719103
Change-Id: Idb4425bdeea3cbc1133cda3e4366574ed3bb5ccc
2024-07-02 08:01:40 -07:00
Abhishek Joshi 09b00cec5d updating rotation matrix function for shapes 2024-06-17 12:37:10 +05:30
Abhishek Joshi 64b64f4169 clearing init file 2024-06-13 19:50:35 +05:30
Abhishek Joshi 428ec9caaf fixing imports 2024-06-03 11:38:13 -05:00
Abhishek Joshi ee82810ad3 removing temp.py 2024-06-02 21:17:23 -05:00
Abhishek Joshi ba842fc0d1 decoupling tendons to subcomponents and fixing tendon scaling issue 2024-06-02 21:16:58 -05:00
Abhishek Joshi 1bbf44c99a adding resolution parameter 2024-05-27 10:26:17 -05:00
Abhishek Joshi bb2c7ae556 adding initial tendon logic 2024-05-09 08:42:29 -05:00
Abhishek Joshi f6ee435005 updating geom visibility logic; fixing infinite plane texture bug; adding frame skip arg to demo 2024-05-04 13:47:02 -05:00
Abhishek Joshi 2d6c263687 removing outdated comments 2024-05-02 17:29:18 -05:00
Abhishek Joshi 7a1e2bf61e adding demo file and unnamed geom fix 2024-05-02 17:23:48 -05:00
Abhishek Joshi a2dfc6d17e updating imports 2024-04-10 14:21:46 -05:00
Abhishek Joshi 916b54b2b7 adding support for unnamed geoms 2024-04-10 12:20:10 -05:00
Abhishek Joshi bd41b69ebb removing test file 2024-04-10 12:03:22 -05:00
Abhishek Joshi 87a7da6cf0 updating capsule to consist of hemispheres instead of spheres 2024-04-10 12:00:05 -05:00
Abhishek Joshi f1fa9c0b8b combining shapes into one class 2024-04-04 21:10:15 -04:00
Abhishek Joshi a4b5355f46 merging with main mujoco repo 2024-04-02 16:39:04 -04:00
Abhishek Joshi 67a9f91c00 updating demo script 2024-04-02 15:11:37 -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
Matthew Bennice 20c8e3e43b Implement basic USD test
PiperOrigin-RevId: 617302442
Change-Id: Ic598df9757288640b5f35c4e740958884b1b4698
2024-03-19 14:53:18 -07:00
Abhishek Joshi df88171ae1 removing unwanted code in __init__ function temporarily 2024-03-18 18:59:22 -05:00
Abhishek Joshi 765ba22cd9 Merge branch 'camera-bug-fixes' into demo_script 2024-03-18 15:50:57 -05:00