Transofrm added

Author: moethu

SketchUp/SketchUpNET/SketchUpForDynamo/SketchUp.cs

@@ -72,7 +72,7 @@ public static Dictionary<string, object> LoadModel(string path, bool includeMesh
                 foreach (Edge e in skp.Edges)
                     edges.Add(e.ToDSGeo());
 
-                foreach (Group gr in grp)
+                foreach (Group gr in skp.Groups)
                     grp.Add(gr);
 
             }
@@ -93,7 +93,7 @@ public static Dictionary<string, object> LoadModel(string path, bool includeMesh
         /// SketchUp Component Instance Data
         /// </summary>
         /// <param name="instance">SketchUp Component Instance</param>
-        [MultiReturn(new[] { "Surfaces","Curves","Instances","Meshes","Edges", "Position", "Scale", "Name", "Parent Name" })]
+        [MultiReturn(new[] { "Surfaces","Curves","Instances","Meshes","Edges", "Position", "Scale", "Name", "Parent Name", "Groups" })]
         public static Dictionary<string, object> GetInstance(Instance instance)
         {
             List<Autodesk.DesignScript.Geometry.Surface> surfaces = new List<Autodesk.DesignScript.Geometry.Surface>();
@@ -116,6 +116,11 @@ public static Dictionary<string, object> GetInstance(Instance instance)
             foreach (Edge e in parent.Edges)
                 edges.Add(e.ToDSGeo(instance.Transformation));
 
+            foreach (Group grp in parent.Groups)
+            {
+                grp.Transformation = instance.Transformation;
+            }
+
             return new Dictionary<string, object>
             {
                 { "Surfaces", surfaces },
@@ -126,36 +131,36 @@ public static Dictionary<string, object> GetInstance(Instance instance)
                 { "Position", p },
                 { "Scale", instance.Transformation.Scale },
                 { "Name", instance.Name },
-                { "Parent Name", parent.Name }
+                { "Parent Name", parent.Name },
+                { "Groups", parent.Groups }
 
             };
         }
 
         /// <summary>
         /// SketchUp Component Instance Data
         /// </summary>
-        /// <param name="instance">SketchUp Component Instance</param>
-        [MultiReturn(new[] { "Surfaces", "Curves", "Instances", "Meshes", "Edges",  "Name" })]
-        public static Dictionary<string, object> GetGroup(Group instance)
+        /// <param name="group">SketchUp Component Instance</param>
+        [MultiReturn(new[] { "Surfaces", "Curves", "Instances", "Meshes", "Edges",  "Name", "Groups" })]
+        public static Dictionary<string, object> GetGroup(Group group)
         {
             List<Autodesk.DesignScript.Geometry.Surface> surfaces = new List<Autodesk.DesignScript.Geometry.Surface>();
             List<List<Autodesk.DesignScript.Geometry.Line>> curves = new List<List<Autodesk.DesignScript.Geometry.Line>>();
             List<Autodesk.DesignScript.Geometry.Line> edges = new List<Autodesk.DesignScript.Geometry.Line>();
             List<Autodesk.DesignScript.Geometry.Mesh> meshes = new List<Autodesk.DesignScript.Geometry.Mesh>();
             List<Instance> insts = new List<Instance>();
 
-
-            foreach (Surface srf in instance.Surfaces)
+            foreach (Surface srf in group.Surfaces)
             {
-                surfaces.Add(srf.ToDSGeo());
+                surfaces.Add(srf.ToDSGeo(group.Transformation));
                 if (srf.FaceMesh != null)
-                    meshes.Add(srf.FaceMesh.ToDSGeo());
+                    meshes.Add(srf.FaceMesh.ToDSGeo(group.Transformation));
             }
-            foreach (Curve c in instance.Curves)
-                curves.Add(c.ToDSGeo());
-            foreach (Edge e in instance.Edges)
-                edges.Add(e.ToDSGeo());
-            foreach (Instance e in instance.Instances)
+            foreach (Curve c in group.Curves)
+                curves.Add(c.ToDSGeo(group.Transformation));
+            foreach (Edge e in group.Edges)
+                edges.Add(e.ToDSGeo(group.Transformation));
+            foreach (Instance e in group.Instances)
                 insts.Add(e);
 
             return new Dictionary<string, object>
@@ -165,8 +170,8 @@ public static Dictionary<string, object> GetGroup(Group instance)
                 { "Instances", insts },
                 { "Meshes", meshes },
                 { "Edges", edges },
-                { "Name", instance.Name },
-
+                { "Name", group.Name },
+                { "Groups", group.Groups },
             };
         }
 

SketchUp/SketchUpNET/SketchUpNET/Group.cpp

@@ -60,15 +60,17 @@ namespace SketchUpNET
 		List<Curve^>^ Curves;
 		List<Instance^>^ Instances;
 		List<Group^>^ Groups;
+		Transform^ Transformation;
 
-		Group(System::String^ name, List<Surface^>^ surfaces, List<Curve^>^ curves, List<Edge^>^ edges, List<Instance^>^ insts, List<Group^>^ group)
+		Group(System::String^ name, List<Surface^>^ surfaces, List<Curve^>^ curves, List<Edge^>^ edges, List<Instance^>^ insts, List<Group^>^ group, Transform^ transformation)
 		{
 			this->Name = name;
 			this->Surfaces = surfaces;
 			this->Edges = edges;
 			this->Curves = curves;
 			this->Instances = insts;
 			this->Groups = group;
+			this->Transformation = transformation;
 		};
 
 		Group(){};
@@ -86,14 +88,16 @@ namespace SketchUpNET
 			size_t faceCount = 0;
 			SUEntitiesGetNumFaces(entities, &faceCount);
 
-
+			SUTransformation transform = SU_INVALID;
+			SUGroupGetTransform(group, &transform);
+			
 			List<Surface^>^ surfaces = Surface::GetEntitySurfaces(entities, includeMeshes, materials);
 			List<Edge^>^ edges = Edge::GetEntityEdges(entities);
 			List<Curve^>^ curves = Curve::GetEntityCurves(entities);
 			List<Instance^>^ inst = Instance::GetEntityInstances(entities);
 			List<Group^>^ grps = Group::GetEntityGroups(entities, includeMeshes, materials);
-
-			Group^ v = gcnew Group(SketchUpNET::Utilities::GetString(name), surfaces, curves, edges, inst, grps);
+			
+			Group^ v = gcnew Group(SketchUpNET::Utilities::GetString(name), surfaces, curves, edges, inst, grps, Transform::FromSU(transform));
 
 			return v;
 		};