Regen usdRiPxr to includes updates from various args updates.

(Internal change: 2309093)
PixarAnimationStudios · Dec 15, 2023 · 14b5d32 · 14b5d32
1 parent 3d075e2
commit 14b5d32
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 10 deletions.
diff --git a/third_party/renderman-25/plugin/usdRiPxr/generatedSchema.usda b/third_party/renderman-25/plugin/usdRiPxr/generatedSchema.usda
@@ -832,6 +832,18 @@ class "PxrOptionsAPI"
                 Specifies dicing manifold used when baking integrator results.
             """
     )
+    bool ri:hider:raytracebaketesselation = 0 (
+        displayGroup = "Baking"
+        displayName = "Raytrace Bake Tesselation"
+        doc = """
+                Force the tesselation to be the same as the baking tesselation when raytracing 
+                (for example when using a PxrOcclusion or PxrDirt shader). 
+                This can reduce self intersections and give cleaner results but may increase the 
+                density of polygons when raytracing.
+                If you have multiple pattern bakes at different resolutions, the highest resolution 
+                will be chosen. Don't attempt to use this option alongside interactive rendering.
+            """
+    )
     bool ri:hider:samplemotion = 1 (
         displayGroup = "Common"
         displayName = "Sample Motion"
@@ -907,6 +919,15 @@ class "PxrOptionsAPI"
                 Render mode.
             """
     )
