Merge pull request #105 from specklesystems/jrm/core/2.16.0

Updated core and objects to 2.16.0
specklesystems · Oct 31, 2023 · ce33e7c · ce33e7c
2 parents 999e6ae + fb1e458
commit ce33e7c
Show file tree

Hide file tree

Showing 12 changed files with 182 additions and 43 deletions.
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs
@@ -357,25 +357,25 @@ public Matrix4x4 TransformToNativeMatrix(STransform speckleTransform)
             return new Matrix4x4
             {
                 // Left (X -> X)
-                [0, 0] = smatrix.M11,
-                [2, 0] = smatrix.M21,
-                [1, 0] = smatrix.M31,
-                [3, 0] = smatrix.M41,
+                [0, 0] = (float)smatrix.M11,
+                [2, 0] = (float)smatrix.M21,
+                [1, 0] = (float)smatrix.M31,
+                [3, 0] = (float)smatrix.M41,
                 //Up (Z -> Y)
-                [0, 2] = smatrix.M12,
-                [2, 2] = smatrix.M22,
-                [1, 2] = smatrix.M32,
-                [3, 2] = smatrix.M42,
+                [0, 2] = (float)smatrix.M12,
+                [2, 2] = (float)smatrix.M22,
+                [1, 2] = (float)smatrix.M32,
+                [3, 2] = (float)smatrix.M42,
                 //Forwards (Y -> Z)
-                [0, 1] = smatrix.M13,
-                [2, 1] = smatrix.M23,
-                [1, 1] = smatrix.M33,
-                [3, 1] = smatrix.M43,
+                [0, 1] = (float)smatrix.M13,
+                [2, 1] = (float)smatrix.M23,
+                [1, 1] = (float)smatrix.M33,
+                [3, 1] = (float)smatrix.M43,
                 //Translation
                 [0, 3] = (float)(smatrix.M14 * sf),
                 [2, 3] = (float)(smatrix.M24 * sf),
                 [1, 3] = (float)(smatrix.M34 * sf),
-                [3, 3] = smatrix.M44,
+                [3, 3] = (float)smatrix.M44,
             };
         }
 

diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.cs b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.cs
@@ -202,6 +202,18 @@ public List<Base> ConvertToSpeckle(List<object> objects)
             return objects.Select(x => ConvertToNative(x)).ToList();
         }
 
+        public object ConvertToNativeDisplayable(Base @object)
+        {
+            throw new NotImplementedException(
+                $"{nameof(ConvertToNativeDisplayable)} is not implemented by this converter, use {nameof(ConvertToNative)} instead"
+            );
+        }
+
+        public bool CanConvertToNativeDisplayable(Base @object)
+        {
+            throw new NotImplementedException();
+        }
+
         public bool CanConvertToSpeckle(object @object)
         {
             switch (@object)

diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.deps.json b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.deps.json
@@ -25,7 +25,8 @@
           "Serilog.Sinks.Console": "4.1.0",
           "Serilog.Sinks.Seq": "5.2.2",
           "SerilogTimings": "3.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "System.DoubleNumerics": "3.1.3"
         },
         "runtime": {
           "SpeckleCore2.dll": {}
@@ -444,6 +445,17 @@
           }
         }
       },
+      "System.DoubleNumerics/3.1.3": {
+        "dependencies": {
+          "NETStandard.Library": "2.0.3"
+        },
+        "runtime": {
+          "lib/netstandard1.3/System.DoubleNumerics.dll": {
+            "assemblyVersion": "1.0.0.0",
+            "fileVersion": "1.0.0.0"
+          }
+        }
+      },
       "System.Memory/4.5.4": {
         "dependencies": {
           "System.Buffers": "4.5.1",
@@ -863,6 +875,13 @@
       "path": "system.collections.immutable/5.0.0",
       "hashPath": "system.collections.immutable.5.0.0.nupkg.sha512"
     },
+    "System.DoubleNumerics/3.1.3": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-KRKEM/L3KBodjA9VOg3EifFVWUY6EOqaMB05UvPEDm7Zeby/kZW+4kdWUEPzW6xtkwf46p661L9NrbeeQhtLzw==",
+      "path": "system.doublenumerics/3.1.3",
+      "hashPath": "system.doublenumerics.3.1.3.nupkg.sha512"
+    },
     "System.Memory/4.5.4": {
       "type": "package",
       "serviceable": true,

diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.dll
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.xml b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.xml
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/System.DoubleNumerics.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.DoubleNumerics.dll
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/System.DoubleNumerics.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.DoubleNumerics.dll.meta
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.dll b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.dll
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.xml b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.xml
diff --git a/Packages/systems.speckle.speckle-unity/package.json b/Packages/systems.speckle.speckle-unity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "systems.speckle.speckle-unity",
-  "version": "2.15.3",
+  "version": "2.16.0",
   "displayName": "Speckle Unity Connector",
   "description": "AEC Interoperability for Unity through Speckle",
   "unity": "2021.1",
@@ -21,4 +21,4 @@
     "email": "[email protected]",
     "url": "https://speckle.systems"
   }
-}
+}