Outline Shader Drifting

4sval · May 29, 2024 · 631530d · 631530d
1 parent eb3f302
commit 631530d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/Resources/outline.vert b/FModel/Resources/outline.vert
@@ -27,10 +27,18 @@ vec2 unpackBoneIDsAndWeights(int packedData)
     return vec2(float((packedData >> 16) & 0xFFFF), float(packedData & 0xFFFF));
 }
 
+vec4 calculateScale(vec4 bindPos, vec4 bindNormal)
+{
+    vec4 worldPos = vInstanceMatrix * bindPos;
+    float scaleFactor = length(uViewPos - worldPos.xyz) * 0.0035;
+    return transpose(inverse(vInstanceMatrix)) * bindNormal * scaleFactor;
+}
+
 void main()
 {
     vec4 bindPos = vec4(mix(vPos, vMorphTargetPos, uMorphTime), 1.0);
     vec4 bindNormal = vec4(vNormal, 1.0);
+    bindPos.xyz += calculateScale(bindPos, bindNormal).xyz;
 
     vec4 finalPos = vec4(0.0);
     vec4 finalNormal = vec4(0.0);
@@ -53,19 +61,12 @@ void main()
                 finalNormal += transpose(inverse(boneMatrix)) * bindNormal * weight;
             }
         }
-        finalPos = normalize(finalPos);
-        finalNormal = normalize(finalNormal);
     }
     else
     {
         finalPos = bindPos;
         finalNormal = bindNormal;
     }
 
-    vec4 worldPos = vInstanceMatrix * finalPos;
-    float scaleFactor = length(uViewPos - worldPos.xyz) * 0.0035;
-    vec4 nor = transpose(inverse(vInstanceMatrix)) * finalNormal * scaleFactor;
-    finalPos.xyz += nor.xyz;
-
     gl_Position = uProjection * uView * vInstanceMatrix * finalPos;
 }
diff --git a/FModel/Views/Snooper/Shading/Material.cs b/FModel/Views/Snooper/Shading/Material.cs
@@ -98,7 +98,7 @@ public void Setup(Options options, int uvCount)
             }
 
             {   // ambient occlusion + color boost
-                if (Parameters.TryGetTexture2d(out var original, "M", "AEM", "AO", "Mask") &&
+                if (Parameters.TryGetTexture2d(out var original, "M", "AEM", "AO") &&
                     !original.Name.Equals("T_BlackMask") && options.TryGetTexture(original, false, out var transformed))
                 {
                     HasAo = true;

diff --git a/FModel/Views/Snooper/Shading/TextureHelper.cs b/FModel/Views/Snooper/Shading/TextureHelper.cs
@@ -21,6 +21,7 @@ public static void FixChannels(string game, Texture texture)
             case "COSMICSHAKE":
             case "PHOENIX":
             case "ATOMICHEART":
+            case "MULTIVERSUS":
             {
                 texture.SwizzleMask =
                 [