Size of array in instance storage increased to store doubles.

DanWalsh82 · Sep 28, 2015 · 93df423 · 93df423
1 parent 3cd6533
commit 93df423
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/Xbim.Essentials.Tests/BasicModelTests.cs b/Xbim.Essentials.Tests/BasicModelTests.cs
@@ -53,7 +53,6 @@ public void OpenIfcFileFromStream()
                 }
                 fileStream.Close();
             }
-
         }
 
         [TestMethod]
@@ -68,8 +67,8 @@ public void OpenIfcZipFileFromStream()
                 }
                 fileStream.Close();
             }
-
         }
+
         [TestMethod]
         public void OpenIfcXmlFileFromStream()
         {

diff --git a/Xbim.Essentials.Tests/GeometryTests.cs b/Xbim.Essentials.Tests/GeometryTests.cs
@@ -78,5 +78,38 @@ IEnumerable<XbimVector3D> UniformPointsOnSphere(float n)
             }
             return points;
         }
+
+        [TestMethod]
+        public void MatrixArrayConversion()
+        {
+            var m = XbimMatrix3D.CreateTranslation(10,20,30);
+            m.RotateAroundXAxis(Math.PI/4);
+            m.Scale(.05);
+
+            var outM = m.ToArray(true);
+            var rback = XbimMatrix3D.FromArray(outM);
+
+            Assert.AreEqual(rback.M11, m.M11);
+            Assert.AreEqual(rback.M12, m.M12);
+            Assert.AreEqual(rback.M13, m.M13);
+            Assert.AreEqual(rback.M14, m.M14);
+
+            Assert.AreEqual(rback.M21, m.M21);
+            Assert.AreEqual(rback.M22, m.M22);
+            Assert.AreEqual(rback.M23, m.M23);
+            Assert.AreEqual(rback.M24, m.M24);
+
+            Assert.AreEqual(rback.M31, m.M31);
+            Assert.AreEqual(rback.M32, m.M32);
+            Assert.AreEqual(rback.M33, m.M33);
+            Assert.AreEqual(rback.M34, m.M34);
+
+            Assert.AreEqual(rback.OffsetX, m.OffsetX);
+            Assert.AreEqual(rback.OffsetY, m.OffsetY);
+            Assert.AreEqual(rback.OffsetZ, m.OffsetZ);
+            Assert.AreEqual(rback.M44, m.M44);
+
+        }
+
     }
 }
diff --git a/Xbim.Essentials.nuspec b/Xbim.Essentials.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
     <metadata>
         <id>Xbim.Essentials</id>
-        <version>3.1.10-V0007</version>
+        <version>3.1.10-V0008</version>
         <title>xBIM Essentials</title>
         <authors>xBIM team</authors>
         <owners>Steve Lockley</owners>

diff --git a/Xbim.IO/XbimShapeInstanceCursor.cs b/Xbim.IO/XbimShapeInstanceCursor.cs
@@ -8,8 +8,8 @@ namespace Xbim.IO
     /// </summary>
     public class XbimShapeInstanceCursor : XbimCursor
     {
-
-        const int SizeOfTransformation = 16 * sizeof(float); //the 16 floats that make a transformation
+        // updated to allow storage for doubles in matrices.
+        const int MaxSizeOfTransformation = 16 * sizeof(double); // the 16 numbers that make a transformation
         #region Field Definition
 
         /// <summary>
@@ -234,7 +234,7 @@ internal static void CreateTable(JET_SESID sesid, JET_DBID dbid)
                 //Transformation data
                 columndef.coltyp = JET_coltyp.Binary;
                 columndef.grbit = ColumndefGrbit.ColumnNotNULL;
-                columndef.cbMax = SizeOfTransformation;
+                columndef.cbMax = MaxSizeOfTransformation;
                 Api.JetAddColumn(sesid, tableid, colNameTransformation, columndef, null, 0, out columnid);
 
                 //Bounding Box data