Merge branch 'hotfix'

Author: MattFiler

CathodeLib/CathodeLib.csproj

@@ -9,11 +9,11 @@
     <PackageId>CathodeLib</PackageId>
     <Authors>Matt Filer</Authors>
     <Description>Provides support for parsing and writing common Alien: Isolation formats from the Cathode engine.</Description>
-    <Copyright>Matt Filer 2024</Copyright>
-    <Version>0.7.1</Version>
+    <Copyright>Matt Filer 2025</Copyright>
+    <Version>0.7.2</Version>
     <OutputType>Library</OutputType>
-    <AssemblyVersion>0.7.1.0</AssemblyVersion>
-    <FileVersion>0.7.1.0</FileVersion>
+    <AssemblyVersion>0.7.2.0</AssemblyVersion>
+    <FileVersion>0.7.2.0</FileVersion>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
   </PropertyGroup>
 

CathodeLib/Scripts/CATHODE/CommandsPAK/Components/ParameterData.cs

@@ -106,8 +106,13 @@ public object Clone()
             switch (dataType)
             {
                 case DataType.RESOURCE:
-                    return Utilities.CloneObject(this);
-                //HOTFIX FOR VECTOR 3 CLONE ISSUE - TODO: FIND WHY THIS ISN'T WORKING WITH MEMBERWISE CLONE
+                    cResource r = (cResource)this.MemberwiseClone();
+                    r.value = ((cResource)this).value.Select(item => (ResourceReference)item.Clone()).ToList();
+                    return r;
+                case DataType.SPLINE:
+                    cSpline s = (cSpline)this.MemberwiseClone();
+                    s.splinePoints = ((cSpline)this).splinePoints.Select(item => (cTransform)item.Clone()).ToList();
+                    return s;
                 case DataType.VECTOR:
                     cVector3 v3 = (cVector3)this.MemberwiseClone();
                     Vector3 v3_v = (Vector3)((cVector3)this).value;
@@ -132,7 +137,6 @@ public object Clone()
                     tr.rotation = new Vector3(tr_r.X, tr_r.Y, tr_r.Z);
 #endif
                     return tr;
-                //END OF HOTFIX - SHOULD THIS ALSO APPLY TO OTHERS?? SPLINE?
                 default:
                     return this.MemberwiseClone();
             }

CathodeLib/Scripts/CATHODE/SoundBankData.cs

@@ -13,6 +13,8 @@ namespace CATHODE
     /* DATA/ENV/PRODUCTION/x/WORLD/SOUNDBANKDATA.DAT */
     public class SoundBankData : CathodeFile
     {
+        //NOTE: you can use Utilities.SoundHashedString to hash these strings and get the Wwise ID used in other places like SoundEventData
+
         public List<string> Entries = new List<string>();
         public static new Implementation Implementation = Implementation.CREATE | Implementation.LOAD | Implementation.SAVE;
         public SoundBankData(string path) : base(path) { }

CathodeLib/Scripts/CATHODE/SoundEventData.cs

@@ -75,7 +75,7 @@ override protected bool SaveInternal()
         #region STRUCTURES
         public class Soundbank
         {
-            public uint id;
+            public uint id; //This is the hashed soundbank string name (hashed via Utilities.SoundHashedString)
             public List<Event> events = new List<Event>();
 
             public class Event

CathodeLib/Scripts/Utilities.cs

@@ -6,7 +6,8 @@
 using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices;
-using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
 
 namespace CathodeLib
 {
@@ -183,19 +184,6 @@ public static void Write<T>(BinaryWriter stream, List<T> aux)
             Write<T>(stream, aux.ToArray<T>());
         }
 
-        //Clones an object (slow!)
-        public static T CloneObject<T>(T obj)
-        {
-            //A somewhat hacky an inefficient way of deep cloning an object (TODO: optimise this as we use it a lot!)
-            MemoryStream ms = new MemoryStream();
-            new BinaryFormatter().Serialize(ms, obj);
-            ms.Position = 0;
-            T obj2 = (T)new BinaryFormatter().Deserialize(ms);
-            ms.Close();
-            return obj2;
-            //obj.MemberwiseClone();
-        }
-
         //Generate a hashed string for use in the animation system (FNV hash)
         public static uint AnimationHashedString(string str)
         {
@@ -212,6 +200,21 @@ public static uint AnimationHashedString(string str)
             return hash;
         }
 
+        //Generate a hashed string for use in sound system (wwise FNV-1)
+        public static uint SoundHashedString(string str)
+        {
+            byte[] namebytes = Encoding.UTF8.GetBytes(str.ToLower());
+            uint hash = 2166136261; 
+            for (int i = 0; i < namebytes.Length; i++)
+            {
+                byte namebyte = namebytes[i];
+                hash = hash * 16777619; 
+                hash = hash ^ namebyte; 
+                hash = hash & 0xFFFFFFFF; 
+            }
+            return hash;
+        }
+
         //Read a PAK
         public static List<PAKContent> ReadPAK(string path, FileIdentifiers type)
         {