Skip to content

Commit

Permalink
Move mesh inertia specification from global <compiler> to <asset/mesh>.
Browse files Browse the repository at this point in the history
Three options:
- Convex: Use convex hull
- Exact: Use exact geometry (requires watertight mesh)
- Legacy: Legacy approximation (deprecated)

Fixes #2152

PiperOrigin-RevId: 688949900
Change-Id: I5f0e22e082af4fe554bcf2e544ccd4a81a71e15c
  • Loading branch information
quagla authored and copybara-github committed Oct 23, 2024
1 parent 1e1fbb1 commit 94629d2
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion dm_control/mjcf/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<attribute name="fusestatic" type="keyword" valid_values="false true"/>
<attribute name="inertiafromgeom" type="keyword" valid_values="false true auto"/>
<attribute name="inertiagrouprange" type="array" array_type="int" array_size="2"/>
<attribute name="exactmeshinertia" type="keyword" valid_values="false true"/>
<attribute name="alignfree" type="keyword" valid_values="false true"/>
</attributes>
<children>
Expand Down Expand Up @@ -235,6 +234,7 @@
<attributes>
<attribute name="scale" type="array" array_type="float" array_size="3"/>
<attribute name="maxhullvert" type="int"/>
<attribute name="exactmeshinertia" type="keyword" valid_values="legacy convex exact"/>
</attributes>
</element>
<element name="material">
Expand Down Expand Up @@ -553,6 +553,7 @@
<attributes>
<attribute name="scale" type="array" array_type="float" array_size="3"/>
<attribute name="maxhullvert" type="int"/>
<attribute name="exactmeshinertia" type="keyword" valid_values="legacy convex exact"/>
</attributes>
</element>
<element name="material">
Expand Down Expand Up @@ -986,6 +987,7 @@
<attribute name="refpos" type="array" array_type="float" array_size="3"/>
<attribute name="refquat" type="array" array_type="float" array_size="4"/>
<attribute name="maxhullvert" type="int"/>
<attribute name="exactmeshinertia" type="keyword" valid_values="legacy convex exact"/>
</attributes>
<children>
<element name="plugin" repeated="true" namespace="mesh">
Expand Down

0 comments on commit 94629d2

Please sign in to comment.