Skip to content

Commit cfa98e2

Browse files
kwokcbkwokcb
authored
25.05 test updates (#26)
* Test comparison updates for 25.05 rc1. * Update diffs.
1 parent aa26ac3 commit cfa98e2

81 files changed

Lines changed: 278 additions & 278 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎tests/glsl_vs_glslfx.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ <h2 class="text-center">MaterialX RTS Comparison</h2>
12361236
<tr class='row'>
12371237
<td class='col-sm'>LamaLayerBSDFTest_glsl.png</td>
12381238
<td class='col-sm'>LamaLayerBSDFTest_glslfx.png</td>
1239-
<td class='col-sm'><p>GLSL vs. GLSLFXRMS: (RMS 0.01390)</p>
1239+
<td class='col-sm'><p>GLSL vs. GLSLFXRMS: (RMS 0.01311)</p>
12401240
</td><td class='col-sm'>Histogram: GLSL vs. GLSLFX</p>
12411241
</td>
12421242
</tr>

‎tests/glsl_vs_osl_glslfx.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1637,7 +1637,7 @@ <h2 class="text-center">MaterialX RTS Comparison</h2>
16371637
<td class='col-sm'>LamaLayerBSDFTest_glslfx.png</td>
16381638
<td class='col-sm'><p>GLSL vs. OSLRMS: (RMS 0.01023)</p>
16391639
</td>
1640-
<td class='col-sm'><p>GLSL vs. GLSLFXRMS: (RMS 0.01390)</p>
1640+
<td class='col-sm'><p>GLSL vs. GLSLFXRMS: (RMS 0.01311)</p>
16411641
</td>
16421642
</tr>
16431643
</table>

‎tests/physically_based/MPB_Aluminum.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Aluminum>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

‎tests/physically_based/MPB_Banana.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Banana>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

‎tests/physically_based/MPB_Blackboard.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Blackboard>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

‎tests/physically_based/MPB_Blood.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Blood>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

‎tests/physically_based/MPB_Bone.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Bone>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

‎tests/physically_based/MPB_Brass.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Brass>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

‎tests/physically_based/MPB_Brick.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Brick>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

‎tests/physically_based/MPB_Car_Paint.usda‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#usda 1.0
22
(
33
defaultPrim = "TestScene"
4-
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\Work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\Work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
4+
doc = "Combined content from: ./physically_based\\stdsurf_materials_converted.mtlx, D:\\work\\materialx\\materialxusd\\tests\\data\\shaderball.usd, D:\\work\\materialx\\materialxusd\\tests\\data\\san_giuseppe_bridge.hdr."
55
metersPerUnit = 1
66
upAxis = "Y"
77
)
@@ -7333,7 +7333,7 @@ def Xform "TestScene"
73337333
{
73347334
def Xform "Geometry" (
73357335
prepend apiSchemas = ["MaterialBindingAPI"]
7336-
prepend references = @D:\Work\materialx\materialxusd\tests\data\shaderball.usd@
7336+
prepend references = @D:\work\materialx\materialxusd\tests\data\shaderball.usd@
73377337
)
73387338
{
73397339
rel material:binding = </MaterialX/Materials/MPB_Car_Paint>
@@ -7348,14 +7348,14 @@ def Xform "TestScene"
73487348
{
73497349
float guideRadius = 1
73507350
float inputs:intensity = 1
7351-
asset inputs:texture:file = @D:\Work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
7351+
asset inputs:texture:file = @D:\work\materialx\materialxusd\tests\data\san_giuseppe_bridge.hdr@
73527352
float3 xformOp:rotateXYZ = (0, 0, 0)
73537353
uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
73547354
}
73557355
}
73567356

73577357
def Xform "Camera" (
7358-
prepend references = @D:\Work\materialx\materialxusd\tests\data\camera.usda@
7358+
prepend references = @D:\work\materialx\materialxusd\tests\data\camera.usda@
73597359
)
73607360
{
73617361
}

0 commit comments

Comments
 (0)