Update tests (#1400)

* Update tests * Fixing invalid ocio path in tests 1334 and 1245
Autodesk · Jan 24, 2023 · 6daf12c · 6daf12c
1 parent 17a4040
commit 6daf12c
Show file tree

Hide file tree

Showing 19 changed files with 1,676 additions and 1,725 deletions.
diff --git a/testsuite/test_0023/ref/reference.log b/testsuite/test_0023/ref/reference.log
diff --git a/testsuite/test_0023/ref/reference.tif b/testsuite/test_0023/ref/reference.tif
diff --git a/testsuite/test_0024/ref/reference.log b/testsuite/test_0024/ref/reference.log
diff --git a/testsuite/test_0024/ref/reference.tif b/testsuite/test_0024/ref/reference.tif
diff --git a/testsuite/test_0038/ref/reference.log b/testsuite/test_0038/ref/reference.log
diff --git a/testsuite/test_0038/ref/reference.tif b/testsuite/test_0038/ref/reference.tif
diff --git a/testsuite/test_0142/ref/reference.log b/testsuite/test_0142/ref/reference.log
diff --git a/testsuite/test_0142/ref/reference.tif b/testsuite/test_0142/ref/reference.tif
diff --git a/testsuite/test_0161/ref/reference.log b/testsuite/test_0161/ref/reference.log
diff --git a/testsuite/test_0161/ref/reference.tif b/testsuite/test_0161/ref/reference.tif
diff --git a/testsuite/test_0168/ref/reference.log b/testsuite/test_0168/ref/reference.log
diff --git a/testsuite/test_0168/ref/reference.tif b/testsuite/test_0168/ref/reference.tif
diff --git a/testsuite/test_0231/ref/reference.log b/testsuite/test_0231/ref/reference.log
diff --git a/testsuite/test_0231/ref/reference.tif b/testsuite/test_0231/ref/reference.tif
diff --git a/testsuite/test_1245/data/test.usda b/testsuite/test_1245/data/test.usda
@@ -13,7 +13,6 @@ def ArnoldOptions "options"
     int arnold:AA_samples = 3
     int arnold:AA_seed = 0
     string arnold:camera = "/persp/perspShape"
-    string arnold:color_manager = "defaultColorMgtGlobals"
     int arnold:GI_diffuse_depth = 1
     int arnold:GI_specular_depth = 1
     int arnold:GI_transmission_depth = 8
@@ -50,13 +49,6 @@ def "defaultArnoldDriver"
     }
 }
 
-def ArnoldColorManagerOcio "defaultColorMgtGlobals"
-{
-    string arnold:color_space_linear = "ACEScg"
-    string arnold:config = "C:/Program Files/Autodesk/Maya2023/resources/OCIO-configs/Maya2022-default/config.ocio"
-    string arnold:name = "defaultColorMgtGlobals"
-}
-
 def Xform "persp"
 {
     def Camera "perspShape"

diff --git a/testsuite/test_1334/data/test.usda b/testsuite/test_1334/data/test.usda
@@ -13,7 +13,6 @@ def ArnoldOptions "options"
     int arnold:AA_samples = 3
     int arnold:AA_seed = 0
     string arnold:camera = "/persp/perspShape"
-    string arnold:color_manager = "defaultColorMgtGlobals"
     int arnold:GI_diffuse_depth = 1
     int arnold:GI_specular_depth = 1
     int arnold:GI_transmission_depth = 8
@@ -51,13 +50,6 @@ def "defaultArnoldDriver"
     }
 }
 
