fixed cst pointer sizes

Author: MattFiler

CathodeLib/Scripts/CATHODE/Materials.cs

@@ -60,12 +60,11 @@ override protected bool LoadInternal()
                     for (int x = 0; x < 12; x++)
                     {
                         Material.Texture texRef = new Material.Texture();
-                        texRef.ShaderIndex = x;
                         texRef.BinIndex = reader.ReadInt16();
                         int texTableIndex = reader.ReadInt16();
                         if (texTableIndex == -1) continue;
                         texRef.Source = (Material.Texture.TextureSource)texTableIndex;
-                        material.TextureReferences.Add(texRef);
+                        material.TextureReferences[x] = texRef;
                     }
                     reader.BaseStream.Position += 8;
                     List<int> cstIndexes = new List<int>();
@@ -74,7 +73,7 @@ override protected bool LoadInternal()
                     {
                         int cstCount = reader.ReadByte();
                         //TODO: just read the CST data into the material
-                        material.ConstantBuffers.Add(new Material.ConstantBuffer() { Offset = cstIndexes[x], Length = cstCount });
+                        material.ConstantBuffers[x] = new Material.ConstantBuffer() { Offset = cstIndexes[x], Length = cstCount };
                     }
                     reader.BaseStream.Position += 7;
                     material.UnknownValue0 = reader.ReadInt32();
@@ -132,10 +131,10 @@ override protected bool SaveInternal()
                 int materialOffset = (int)writer.BaseStream.Position;
                 for (int i = 0; i < Entries.Count; i++)
                 {
-                    if (Entries[i].TextureReferences.Count > 12) throw new Exception("Too many texture references!");
+                    if (Entries[i].TextureReferences.Length != 12) throw new Exception("Incorrect texture references!");
                     for (int x = 0; x < 12; x++)
                     {
-                        Material.Texture tex = Entries[i].TextureReferences.FirstOrDefault(o => o.ShaderIndex == x);
+                        Material.Texture tex = Entries[i].TextureReferences[x];
                         if (tex == null)
                         {
                             writer.Write((Int16)(-1));
@@ -149,16 +148,14 @@ override protected bool SaveInternal()
                     }
                     writer.Write(new byte[4]);
                     writer.Write((Int32)i);
-                    if (Entries[i].ConstantBuffers.Count > 5) throw new Exception("Too many constant buffer definitions!");
+                    if (Entries[i].ConstantBuffers.Length != 5) throw new Exception("Incorrect constant buffer definitions!");
                     for (int x = 0; x < 5; x++)
                     {
-                        if (Entries[i].ConstantBuffers.Count <= x) writer.Write(0);
-                        else writer.Write(Entries[i].ConstantBuffers[x].Offset);
+                        writer.Write(Entries[i].ConstantBuffers[x].Offset);
                     }
                     for (int x = 0; x < 5; x++)
                     {
-                        if (Entries[i].ConstantBuffers.Count <= x) writer.Write(0);
-                        else writer.Write((byte)Entries[i].ConstantBuffers[x].Length);
+                        writer.Write((byte)Entries[i].ConstantBuffers[x].Length);
                     }
                     writer.Write(new byte[7]);
                     writer.Write(Entries[i].UnknownValue0);
@@ -207,16 +204,16 @@ public class Material
         {
             public string Name;
 
-            public List<Texture> TextureReferences = new List<Texture>(); //Max of 12
-            public List<ConstantBuffer> ConstantBuffers = new List<ConstantBuffer>(); //Should always be 5 (1 per CST block) - TODO: maybe just change this to 5 variables?
+            public Texture[] TextureReferences = new Texture[12]; //Max of 12
+            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 UnknownValue1;
 
             public int Unknown4_;
-            public int Color; // TODO: This is not really color AFAIK.
+            public int Color; // TODO: This is not color
             public int UnknownValue2;
 
             public override string ToString()
@@ -233,7 +230,6 @@ public class ConstantBuffer
 
             public class Texture
             {
-                public int ShaderIndex; // Entry index in the material texture ref write list for shaders to access.
                 public int BinIndex;    // Entry index in texture BIN file.
 
                 public TextureSource Source;

CathodeLib/Scripts/LEGACY_DAN/ShadersPAK.cs

@@ -413,7 +413,7 @@ public ShaderMaterialMetadata GetMaterialMetadataFromShader(Materials.Material I
             {
                 int PairIndex = Shader.TextureLinks[i];
                 // NOTE: PairIndex == 255 means no index.
-                if (PairIndex < InMaterial.TextureReferences.Count)
+                if (PairIndex < InMaterial.TextureReferences.Length)
                 {
                     metadata.textures[i].TextureInfo = InMaterial.TextureReferences[PairIndex];
                 }

CathodeLib/Scripts/Level.cs

@@ -206,8 +206,9 @@ public void Save()
             List<Textures.TEX4> materialTextures = new List<Textures.TEX4>();
             for (int i = 0; i < Materials.Entries.Count; i++)
             {
-                for (int x = 0; x < Materials.Entries[i].TextureReferences.Count; x++)
+                for (int x = 0; x < Materials.Entries[i].TextureReferences.Length; x++)
                 {
+                    if (Materials.Entries[i].TextureReferences[x] == null) continue;
                     switch (Materials.Entries[i].TextureReferences[x].Source)
                     {
                         case Materials.Material.Texture.TextureSource.LEVEL:
@@ -255,8 +256,9 @@ public void Save()
             y = 0;
             for (int i = 0; i < Materials.Entries.Count; i++)
             {
-                for (int x = 0; x < Materials.Entries[i].TextureReferences.Count; x++)
+                for (int x = 0; x < Materials.Entries[i].TextureReferences.Length; x++)
                 {
+                    if (Materials.Entries[i].TextureReferences[x] == null) continue;
                     switch (Materials.Entries[i].TextureReferences[x].Source)
                     {
                         case Materials.Material.Texture.TextureSource.LEVEL: