save shaders

Author: MattFiler

CathodeLib/Scripts/CATHODE/Materials.cs

@@ -76,7 +76,7 @@ override protected bool LoadInternal()
                     }
                     reader.BaseStream.Position += 7;
                     material.UnknownValue0 = reader.ReadInt32();
-                    material.UberShaderIndex = reader.ReadInt32();
+                    material.ShaderIndex = reader.ReadInt32();
                     reader.BaseStream.Position += 128;
                     material.UnknownValue1 = reader.ReadInt32();
                     reader.BaseStream.Position += 48;
@@ -158,7 +158,7 @@ override protected bool SaveInternal()
                     }
                     writer.Write(new byte[7]);
                     writer.Write(Entries[i].UnknownValue0);
-                    writer.Write(Entries[i].UberShaderIndex);
+                    writer.Write(Entries[i].ShaderIndex);
                     writer.Write(new byte[128]);
                     writer.Write(Entries[i].UnknownValue1);
                     writer.Write(new byte[48]);
@@ -207,7 +207,7 @@ public class Material
             public ConstantBuffer[] ConstantBuffers = new ConstantBuffer[5]; //Should always be 5 (1 per CST block) - TODO: maybe just change this to 5 variables?
 
             public int UnknownValue0;
-            public int UberShaderIndex;
+            public int ShaderIndex;
 
             public int UnknownValue1;
 

CathodeLib/Scripts/LEGACY_DAN/ShadersPAK.cs

@@ -55,7 +55,7 @@ public ShadersPAK(string FullFilePath)
 
         private MaterialPropertyIndex GetMaterialPropertyIndexes(Materials.Material InMaterial)
         {
-            ShaderEntry Shader = Shaders[InMaterial.UberShaderIndex];
+            ShaderEntry Shader = Shaders[InMaterial.ShaderIndex];
 
             MaterialPropertyIndex toReturn = new MaterialPropertyIndex();
 
@@ -176,10 +176,9 @@ private MaterialPropertyIndex GetMaterialPropertyIndexes(Materials.Material InMa
             return toReturn;
         }
 
-        public ShaderMaterialMetadata GetMaterialMetadataFromShader(Materials.Material InMaterial, IDXRemap idx)
+        public ShaderMaterialMetadata GetMaterialMetadataFromShader(Materials.Material InMaterial)
         {
-            int RemappedIndex = idx.Datas[InMaterial.UberShaderIndex].Index;
-            ShaderEntry Shader = Shaders[RemappedIndex];
+            ShaderEntry Shader = Shaders[InMaterial.ShaderIndex];
             ShaderMaterialMetadata metadata = new ShaderMaterialMetadata();
             metadata.shaderCategory = (ShaderCategory)Shader.Header2.ShaderCategory;
             switch (metadata.shaderCategory)

CathodeLib/Scripts/Level.cs

@@ -159,6 +159,7 @@ public void Save()
             //TODO: This puts the assumption on the user that they have updated all the indexes correctly in Commands. Need to just pass direct objects.
             Commands.Save();
             EnvironmentAnimations.Save();
+            Shaders.Save();
 
             /* UPDATE MOVER INDEXES */