Merge pull request #3443 from beersandrew/validation-usdShade-NormalM…

…apTexture usdValidation: usdShade: NormalMapTextureValidator (Internal change: 2351238) (Internal change: 2351293)
PixarAnimationStudios · Dec 12, 2024 · b9eece2 · b9eece2
2 parents 6c48bd4 + 7b075ac
commit b9eece2
Show file tree

Hide file tree

Showing 7 changed files with 619 additions and 140 deletions.
diff --git a/...idation/bin/usdchecker/testenv/testUsdChecker/baseline/arkitRules_validationFramework.txt b/...idation/bin/usdchecker/testenv/testUsdChecker/baseline/arkitRules_validationFramework.txt
@@ -29,6 +29,11 @@
 	Doc: All properties named 'material:binding' or in that namespace should be relationships.
 	Keywords: UsdShadeValidators
 	isSuite: False
+[usdShadeValidators:NormalMapTextureValidator]:
+	Doc: UsdUVTexture nodes that feed the _inputs:normals_ of a UsdPreviewSurface must ensure that the data is encoded and scaled properly. Specifically, since normals are expected to be in the range [(-1,-1,-1), (1,1,1)], the Texture node must transform 8-bit textures from their [0..1] range by setting its _inputs:scale_ to (2, 2, 2, 1) and _inputs:bias_ to (-1, -1, -1, 0). Normal map data is commonly expected to be linearly encoded.  However, many image-writing tools automatically set the profile of three-channel, 8-bit images to SRGB.  To prevent an unwanted transformation, the UsdUVTexture's _inputs:sourceColorSpace_ must be set to raw.
+	Keywords: UsdShadeValidators
+	SchemaTypes: UsdShadeShader
+	isSuite: False
 [usdShadeValidators:ShaderSdrCompliance]:
 	Doc: Shader prim's input types must be conforming to their appropriate sdf types in the respective sdr shader.
 	Keywords: UsdShadeValidators

diff --git a/...lidation/bin/usdchecker/testenv/testUsdChecker/baseline/baseRules_validationFramework.txt b/...lidation/bin/usdchecker/testenv/testUsdChecker/baseline/baseRules_validationFramework.txt
@@ -29,6 +29,11 @@
 	Doc: All properties named 'material:binding' or in that namespace should be relationships.
 	Keywords: UsdShadeValidators
 	isSuite: False
+[usdShadeValidators:NormalMapTextureValidator]:
+	Doc: UsdUVTexture nodes that feed the _inputs:normals_ of a UsdPreviewSurface must ensure that the data is encoded and scaled properly. Specifically, since normals are expected to be in the range [(-1,-1,-1), (1,1,1)], the Texture node must transform 8-bit textures from their [0..1] range by setting its _inputs:scale_ to (2, 2, 2, 1) and _inputs:bias_ to (-1, -1, -1, 0). Normal map data is commonly expected to be linearly encoded.  However, many image-writing tools automatically set the profile of three-channel, 8-bit images to SRGB.  To prevent an unwanted transformation, the UsdUVTexture's _inputs:sourceColorSpace_ must be set to raw.
+	Keywords: UsdShadeValidators
+	SchemaTypes: UsdShadeShader
+	isSuite: False
 [usdShadeValidators:ShaderSdrCompliance]:
 	Doc: Shader prim's input types must be conforming to their appropriate sdf types in the respective sdr shader.
 	Keywords: UsdShadeValidators

diff --git a/pxr/usdValidation/usdShadeValidators/plugInfo.json b/pxr/usdValidation/usdShadeValidators/plugInfo.json
@@ -17,7 +17,13 @@
                     }, 
                     "MaterialBindingRelationships": {
                         "doc": "All properties named 'material:binding' or in that namespace should be relationships."
-                    }, 
+                    },
+                    "NormalMapTextureValidator" : {
+                        "doc": "UsdUVTexture nodes that feed the _inputs:normals_ of a UsdPreviewSurface must ensure that the data is encoded and scaled properly. Specifically, since normals are expected to be in the range [(-1,-1,-1), (1,1,1)], the Texture node must transform 8-bit textures from their [0..1] range by setting its _inputs:scale_ to (2, 2, 2, 1) and _inputs:bias_ to (-1, -1, -1, 0). Normal map data is commonly expected to be linearly encoded.  However, many image-writing tools automatically set the profile of three-channel, 8-bit images to SRGB.  To prevent an unwanted transformation, the UsdUVTexture's _inputs:sourceColorSpace_ must be set to raw.",
+                        "schemaTypes": [
+                            "UsdShadeShader"
+                        ]
+                    },
                     "ShaderSdrCompliance": {
                         "doc": "Shader prim's input types must be conforming to their appropriate sdf types in the respective sdr shader.", 
                         "schemaTypes": [