Merge pull request #102 from CyberAgentGameEntertainment/fix/alpha_tr…

…ansition_fixnow Fix FixNow button functionality to include custom coords in custom vertex streams when using second texture of alpha transition
CyberAgentGameEntertainment · Jan 17, 2025 · aef4f1d · aef4f1d
2 parents 2687871 + 1bac285
commit aef4f1d
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/Assets/Nova/Editor/Core/Scripts/RendererErrorHandler.cs b/Assets/Nova/Editor/Core/Scripts/RendererErrorHandler.cs
@@ -1,5 +1,5 @@
 // --------------------------------------------------------------
-// Copyright 2023 CyberAgent, Inc.
+// Copyright 2025 CyberAgent, Inc.
 // --------------------------------------------------------------
 
 using System.Collections.Generic;
@@ -141,16 +141,32 @@ private static bool IsCustomCoordUsedInParallax(ParticlesUberCommonMaterialPrope
         private static bool IsCustomCoordUsedInAlphaTransition(
             ParticlesUberCommonMaterialProperties commonMaterialProperties)
         {
-            var mode = (AlphaTransitionMode)commonMaterialProperties.AlphaTransitionModeProp.Value.floatValue;
+            var props = commonMaterialProperties;
+            var mode = (AlphaTransitionMode)props.AlphaTransitionModeProp.Value.floatValue;
             if (mode == AlphaTransitionMode.None) return false;
-            var isCustomCoordUsed = false;
-            isCustomCoordUsed = IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionProgressCoordProp);
-            isCustomCoordUsed |= IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionMapOffsetXCoordProp)
-                                 || IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionMapOffsetYCoordProp);
-            isCustomCoordUsed |=
-                (AlphaTransitionMapMode)commonMaterialProperties.AlphaTransitionMapModeProp.Value.floatValue !=
-                AlphaTransitionMapMode.SingleTexture
-                && IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionMapProgressCoordProp);
+
+            bool isCustomCoordUsed;
+            var isFlipBook = (AlphaTransitionMapMode)props.AlphaTransitionMapModeProp.Value.floatValue !=
+                             AlphaTransitionMapMode.SingleTexture;
+            // 1st texture
+            {
+                isCustomCoordUsed = IsCustomCoordUsed(props.AlphaTransitionProgressCoordProp);
+                isCustomCoordUsed |= IsCustomCoordUsed(props.AlphaTransitionMapOffsetXCoordProp)
+                                     || IsCustomCoordUsed(props.AlphaTransitionMapOffsetYCoordProp);
+                isCustomCoordUsed |= isFlipBook && IsCustomCoordUsed(props.AlphaTransitionMapProgressCoordProp);
+            }
+            // 2nd texture
+            {
+                if ((AlphaTransitionBlendMode)props.AlphaTransitionSecondTextureBlendModeProp.Value.floatValue !=
+                    AlphaTransitionBlendMode.None)
+                {
+                    isCustomCoordUsed |= IsCustomCoordUsed(props.AlphaTransitionProgressCoordSecondTextureProp);
+                    isCustomCoordUsed |= IsCustomCoordUsed(props.AlphaTransitionMapSecondTextureOffsetXCoordProp) ||
+                                         IsCustomCoordUsed(props.AlphaTransitionMapSecondTextureOffsetYCoordProp);
+                    isCustomCoordUsed |= isFlipBook &&
+                                         IsCustomCoordUsed(props.AlphaTransitionMapSecondTextureProgressCoordProp);
+                }
+            }
             return isCustomCoordUsed;
         }