update new stuff to work with unity

Author: MattFiler

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

@@ -167,8 +167,11 @@ public cTransform(Vector3 position, Vector3 rotation)
             if (y == null) return x;
 
 
-
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+            return new cTransform(x.position + y.position, x.rotation + y.rotation);
+#else
             return new cTransform(x.position + y.position, x.rotation.AddEulerAngles(y.rotation));
+#endif
         }
 
         public override string ToString()

CathodeLib/Scripts/CATHODE/CommandsPAK/Helpers/CommandsUtils.cs

@@ -3,9 +3,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
 using System.Text;
 using System.Threading.Tasks;
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+using UnityEngine;
+#else
+using System.Numerics;
+#endif
 
 namespace CATHODE.Scripting
 {
@@ -343,7 +347,11 @@ public static (Vector3, Quaternion) CalculateInstancedPosition(EntityPath hierar
                 if (comp == null)
                     break;
             }
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+            return (globalTransform.position, Quaternion.Euler(globalTransform.rotation.x, globalTransform.rotation.y, globalTransform.rotation.z));
+#else
             return (globalTransform.position, Quaternion.CreateFromYawPitchRoll(globalTransform.rotation.Y * (float)Math.PI / 180.0f, globalTransform.rotation.X * (float)Math.PI / 180.0f, globalTransform.rotation.Z * (float)Math.PI / 180.0f));
+#endif
         }
 
         /* CA's CAGE doesn't properly tidy up hierarchies pointing to deleted entities - so we can do that to save confusion */
@@ -460,6 +468,6 @@ public static bool PurgeDeadLinks(Commands commands, Composite composite, bool f
                 "\n - " + (originalLinkCount - newLinkCount) + " entity links (of " + originalLinkCount + ")");
             return true;
         }
-        #endregion
+#endregion
     }
 }

CathodeLib/Scripts/CATHODE/CommandsPAK/Helpers/ParameterUtils.cs

@@ -6,6 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+using UnityEngine;
+#endif
 
 namespace CATHODE.Scripting
 {

CathodeLib/Scripts/CATHODE/EnvironmentAnimations.cs

@@ -163,7 +163,11 @@ override protected bool SaveInternal()
                 int stacked_Entries1 = 0;
                 for (int i = 0; i < Entries.Count; i++)
                 {
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+                    Utilities.Write(writer, Matrix4x4.identity);
+#else
                     Utilities.Write(writer, Matrix4x4.Identity);
+#endif
                     Utilities.Write(writer, Utilities.AnimationHashedString(Entries[i].SkeletonName));
                     writer.Write((Int32)0);
                     Utilities.Write(writer, Entries[i].ResourceIndex);
@@ -186,7 +190,7 @@ override protected bool SaveInternal()
             }
             return true;
         }
-        #endregion
+#endregion
 
         #region HELPERS
         private List<T> PopulateArray<T>(BinaryReader reader, T[] array)

CathodeLib/Scripts/CATHODE/PhysicsMaps.cs

@@ -46,22 +46,38 @@ override protected bool LoadInternal()
                     Vector4 Row2 = Utilities.Consume<Vector4>(reader);
                     double[,] matrix = new double[,]
                     {
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+                        {Row0.x, Row0.y, Row0.z, Row0.w},
+                        {Row1.x, Row1.y, Row1.z, Row1.w},
+                        {Row2.x, Row2.y, Row2.z, Row2.w},
+#else
                         {Row0.X, Row0.Y, Row0.Z, Row0.W},
                         {Row1.X, Row1.Y, Row1.Z, Row1.W},
                         {Row2.X, Row2.Y, Row2.Z, Row2.W},
+#endif
                     };
 
                     entry.Position = new Vector3(
                         (float)matrix[0, 3],
                         (float)matrix[1, 3],
                         (float)matrix[2, 3]
                     );
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+                    Matrix4x4 matrix4x4 = new Matrix4x4(
+                        new Vector4((float)matrix[0, 0], (float)matrix[0, 1], (float)matrix[0, 2], 0),
+                        new Vector4((float)matrix[1, 0], (float)matrix[1, 1], (float)matrix[1, 2], 0),
+                        new Vector4((float)matrix[2, 0], (float)matrix[2, 1], (float)matrix[2, 2], 0),
+                        new Vector4(0, 0, 0, 1)
+                    );
+                    entry.Rotation = Quaternion.LookRotation(matrix4x4.GetColumn(2), matrix4x4.GetColumn(1));
+#else
                     entry.Rotation = Quaternion.CreateFromRotationMatrix(new Matrix4x4(
                         (float)matrix[0, 0], (float)matrix[0, 1], (float)matrix[0, 2], 0,
                         (float)matrix[1, 0], (float)matrix[1, 1], (float)matrix[1, 2], 0,
                         (float)matrix[2, 0], (float)matrix[2, 1], (float)matrix[2, 2], 0,
                         0, 0, 0, 1
                     ));
+#endif
 
                     reader.BaseStream.Position += 8;
                     Entries.Add(entry);
@@ -87,10 +103,17 @@ override protected bool SaveInternal()
                     Utilities.Write(writer, Entries[i].composite_instance_id);
                     Utilities.Write(writer, Entries[i].entity);
 
+#if UNITY_EDITOR || UNITY_STANDALONE_WIN
+                    Matrix4x4 rotationMatrix4x4 = Matrix4x4.Rotate(Entries[i].Rotation);
+                    Vector4 Row0 = new Vector4(rotationMatrix4x4.m11, rotationMatrix4x4.m12, rotationMatrix4x4.m13, Entries[i].Position.x);
+                    Vector4 Row1 = new Vector4(rotationMatrix4x4.m21, rotationMatrix4x4.m22, rotationMatrix4x4.m23, Entries[i].Position.y);
+                    Vector4 Row2 = new Vector4(rotationMatrix4x4.m31, rotationMatrix4x4.m32, rotationMatrix4x4.m33, Entries[i].Position.z);
+#else
                     Matrix4x4 rotationMatrix4x4 = Matrix4x4.CreateFromQuaternion(Entries[i].Rotation);
                     Vector4 Row0 = new Vector4(rotationMatrix4x4.M11, rotationMatrix4x4.M12, rotationMatrix4x4.M13, Entries[i].Position.X);
                     Vector4 Row1 = new Vector4(rotationMatrix4x4.M21, rotationMatrix4x4.M22, rotationMatrix4x4.M23, Entries[i].Position.Y);
                     Vector4 Row2 = new Vector4(rotationMatrix4x4.M31, rotationMatrix4x4.M32, rotationMatrix4x4.M33, Entries[i].Position.Z);
+#endif
 
                     Utilities.Write<Vector4>(writer, Row0);
                     Utilities.Write<Vector4>(writer, Row1);
@@ -100,7 +123,7 @@ override protected bool SaveInternal()
             }
             return true;
         }
-        #endregion
+#endregion
 
         #region STRUCTURES
         public class Entry

CathodeLib/Scripts/CATHODE/Traversals.cs

@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
+
 #if UNITY_EDITOR || UNITY_STANDALONE_WIN
 using UnityEngine;
 #else

CathodeLib/Scripts/LEGACY_DAN/CathodePAK.cs

@@ -1,4 +1,4 @@
-using CathodeLib;
+using CathodeLib;
 using System;
 using System.Buffers.Binary;
 using System.Collections;