Merge pull request #1798 from robpieke/CameraAdapterAllAttributes

Consider *all* attributes for `UsdImagingCameraAdapter::TrackVariability` (Internal change: 2229905)
PixarAnimationStudios · May 9, 2022 · 7ae71f8 · 7ae71f8
2 parents e735e29 + 8f82263
commit 7ae71f8
Showing 1 changed file with 18 additions and 109 deletions.
diff --git a/pxr/usdImaging/usdImaging/cameraAdapter.cpp b/pxr/usdImaging/usdImaging/cameraAdapter.cpp
@@ -121,115 +121,24 @@ UsdImagingCameraAdapter::TrackVariability(UsdPrim const& prim,
                timeVaryingBits,
                false);
 
-    // Rest of the function is just checking whether any
-    // param is time-varying.
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->projection,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->projection,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->horizontalAperture,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->horizontalAperture,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->verticalAperture,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->verticalAperture,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->horizontalApertureOffset,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->horizontalApertureOffset,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->verticalApertureOffset,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->verticalApertureOffset,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->focalLength,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->focalLength,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->clippingRange,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->clippingRange,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->fStop,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->fStop,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->focusDistance,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->focusDistance,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->shutterOpen,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->shutterOpen,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->shutterClose,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->shutterClose,
-                   timeVaryingBits,
-                   false)) {
-        return;
-    }
-
-    if (_IsVarying(prim,
-                   UsdGeomTokens->exposure,
-                   HdCamera::DirtyParams,
-                   HdCameraTokens->exposure,
-                   timeVaryingBits,
-                   false)) {
-        return;
+    // If any other camera attributes are time varying
+    // we will assume all camera params are time-varying.
+    const std::vector<UsdAttribute> &attrs = prim.GetAttributes();
+    for (UsdAttribute const& attr : attrs) {
+        // Don't double-count clipping-plane or transform attrs.
+        if (attr.GetBaseName() == UsdGeomTokens->clippingPlanes) { continue; }
+        if (UsdGeomXformable::IsTransformationAffectedByAttrNamed(
+                attr.GetBaseName())) {
+            continue;
+        }
+        if (_IsVarying(prim,
+                       attr.GetName(),
+                       HdCamera::DirtyParams,
+                       attr.GetName(),
+                       timeVaryingBits,
+                       false)) {
+            return;
+        }
     }
 }