Merge pull request #735 from sirpalee/pr/animated_textures_for_draw_mode

[USD] Allowing animated textures for drawModeAdapter (Internal change: 1940814)
PixarAnimationStudios · Feb 20, 2019 · 22d5e69 · 22d5e69
2 parents e380a5c + a6917af
commit 22d5e69
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/pxr/usdImaging/lib/usdImaging/tokens.h b/pxr/usdImaging/lib/usdImaging/tokens.h
@@ -47,6 +47,7 @@ PXR_NAMESPACE_OPEN_SCOPE
     (usdVaryingWidths)      \
     (usdVaryingNormals)     \
     (usdVaryingXform)       \
+    (usdVaryingTexture)     \
     (bxdf)                  \
     (displacement)          \
     (uvPrimvar)             \

diff --git a/pxr/usdImaging/lib/usdImagingGL/drawModeAdapter.cpp b/pxr/usdImaging/lib/usdImagingGL/drawModeAdapter.cpp
@@ -311,11 +311,40 @@ UsdImagingGLDrawModeAdapter::TrackVariability(UsdPrim const& prim,
                                             UsdImagingInstancerContext const*
                                                instancerContext) const
 {
-    if (_IsMaterialPath(cachePath) || _IsTexturePath(cachePath)) {
-        // Shader/texture aspects aren't time-varying.
+    const std::array<TfToken, 6> textureAttrs = {
+        UsdGeomTokens->modelCardTextureXPos,
+        UsdGeomTokens->modelCardTextureYPos,
+        UsdGeomTokens->modelCardTextureZPos,
+        UsdGeomTokens->modelCardTextureXNeg,
+        UsdGeomTokens->modelCardTextureYNeg,
+        UsdGeomTokens->modelCardTextureZNeg,
+    };
+
+    auto checkForTextureVariability =
+        [&textureAttrs, &prim, &timeVaryingBits, this]
+            (HdDirtyBits dirtyBits) {
+        for (const TfToken& attr: textureAttrs) {
+            if (_IsVarying(prim, attr, dirtyBits,
+                           UsdImagingTokens->usdVaryingTexture,
+                           timeVaryingBits, true)) {
+                break;
+            }
+        }
+    };
+
+    if (_IsTexturePath(cachePath)) {
+        checkForTextureVariability(HdTexture::DirtyTexture);
         return;
     }
 
+    if (_IsMaterialPath(cachePath)) {
+        checkForTextureVariability(
+            HdMaterial::DirtySurfaceShader | HdMaterial::DirtyParams);
+        return;
+    }
+
+    checkForTextureVariability(HdChangeTracker::DirtyParams);
+
     // WARNING: This method is executed from multiple threads, the value cache
     // has been carefully pre-populated to avoid mutating the underlying
     // container during update.