Trying to simplify material transparency

DeltaDesigns · Dec 21, 2023 · 828d930 · 828d930
1 parent 8e65f41
commit 828d930
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 65 deletions.
diff --git a/Charm/ActivityMapEntityView.xaml.cs b/Charm/ActivityMapEntityView.xaml.cs
@@ -20,6 +20,7 @@
 using Tiger.Schema.Activity.DESTINY2_SHADOWKEEP_2601;
 using Tiger.Schema.Activity.DESTINY2_WITCHQUEEN_6307;
 using Tiger.Schema.Entity;
+using Tiger.Schema.Shaders;
 using Tiger.Schema.Static;
 
 namespace Charm;
@@ -394,7 +395,7 @@ private static void ExtractDataTables(List<FileHash> dataTables, string hash, st
                             foreach (DynamicMeshPart part in element.Unk60.TagData.Unk08.Load(ExportDetailLevel.MostDetailed, null))
                             {
                                 if (part.Material == null) continue;
-                                skyScene.Materials.Add(new ExportMaterial(part.Material));
+                                skyScene.Materials.Add(new ExportMaterial(part.Material, MaterialType.Transparent));
                             }
                         }
                         break;
@@ -420,7 +421,7 @@ private static void ExtractDataTables(List<FileHash> dataTables, string hash, st
                             {
                                 for (int i = item.StartIndex; i < item.StartIndex + item.Count && i < decals.MapDecals.TagData.Locations.Count; i++)
                                 {
-                                    dynamicScene.Materials.Add(new ExportMaterial(item.Material));
+                                    dynamicScene.Materials.Add(new ExportMaterial(item.Material, MaterialType.Transparent));
                                 }
                             }
                         }

diff --git a/Charm/DevView.xaml.cs b/Charm/DevView.xaml.cs
@@ -228,7 +228,7 @@ private void AddWindow(FileHash hash)
                     foreach (DynamicMeshPart part in parts)
                     {
                         if (part.Material == null) continue;
-                        scene.Materials.Add(new ExportMaterial(part.Material));
+                        scene.Materials.Add(new ExportMaterial(part.Material, MaterialType.Opaque));
                     }
                     Exporter.Get().Export();
                     break;

diff --git a/Tiger/Exporters/Exporter.cs b/Tiger/Exporters/Exporter.cs
@@ -60,12 +60,14 @@ public void Export()
 public struct ExportMaterial
 {
     public readonly IMaterial Material;
+    public readonly MaterialType Type;
     public readonly bool IsTerrain;
 
-    public ExportMaterial(IMaterial material, bool isTerrain = false)
+    public ExportMaterial(IMaterial material, MaterialType type, bool isTerrain = false)
     {
         Material = material;
         IsTerrain = isTerrain;
+        Type = type;
     }
 
     public override int GetHashCode()

diff --git a/Tiger/Exporters/MaterialExporter.cs b/Tiger/Exporters/MaterialExporter.cs
@@ -41,7 +41,7 @@ public override void Export(Exporter.ExportEventArgs args)
                     if (saveShaders)
                     {
                         string shaderSaveDirectory = $"{args.OutputDirectory}/{scene.Name}";
-                        material.Material.SaveShaders(shaderSaveDirectory, material.IsTerrain);
+                        material.Material.SaveShaders(shaderSaveDirectory, material.Type, material.IsTerrain);
                         material.Material.SaveVertexShader(shaderSaveDirectory);
                     }
                 }
@@ -94,8 +94,7 @@ public override void Export(Exporter.ExportEventArgs args)
             Directory.CreateDirectory(shaderSaveDirectory);
             foreach (ExportMaterial material in mapMaterials)
             {
-                material.Material.SaveShaders(shaderSaveDirectory, material.IsTerrain);
-                material.Material.SaveVertexShader(shaderSaveDirectory);
+                material.Material.SaveShaders(shaderSaveDirectory, material.Type, material.IsTerrain);
             }
         }
     }

diff --git a/Tiger/Exporters/Source2Handler.cs b/Tiger/Exporters/Source2Handler.cs
@@ -186,8 +186,17 @@ public static void SaveVMAT(string savePath, string hash, IMaterial materialHead
             {
                 vmat.AppendLine($"\t\tcb0_{entry.Key} \"{entry.Value}\"");
             }
+
+            vmat.AppendLine($"\t\tcb2_0 \"float4(0,1,1,1)\"");
+            vmat.AppendLine($"\t\tcb2_1 \"float4(0,1,1,1)\"");
+
+            vmat.AppendLine($"\t\tcb12_4 \"float4(1,0,0,0)\"");
+            vmat.AppendLine($"\t\tcb12_5 \"float4(0,1,0,0)\"");
+            vmat.AppendLine($"\t\tcb12_6 \"float4(0,0,1,0)\"");
+
             vmat.AppendLine($"\t\tcb13_0 \"Time\"");
             vmat.AppendLine($"\t\tcb13_1 \"float4(1,1,1,1)\"");
+
             vmat.AppendLine($"\t}}");
         }
 

diff --git a/Tiger/Schema/Entity/Entity.cs b/Tiger/Schema/Entity/Entity.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Tiger.Exporters;
+using Tiger.Schema.Shaders;
 
 namespace Tiger.Schema.Entity;
 
@@ -90,7 +91,7 @@ public void SaveMaterialsFromParts(ExporterScene scene, List<DynamicMeshPart> dy
         foreach (var dynamicPart in dynamicParts)
         {
             if (dynamicPart.Material == null) continue;
-            scene.Materials.Add(new ExportMaterial(dynamicPart.Material));
+            scene.Materials.Add(new ExportMaterial(dynamicPart.Material, MaterialType.Opaque));
         }
     }
 

diff --git a/Tiger/Schema/Shaders/Material.cs b/Tiger/Schema/Shaders/Material.cs
@@ -43,6 +43,12 @@ public struct Output
         public string Semantic;
     }
 
+    public enum MaterialType
+    {
+        Opaque,
+        Transparent
+    }
+
     public interface IMaterial : ISchema
     {
         public FileHash FileHash { get; }
@@ -124,14 +130,14 @@ public string Decompile(byte[] shaderBytecode, string name, string savePath = "h
             return hlsl;
         }
 
-        public void SaveShaders(string saveDirectory, bool isTerrain = false)
+        public void SaveShaders(string saveDirectory, MaterialType type, bool isTerrain = false)
         {
             Directory.CreateDirectory($"{saveDirectory}/Shaders");
             if (PixelShader != null && PixelShader.Hash.IsValid())
             {
                 string pixel = Decompile(PixelShader.GetBytecode(), $"ps{PixelShader.Hash}");
                 string vertex = Decompile(VertexShader.GetBytecode(), $"vs{VertexShader.Hash}");
-                string vfx = new S2ShaderConverter().HlslToVfx(this, pixel, vertex, isTerrain);
+                string vfx = new S2ShaderConverter().HlslToVfx(this, pixel, vertex, type, isTerrain);
 
                 try
                 {
@@ -178,7 +184,7 @@ public void SaveMaterial(string saveDirectory)
             if (PixelShader != null)
             {
                 Decompile(PixelShader.GetBytecode(), $"ps{PixelShader.Hash}", hlslPath);
-                SaveShaders($"{saveDirectory}");
+                SaveShaders($"{saveDirectory}", MaterialType.Opaque);
             }
             if (VertexShader != null)
             {
@@ -409,3 +415,4 @@ public Material(FileHash fileHash) : base(fileHash)
         // }
     }
 }
+