-def ArnoldColorManagerOcio "defaultColorMgtGlobals"
-{
-    string arnold:color_space_linear = "ACEScg"
-    string arnold:config = "C:/Program Files/Autodesk/Maya2023/resources/OCIO-configs/Maya2022-default/config.ocio"
-    string arnold:name = "defaultColorMgtGlobals"
-}
-
 def Xform "persp"
 {
     def Camera "perspShape"

diff --git a/testsuite/test_1366/data/test.usda b/testsuite/test_1366/data/test.usda
@@ -27,6 +27,8 @@ def Mesh "pSphere1" (
         interpolation = "faceVarying"
     )
     int[] primvars:st:indices = [0, 1, 22, 21, 1, 2, 23, 22, 2, 3, 24, 23, 3, 4, 25, 24, 4, 5, 26, 25, 5, 6, 27, 26, 6, 7, 28, 27, 7, 8, 29, 28, 8, 9, 30, 29, 9, 10, 31, 30, 10, 11, 32, 31, 11, 12, 33, 32, 12, 13, 34, 33, 13, 14, 35, 34, 14, 15, 36, 35, 15, 16, 37, 36, 16, 17, 38, 37, 17, 18, 39, 38, 18, 19, 40, 39, 19, 20, 41, 40, 21, 22, 43, 42, 22, 23, 44, 43, 23, 24, 45, 44, 24, 25, 46, 45, 25, 26, 47, 46, 26, 27, 48, 47, 27, 28, 49, 48, 28, 29, 50, 49, 29, 30, 51, 50, 30, 31, 52, 51, 31, 32, 53, 52, 32, 33, 54, 53, 33, 34, 55, 54, 34, 35, 56, 55, 35, 36, 57, 56, 36, 37, 58, 57, 37, 38, 59, 58, 38, 39, 60, 59, 39, 40, 61, 60, 40, 41, 62, 61, 42, 43, 64, 63, 43, 44, 65, 64, 44, 45, 66, 65, 45, 46, 67, 66, 46, 47, 68, 67, 47, 48, 69, 68, 48, 49, 70, 69, 49, 50, 71, 70, 50, 51, 72, 71, 51, 52, 73, 72, 52, 53, 74, 73, 53, 54, 75, 74, 54, 55, 76, 75, 55, 56, 77, 76, 56, 57, 78, 77, 57, 58, 79, 78, 58, 59, 80, 79, 59, 60, 81, 80, 60, 61, 82, 81, 61, 62, 83, 82, 63, 64, 85, 84, 64, 65, 86, 85, 65, 66, 87, 86, 66, 67, 88, 87, 67, 68, 89, 88, 68, 69, 90, 89, 69, 70, 91, 90, 70, 71, 92, 91, 71, 72, 93, 92, 72, 73, 94, 93, 73, 74, 95, 94, 74, 75, 96, 95, 75, 76, 97, 96, 76, 77, 98, 97, 77, 78, 99, 98, 78, 79, 100, 99, 79, 80, 101, 100, 80, 81, 102, 101, 81, 82, 103, 102, 82, 83, 104, 103, 84, 85, 106, 105, 85, 86, 107, 106, 86, 87, 108, 107, 87, 88, 109, 108, 88, 89, 110, 109, 89, 90, 111, 110, 90, 91, 112, 111, 91, 92, 113, 112, 92, 93, 114, 113, 93, 94, 115, 114, 94, 95, 116, 115, 95, 96, 117, 116, 96, 97, 118, 117, 97, 98, 119, 118, 98, 99, 120, 119, 99, 100, 121, 120, 100, 101, 122, 121, 101, 102, 123, 122, 102, 103, 124, 123, 103, 104, 125, 124, 105, 106, 127, 126, 106, 107, 128, 127, 107, 108, 129, 128, 108, 109, 130, 129, 109, 110, 131, 130, 110, 111, 132, 131, 111, 112, 133, 132, 112, 113, 134, 133, 113, 114, 135, 134, 114, 115, 136, 135, 115, 116, 137, 136, 116, 117, 138, 137, 117, 118, 139, 138, 118, 119, 140, 139, 119, 120, 141, 140, 120, 121, 142, 141, 121, 122, 143, 142, 122, 123, 144, 143, 123, 124, 145, 144, 124, 125, 146, 145, 126, 127, 148, 147, 127, 128, 149, 148, 128, 129, 150, 149, 129, 130, 151, 150, 130, 131, 152, 151, 131, 132, 153, 152, 132, 133, 154, 153, 133, 134, 155, 154, 134, 135, 156, 155, 135, 136, 157, 156, 136, 137, 158, 157, 137, 138, 159, 158, 138, 139, 160, 159, 139, 140, 161, 160, 140, 141, 162, 161, 141, 142, 163, 162, 142, 143, 164, 163, 143, 144, 165, 164, 144, 145, 166, 165, 145, 146, 167, 166, 147, 148, 169, 168, 148, 149, 170, 169, 149, 150, 171, 170, 150, 151, 172, 171, 151, 152, 173, 172, 152, 153, 174, 173, 153, 154, 175, 174, 154, 155, 176, 175, 155, 156, 177, 176, 156, 157, 178, 177, 157, 158, 179, 178, 158, 159, 180, 179, 159, 160, 181, 180, 160, 161, 182, 181, 161, 162, 183, 182, 162, 163, 184, 183, 163, 164, 185, 184, 164, 165, 186, 185, 165, 166, 187, 186, 166, 167, 188, 187, 168, 169, 190, 189, 169, 170, 191, 190, 170, 171, 192, 191, 171, 172, 193, 192, 172, 173, 194, 193, 173, 174, 195, 194, 174, 175, 196, 195, 175, 176, 197, 196, 176, 177, 198, 197, 177, 178, 199, 198, 178, 179, 200, 199, 179, 180, 201, 200, 180, 181, 202, 201, 181, 182, 203, 202, 182, 183, 204, 203, 183, 184, 205, 204, 184, 185, 206, 205, 185, 186, 207, 206, 186, 187, 208, 207, 187, 188, 209, 208, 189, 190, 211, 210, 190, 191, 212, 211, 191, 192, 213, 212, 192, 193, 214, 213, 193, 194, 215, 214, 194, 195, 216, 215, 195, 196, 217, 216, 196, 197, 218, 217, 197, 198, 219, 218, 198, 199, 220, 219, 199, 200, 221, 220, 200, 201, 222, 221, 201, 202, 223, 222, 202, 203, 224, 223, 203, 204, 225, 224, 204, 205, 226, 225, 205, 206, 227, 226, 206, 207, 228, 227, 207, 208, 229, 228, 208, 209, 230, 229, 210, 211, 232, 231, 211, 212, 233, 232, 212, 213, 234, 233, 213, 214, 235, 234, 214, 215, 236, 235, 215, 216, 237, 236, 216, 217, 238, 237, 217, 218, 239, 238, 218, 219, 240, 239, 219, 220, 241, 240, 220, 221, 242, 241, 221, 222, 243, 242, 222, 223, 244, 243, 223, 224, 245, 244, 224, 225, 246, 245, 225, 226, 247, 246, 226, 227, 248, 247, 227, 228, 249, 248, 228, 229, 250, 249, 229, 230, 251, 250, 231, 232, 253, 252, 232, 233, 254, 253, 233, 234, 255, 254, 234, 235, 256, 255, 235, 236, 257, 256, 236, 237, 258, 257, 237, 238, 259, 258, 238, 239, 260, 259, 239, 240, 261, 260, 240, 241, 262, 261, 241, 242, 263, 262, 242, 243, 264, 263, 243, 244, 265, 264, 244, 245, 266, 265, 245, 246, 267, 266, 246, 247, 268, 267, 247, 248, 269, 268, 248, 249, 270, 269, 249, 250, 271, 270, 250, 251, 272, 271, 252, 253, 274, 273, 253, 254, 275, 274, 254, 255, 276, 275, 255, 256, 277, 276, 256, 257, 278, 277, 257, 258, 279, 278, 258, 259, 280, 279, 259, 260, 281, 280, 260, 261, 282, 281, 261, 262, 283, 282, 262, 263, 284, 283, 263, 264, 285, 284, 264, 265, 286, 285, 265, 266, 287, 286, 266, 267, 288, 287, 267, 268, 289, 288, 268, 269, 290, 289, 269, 270, 291, 290, 270, 271, 292, 291, 271, 272, 293, 292, 273, 274, 295, 294, 274, 275, 296, 295, 275, 276, 297, 296, 276, 277, 298, 297, 277, 278, 299, 298, 278, 279, 300, 299, 279, 280, 301, 300, 280, 281, 302, 301, 281, 282, 303, 302, 282, 283, 304, 303, 283, 284, 305, 304, 284, 285, 306, 305, 285, 286, 307, 306, 286, 287, 308, 307, 287, 288, 309, 308, 288, 289, 310, 309, 289, 290, 311, 310, 290, 291, 312, 311, 291, 292, 313, 312, 292, 293, 314, 313, 294, 295, 316, 315, 295, 296, 317, 316, 296, 297, 318, 317, 297, 298, 319, 318, 298, 299, 320, 319, 299, 300, 321, 320, 300, 301, 322, 321, 301, 302, 323, 322, 302, 303, 324, 323, 303, 304, 325, 324, 304, 305, 326, 325, 305, 306, 327, 326, 306, 307, 328, 327, 307, 308, 329, 328, 308, 309, 330, 329, 309, 310, 331, 330, 310, 311, 332, 331, 311, 312, 333, 332, 312, 313, 334, 333, 313, 314, 335, 334, 315, 316, 337, 336, 316, 317, 338, 337, 317, 318, 339, 338, 318, 319, 340, 339, 319, 320, 341, 340, 320, 321, 342, 341, 321, 322, 343, 342, 322, 323, 344, 343, 323, 324, 345, 344, 324, 325, 346, 345, 325, 326, 347, 346, 326, 327, 348, 347, 327, 328, 349, 348, 328, 329, 350, 349, 329, 330, 351, 350, 330, 331, 352, 351, 331, 332, 353, 352, 332, 333, 354, 353, 333, 334, 355, 354, 334, 335, 356, 355, 336, 337, 358, 357, 337, 338, 359, 358, 338, 339, 360, 359, 339, 340, 361, 360, 340, 341, 362, 361, 341, 342, 363, 362, 342, 343, 364, 363, 343, 344, 365, 364, 344, 345, 366, 365, 345, 346, 367, 366, 346, 347, 368, 367, 347, 348, 369, 368, 348, 349, 370, 369, 349, 350, 371, 370, 350, 351, 372, 371, 351, 352, 373, 372, 352, 353, 374, 373, 353, 354, 375, 374, 354, 355, 376, 375, 355, 356, 377, 376, 357, 358, 379, 378, 358, 359, 380, 379, 359, 360, 381, 380, 360, 361, 382, 381, 361, 362, 383, 382, 362, 363, 384, 383, 363, 364, 385, 384, 364, 365, 386, 385, 365, 366, 387, 386, 366, 367, 388, 387, 367, 368, 389, 388, 368, 369, 390, 389, 369, 370, 391, 390, 370, 371, 392, 391, 371, 372, 393, 392, 372, 373, 394, 393, 373, 374, 395, 394, 374, 375, 396, 395, 375, 376, 397, 396, 376, 377, 398, 397, 1, 0, 399, 2, 1, 400, 3, 2, 401, 4, 3, 402, 5, 4, 403, 6, 5, 404, 7, 6, 405, 8, 7, 406, 9, 8, 407, 10, 9, 408, 11, 10, 409, 12, 11, 410, 13, 12, 411, 14, 13, 412, 15, 14, 413, 16, 15, 414, 17, 16, 415, 18, 17, 416, 19, 18, 417, 20, 19, 418, 378, 379, 419, 379, 380, 420, 380, 381, 421, 381, 382, 422, 382, 383, 423, 383, 384, 424, 384, 385, 425, 385, 386, 426, 386, 387, 427, 387, 388, 428, 388, 389, 429, 389, 390, 430, 390, 391, 431, 391, 392, 432, 392, 393, 433, 393, 394, 434, 394, 395, 435, 395, 396, 436, 396, 397, 437, 397, 398, 438]
+
+    float primvars:arnold:disp_padding = 3
 }
 
 def Scope "mtl"
@@ -56,7 +58,7 @@ def Scope "mtl"
         {
             uniform token info:id = "ND_displacement_float"
             float inputs:displacement.connect = </mtl/float_displacement/image1.outputs:out>
-            float inputs:scale = 10
+            float inputs:scale = 3
             token outputs:out
             uniform float2 ui:nodegraph:node:pos = (-0.7439889, -0.39084333)
         }
@@ -204,6 +206,7 @@ def DomeLight "DomeLight1"
 {
     color3f inputs:color = (0.7, 0.7, 0.7)
     asset inputs:texture:file = @@
+    float primvars:arnold:camera = 0
 }
 
 def Camera "persp1" (
@@ -213,8 +216,8 @@ def Camera "persp1" (
     float2 clippingRange = (0.1, 10000)
     float focalLength = 35
     float focusDistance = 5
-    float horizontalAperture = 35.999928
-    float verticalAperture = 23.999952
+    float horizontalAperture = 30
+    float verticalAperture = 20
     float3 xformOp:rotateXYZ = (-27.938353, 45, -5.172681e-14)
     double3 xformOp:translate = (5.509993726141645, 4.132495294606208, 5.509993726141615)
     uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]