+    bool ri:lighting:incorrectParticleLightSampling = 0 (
+        displayGroup = "Shading"
+        displayName = "Use old (incorrect) PxrParticleLight sampling for backward compatibility with R24"
+        doc = """
+                Use old method of sampling particle lights. This has been fixed in R25.3. Setting this option
+                will fall back to the old, incorrect, behavior for compatibility purposes. This option will be
+                removed in R26 and the new, correct, method will be used thereafter.
+            """
+    )
     float ri:lighting:minimumestimate = 0.000001 (
         displayGroup = "Shading"
         displayName = "Light Minimum Estimate"
@@ -1156,6 +1177,15 @@ class "PxrOptionsAPI"
                 Shading debug level.
             """
     )
+    bool ri:shade:incorrectPointOpacityCalculation = 0 (
+        displayGroup = "Statistics"
+        displayName = "Use old (incorrect) RiPoints opacity and falloff calculation"
+        doc = """
+                Use old method of combining RiPoint falloff with presence or opacity. This has been fixed
+                in R25. Setting this option will fall back to the old, incorrect, behavior for compatibility
+                purposes. This option will be removed in R26 and the new, correct, method will always be used.
+            """
+    )
     float ri:shade:roughnessmollification = 1 (
         displayGroup = "Statistics"
         displayName = "Specular Roughness Mollification"
@@ -1195,20 +1225,29 @@ class "PxrOptionsAPI"
         doc = """
                 Suppress reporting of displacements that, when divided by the max
                 displacement, fall in the specified range.
+                (Legacy Stats)
             """
     )
     string ri:statistics:filename = "" (
         displayGroup = "Statistics"
-        displayName = "Filename"
+        displayName = "Legacy Filename"
         doc = """
                 File name for summary statistics reported in plain text.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:jsonFilename = "" (
+        displayGroup = "Statistics"
+        displayName = "JSON Filename"
+        doc = """File name for raw statistics JSON report.
             """
     )
     bool ri:statistics:level = 0 (
         displayGroup = "Statistics"
         displayName = "Enable Statistics"
         doc = """
                 Enable statistics reporting.
+                (Legacy Stats)
             """
     )
     int ri:statistics:maxdispwarnings = 100 (
@@ -1217,32 +1256,39 @@ class "PxrOptionsAPI"
         doc = """
                 Modify the maximum reported displacement issues. If the value is set to 0,
                 then all displacements issues are reported.
+                (Legacy Stats)
             """
     )
     string ri:statistics:shaderprofile = "" (
         displayGroup = "Statistics"
         displayName = "Shader Profile"
-        doc = "<help />"
+        doc = """
+                Shader profile filename.
+                (Legacy Stats)
+            """
     )
     string ri:statistics:stylesheet = "" (
         displayGroup = "Statistics"
         displayName = "Style Sheet"
         doc = """
                 Stylesheet for XML detailed statistics.
+                (Legacy Stats)
             """
     )
     bool ri:statistics:texturestatslevel = 0 (
         displayGroup = "Statistics"
         displayName = "Enable Texture Statistics"
         doc = """
                 Enable texture statistics reporting.
+                (Legacy Stats)
             """
     )
     string ri:statistics:xmlfilename = "" (
         displayGroup = "Statistics"
-        displayName = "Xml Filename"
+        displayName = "Legacy XML Filename"
         doc = """
                 File name for detailed statistics reported as XML.
+                (Legacy Stats)
             """
     )
     bool ri:stitch:refwarning = 1 (
@@ -1350,7 +1396,7 @@ class "PxrPrimvarsAPI"
             """
     )
     token primvars:ri:dice:offscreenstrategy = "viewfrustumdistance" (
-        allowedTokens = ["viewfrustumdistance", "worlddistance", "objectdistance", "planarprojection"]
+        allowedTokens = ["viewfrustumdistance", "worlddistance", "objectdistance", "planarprojection", "sphericalprojection"]
         displayGroup = "Dicing"
         displayName = "Off Screen Dicing Strategy"
         doc = """
@@ -1395,7 +1441,7 @@ class "PxrPrimvarsAPI"
             """
     )
     token primvars:ri:dice:strategy = "instanceprojection" (
-        allowedTokens = ["instanceprojection", "worlddistance", "objectdistance"]
+        allowedTokens = ["instanceprojection", "worlddistance", "objectdistance", "sphericalprojection"]
         displayGroup = "Dicing"
         displayName = "Dicing strategy"
         doc = """
@@ -8774,6 +8820,7 @@ class PxrPathTracer "PxrPathTracer"
             """
     )
     float inputs:ri:jointScatteringBias = 0.5 (
+        connectability = "interfaceOnly"
         displayGroup = "Aggregate Volumes"
         displayName = "Joint Scattering Bias"
         doc = """

diff --git a/third_party/renderman-25/plugin/usdRiPxr/schema.usda b/third_party/renderman-25/plugin/usdRiPxr/schema.usda
@@ -873,6 +873,18 @@ class "PxrOptionsAPI" (
                 Specifies dicing manifold used when baking integrator results.
             """
     )
+    bool ri:hider:raytracebaketesselation = 0 (
+        displayGroup = "Baking"
+        displayName = "Raytrace Bake Tesselation"
+        doc = """
+                Force the tesselation to be the same as the baking tesselation when raytracing 
+                (for example when using a PxrOcclusion or PxrDirt shader). 
+                This can reduce self intersections and give cleaner results but may increase the 
+                density of polygons when raytracing.
+                If you have multiple pattern bakes at different resolutions, the highest resolution 
+                will be chosen. Don't attempt to use this option alongside interactive rendering.
+            """
+    )
     bool ri:hider:samplemotion = 1 (
         displayGroup = "Common"
         displayName = "Sample Motion"
@@ -948,6 +960,15 @@ class "PxrOptionsAPI" (
                 Render mode.
             """
     )
+    bool ri:lighting:incorrectParticleLightSampling = 0 (
+        displayGroup = "Shading"
+        displayName = "Use old (incorrect) PxrParticleLight sampling for backward compatibility with R24"
+        doc = """
+                Use old method of sampling particle lights. This has been fixed in R25.3. Setting this option
+                will fall back to the old, incorrect, behavior for compatibility purposes. This option will be
+                removed in R26 and the new, correct, method will be used thereafter.
+            """
+    )
     float ri:lighting:minimumestimate = 0.000001 (
         displayGroup = "Shading"
         displayName = "Light Minimum Estimate"
@@ -1197,6 +1218,15 @@ class "PxrOptionsAPI" (
                 Shading debug level.
             """
     )
+    bool ri:shade:incorrectPointOpacityCalculation = 0 (
+        displayGroup = "Statistics"
+        displayName = "Use old (incorrect) RiPoints opacity and falloff calculation"
+        doc = """
+                Use old method of combining RiPoint falloff with presence or opacity. This has been fixed
+                in R25. Setting this option will fall back to the old, incorrect, behavior for compatibility
+                purposes. This option will be removed in R26 and the new, correct, method will always be used.
+            """
+    )
     float ri:shade:roughnessmollification = 1 (
         displayGroup = "Statistics"
         displayName = "Specular Roughness Mollification"
@@ -1236,20 +1266,29 @@ class "PxrOptionsAPI" (
         doc = """
                 Suppress reporting of displacements that, when divided by the max
                 displacement, fall in the specified range.
+                (Legacy Stats)
             """
     )
     string ri:statistics:filename = "" (
         displayGroup = "Statistics"
-        displayName = "Filename"
+        displayName = "Legacy Filename"
         doc = """
                 File name for summary statistics reported in plain text.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:jsonFilename = "" (
+        displayGroup = "Statistics"
+        displayName = "JSON Filename"
+        doc = """File name for raw statistics JSON report.
             """
     )
     bool ri:statistics:level = 0 (
         displayGroup = "Statistics"
         displayName = "Enable Statistics"
         doc = """
                 Enable statistics reporting.
+                (Legacy Stats)
             """
     )
     int ri:statistics:maxdispwarnings = 100 (
@@ -1258,32 +1297,39 @@ class "PxrOptionsAPI" (
         doc = """
                 Modify the maximum reported displacement issues. If the value is set to 0,
                 then all displacements issues are reported.
+                (Legacy Stats)
             """
     )
     string ri:statistics:shaderprofile = "" (
         displayGroup = "Statistics"
         displayName = "Shader Profile"
-        doc = "<help />"
+        doc = """
+                Shader profile filename.
+                (Legacy Stats)
+            """
     )
     string ri:statistics:stylesheet = "" (
         displayGroup = "Statistics"
         displayName = "Style Sheet"
         doc = """
                 Stylesheet for XML detailed statistics.
+                (Legacy Stats)
             """
     )
     bool ri:statistics:texturestatslevel = 0 (
         displayGroup = "Statistics"
         displayName = "Enable Texture Statistics"
         doc = """
                 Enable texture statistics reporting.
+                (Legacy Stats)
             """
     )
     string ri:statistics:xmlfilename = "" (
         displayGroup = "Statistics"
-        displayName = "Xml Filename"
+        displayName = "Legacy XML Filename"
         doc = """
                 File name for detailed statistics reported as XML.
+                (Legacy Stats)
             """
     )
     bool ri:stitch:refwarning = 1 (
@@ -1397,7 +1443,7 @@ class "PxrPrimvarsAPI" (
             """
     )
     token primvars:ri:dice:offscreenstrategy = "viewfrustumdistance" (
-        allowedTokens = ["viewfrustumdistance", "worlddistance", "objectdistance", "planarprojection"]
+        allowedTokens = ["viewfrustumdistance", "worlddistance", "objectdistance", "planarprojection", "sphericalprojection"]
         displayGroup = "Dicing"
         displayName = "Off Screen Dicing Strategy"
         doc = """
@@ -1442,7 +1488,7 @@ class "PxrPrimvarsAPI" (
             """
     )
     token primvars:ri:dice:strategy = "instanceprojection" (
-        allowedTokens = ["instanceprojection", "worlddistance", "objectdistance"]
+        allowedTokens = ["instanceprojection", "worlddistance", "objectdistance", "sphericalprojection"]
         displayGroup = "Dicing"
         displayName = "Dicing strategy"
         doc = """
@@ -7715,6 +7761,7 @@ class PxrPathTracer "PxrPathTracer" (
             """
     )
     float inputs:ri:jointScatteringBias = 0.5 (
+        connectability = "interfaceOnly"
         displayGroup = "Aggregate Volumes"
         displayName = "Joint Scattering Bias"
         doc = """