refactor: refactor

mob-sakai · Jun 24, 2024 · c018619 · c018619
1 parent 66d6075
commit c018619
Show file tree

Hide file tree

Showing 34 changed files with 1,921 additions and 1,587 deletions.
diff --git a/Assets/Demos/SoftMaskable Shader/Hidden-UI-Additive-SoftMaskable.shader b/Assets/Demos/SoftMaskable Shader/Hidden-UI-Additive-SoftMaskable.shader
@@ -128,7 +128,7 @@ Shader "Hidden/UI/Additive (SoftMaskable)"
                 color.a *= m.x * m.y;
                 #endif
 
-                color.a *= SoftMask(IN.vertex, mul(unity_ObjectToWorld, IN.worldPosition));	// Add for soft mask
+                color.a *= SoftMask(IN.vertex, IN.worldPosition, color.a);	// Add for soft mask
                 #ifdef UNITY_UI_ALPHACLIP
                 clip (color.a - 0.001);
                 #endif

diff --git a/Assets/Demos/SoftMaskable Shader/UI-Additive-SoftMaskable.shader b/Assets/Demos/SoftMaskable Shader/UI-Additive-SoftMaskable.shader
@@ -128,7 +128,7 @@ Shader "UI/Additive (SoftMaskable)"
                 color.a *= m.x * m.y;
                 #endif
 
-                color.a *= SoftMask(IN.vertex, mul(unity_ObjectToWorld, IN.worldPosition));	// Add for soft mask
+                color.a *= SoftMask(IN.vertex, IN.worldPosition, color.a);	// Add for soft mask
                 #ifdef UNITY_UI_ALPHACLIP
                 clip (color.a - 0.001);
                 #endif

diff --git a/Assets/Demos/TextMeshPro Support/CarterOne-Regular SDF.asset b/Assets/Demos/TextMeshPro Support/CarterOne-Regular SDF.asset