Skip to content

Commit 6f0f150

Browse files
yuvaltassacopybara-github
authored andcommitted
Refactor PBR texture layers from separate sub-elements to a single layer sub-element.
Add new element to PyMJCF schema. PiperOrigin-RevId: 690115286 Change-Id: I016cb7624f93f8a80c7ed6191655b1b8432ef128
1 parent 073e955 commit 6f0f150

1 file changed

Lines changed: 3 additions & 42 deletions

File tree

dm_control/mjcf/schema.xml

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -917,49 +917,10 @@
917917
<attribute name="vflip" type="keyword" valid_values="false true"/>
918918
</attributes>
919919
<children>
920-
<element name="rgb" repeated="false">
920+
<element name="layer" repeated="true">
921921
<attributes>
922-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
923-
</attributes>
924-
</element>
925-
<element name="normal" repeated="false">
926-
<attributes>
927-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
928-
</attributes>
929-
</element>
930-
<element name="occlusion" repeated="false">
931-
<attributes>
932-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
933-
</attributes>
934-
</element>
935-
<element name="roughness" repeated="false">
936-
<attributes>
937-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
938-
</attributes>
939-
</element>
940-
<element name="metallic" repeated="false">
941-
<attributes>
942-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
943-
</attributes>
944-
</element>
945-
<element name="opacity" repeated="false">
946-
<attributes>
947-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
948-
</attributes>
949-
</element>
950-
<element name="emissive" repeated="false">
951-
<attributes>
952-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
953-
</attributes>
954-
</element>
955-
<element name="orm" repeated="false">
956-
<attributes>
957-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
958-
</attributes>
959-
</element>
960-
<element name="rgba" repeated="false">
961-
<attributes>
962-
<attribute name="texture" type="reference" required="false" reference_namespace="texture"/>
922+
<attribute name="texture" type="reference"/>
923+
<attribute name="role" type="keyword" valid_values="rgb normal occlusion roughness metallic opacity emissive orm rgba"/>
963924
</attributes>
964925
</element>
965926
</children>

0 commit comments

Comments
 (0)