Update testusdview and usdImagingGL tests to specify Z-up

The baseline images for these tests were generated under Pixar's studio-specific configuration which specifies Z-up by default. This change authors that explicitly into the test assets to isolate them from site-specific settings and ensure consistent behavior. This is part of PR #1743 from @nvidia-jomiller. (Internal change: 2216745)
PixarAnimationStudios · Feb 22, 2022 · f0b034e · f0b034e
1 parent a9c3cba
commit f0b034e
Show file tree

Hide file tree

Showing 103 changed files with 205 additions and 20 deletions.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/test.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Xform "Implicits" (
     add variantSets = "shapeVariant"

diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/test.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Xform "Implicits" (
     add variantSets = "shapeVariant"

diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/test.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Xform "Implicits" (
     add variantSets = "shapeVariant"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLAnimatedLights/lightMoving.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLAnimatedLights/lightMoving.usda
@@ -2,6 +2,7 @@
 (
     startTimeCode = 1
     endTimeCode = 3
+    upAxis = "Z"
 )
 
 def Sphere "sphere" {

diff --git a/...dImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/basicDrawing.usda b/...dImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/basicDrawing.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 40
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Meshes"

diff --git a/...usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/leftHanded.usda b/...usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/leftHanded.usda
@@ -3,6 +3,7 @@
     defaultPrim = "SimpleSphere"
     endFrame = 1
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Mesh "SimpleSphere" (

diff --git a/...aging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-relative.usd b/...aging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-relative.usd
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "Materials"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders.usd
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "Materials"

diff --git a/...sdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_anim.usd b/...sdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_anim.usd
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "Materials"

diff --git a/...aging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_bindings.usd b/...aging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_bindings.usd
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "Materials"

diff --git a/...maging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.usd b/...maging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.usd
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 class Mesh "MeshProto"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/subdivTags.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/subdivTags.usda
@@ -1,4 +1,8 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
+
 
 def Xform "Geom"
 {

diff --git a/...Imaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-relative.usd b/...Imaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-relative.usd
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "Materials"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usd
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "Materials"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "Looks"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicLighting/basicDrawing.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicLighting/basicDrawing.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 40
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Meshes"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCards/testAnim.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCards/testAnim.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 2
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "World" (

diff --git a/...aging/usdImagingGL/testenv/testUsdImagingGLColorOpacityPrimvar/color_opacity_primvar.usda b/...aging/usdImagingGL/testenv/testUsdImagingGLColorOpacityPrimvar/color_opacity_primvar.usda
@@ -2,6 +2,7 @@
 (
     endTimeCode = 1
     startTimeCode = 0
+    upAxis = "Z"
 )
 # Test the robust handling of color and opacity primvars in 
 # UsdImagingGprimAdapter.

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLComplexityOsd3/subdivMesh.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLComplexityOsd3/subdivMesh.usda
@@ -3,6 +3,7 @@
     doc = "Test Subdiv Tags"
     endFrame = 1
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Mesh "pPlane1" (

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCurves/basicCurves.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCurves/basicCurves.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 40
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Scope "World"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDoubleSided/doubleSided2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDoubleSided/doubleSided2.usda
@@ -3,6 +3,7 @@
     doc = "Test DoubleSided Imaging"
     endFrame = 40
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Meshes"

diff --git a/...Imaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVarying.usda b/...Imaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVarying.usda
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 class Mesh "QuadMeshProto"
 {
     point3f[] points = [

diff --git a/...dImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLeftHanded.usda b/...dImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLeftHanded.usda
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 class Mesh "QuadMeshProto"
 {
     int[] faceVertexCounts = [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]

diff --git a/...magingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLinearInterp.usda b/...magingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLinearInterp.usda
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 class Mesh "QuadMeshProto"
 {
     int[] faceVertexCounts = [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFallbackPrimTypes/fallbacks3.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFallbackPrimTypes/fallbacks3.usda
@@ -1,5 +1,6 @@
 #usda 1.0
 (
+    upAxis = "Z"
     subLayers = [@primitives.usda@]
     fallbackPrimTypes = {
         token[] UnknownCone = ["UnknownCylinder", "Cylinder"]

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShading/primitives.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShading/primitives.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Capsule "MyCapsule"
 {

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShadingRef/primitives.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShadingRef/primitives.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Capsule "MyCapsule"
 {

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/instance.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/instance.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Xform "DormRoomDouble" (
     kind = "prop"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Xform "World"
 {

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi_ni.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi_ni.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Xform "ProtoRed"
 {

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHoleFaces/holeFaces.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHoleFaces/holeFaces.usda
@@ -3,6 +3,7 @@
     doc = "Test Hole Imaging"
     endFrame = 40
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Mesh "pPlane1" (

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLImplicits/implicits.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLImplicits/implicits.usda
@@ -3,6 +3,7 @@
     doc = "Implicit Geometry"
     endFrame = 20
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Fallback"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes.usd
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 class "_Depth_2"
 {

diff --git a/...ing/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Instanced.usd b/...ing/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Instanced.usd
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 class "_Depth_2"
 {

diff --git a/...ImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Nested_Instances.usd b/...ImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Nested_Instances.usd
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 class "_Depth_2"
 {
     custom token purpose = "proxy"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Parent" (

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance2.usda
@@ -11,6 +11,7 @@
     """
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Mesh" (

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance3.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance3.usda
@@ -11,6 +11,7 @@
     """
     endFrame = 10
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Mesh" (

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 1
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Cube"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 1
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Cube"

diff --git a/...dImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2NoInstancing.usda b/...dImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2NoInstancing.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 1
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Cube "Cube"

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/nestedInstancedCubes.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/nestedInstancedCubes.usda
@@ -2,6 +2,7 @@
 (
     endFrame = 1
     startFrame = 1
+    upAxis = "Z"
 )
 
 def Xform "Cubes_1" (

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxDirectLights.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxDirectLights.usda
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 def Sphere "mxSphere" {
     rel material:binding = </Materials/MaterialX/Materials/Default_White>
     color3f[] primvars:displayColor = [(0.1, 0.5, 0.8)]

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGeomprop.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGeomprop.usda
@@ -1,5 +1,8 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
+
 def Scope "MaterialX" (
     references = [
  		@./geomprop.mtlx@</MaterialX>,

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGlass.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGlass.usda
@@ -1,4 +1,7 @@
 #usda 1.0
+(
+    upAxis = "Z"
+)
 
 def Sphere "Default" {
     rel material:binding = </MaterialX/Materials/Default>

diff --git a/...ging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Default.usda b/...ging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Default.usda
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 def Scope "MaterialX_Default" {
     def Sphere "MxUsdDefault" {
         rel material:binding = </Materials/MaterialX/Materials/USD_Default>

diff --git a/...Imaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Gold.usda b/...Imaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Gold.usda
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 def Scope "MaterialX_Gold" {
     def Sphere "MxUsdGold" {
         rel material:binding = </Materials/MaterialX/Materials/USD_Gold>

diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxSimple.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxSimple.usda
@@ -1,5 +1,7 @@
 #usda 1.0
-
+(
+    upAxis = "Z"
+)
 def Sphere "ball1" {
     rel material:binding = </Materials/MaterialX/Materials/Default_Smooth>
     color3f[] primvars:displayColor = [(0.1, 0.5, 0.8)]