Merge pull request #14 from specklesystems/izzy/blocks

fix(converter): revert mesh squish & fix closed polylines

speckle_connector/converter/to_native.rb

@@ -24,6 +24,7 @@ module SpeckleSystems::SpeckleConnector::ToNative
       "Objects.Geometry.Line",
       "Objects.Geometry.Polyline",
       "Objects.Geometry.Mesh",
+      "Objects.Geometry.Brep",
       "Objects.Other.BlockInstance",
       "Objects.Other.BlockDefinition",
       "Objects.Other.RenderMaterial"
@@ -36,6 +37,7 @@ module SpeckleSystems::SpeckleConnector::ToNative
     when "Objects.Other.BlockInstance" then component_instance_to_native(obj, entities)
     when "Objects.Other.BlockDefinition" then component_definition_to_native(obj)
     when "Objects.Geometry.Mesh" then mesh_to_native(obj, entities)
+    when Objects.Geometry.Brep then mesh_to_native(obj["displayMesh"], entities)
     else
       nil
     end
@@ -53,6 +55,7 @@ module SpeckleSystems::SpeckleConnector::ToNative
     if line.key?("value")
       values = line["value"]
       points = values.each_slice(3).to_a.map { |pt| point_to_native(pt[0], pt[1], pt[2], line["units"]) }
+      points.push(points[0]) if line["closed"]
       entities.add_edges(*points)
     else
       start_pt = point_to_native(line["start"]["x"], line["start"]["y"], line["start"]["z"], line["units"])
@@ -71,7 +74,7 @@ module SpeckleSystems::SpeckleConnector::ToNative
 
   def component_definition_to_native(block_def)
     definition = Sketchup.active_model.definitions[block_def["name"]]
-    return definition if definition&.guid == block_def["applicationId"]
+    return definition if definition && definition.guid == block_def["applicationId"]
 
     definition&.entities&.clear!
     definition ||= Sketchup.active_model.definitions.add(block_def["name"])

speckle_connector/converter/to_speckle.rb

@@ -64,37 +64,18 @@ module SpeckleSystems::SpeckleConnector::ToSpeckle
       # convert material
       mat_id = face.material.nil? ? "none" : face.material.entityID
       mat_groups[mat_id] = initialise_group_mesh(face, component_def.bounds) unless mat_groups.key?(mat_id)
+
+      # add points and texture coordinates
       mesh = face.mesh(1)
+      mat_groups[mat_id]["@(31250)vertices"].push(*points_to_array(mesh))
       mat_groups[mat_id]["@(31250)textureCoordinates"].push(*uvs_to_array(mesh))
-      points = mesh.points
-      polys =
-        mesh.polygons.map do |poly|
-          poly.map { |coord| points[coord.abs - 1] }
-        end
-      polys.each do |poly|
-        mat_groups[mat_id]["@(62500)faces"].push(
-          case poly.count
-          when 3 then 0   # tris
-          when 4 then 1   # polys
-          else
-            poly.count # ngons
-          end
-        )
-        poly.each do |pt|
-          index = mat_groups[mat_id][:pt_log][pt.to_s]
-          unless index
-            mat_groups[mat_id]["@(31250)vertices"].push(
-              length_to_speckle(pt[0]),
-              length_to_speckle(pt[1]),
-              length_to_speckle(pt[2])
-            )
-            index = mat_groups[mat_id][:pt_log][pt.to_s] = mat_groups[mat_id][:pt_log].count
-          end
-          mat_groups[mat_id]["@(62500)faces"].push(index)
-        end
-      end
+
+      # add faces
+      mat_groups[mat_id]["@(62500)faces"].push(*faces_to_array(mesh, mat_groups[mat_id][:pt_count]))
+      mat_groups[mat_id][:pt_count] += mesh.points.count
     end
-    mat_groups.values.map { |group| group.delete(:pt_log) }
+
+    mat_groups.values.map { |group| group.delete(:pt_count) }
     mat_groups.values
   end
 
@@ -128,7 +109,7 @@ module SpeckleSystems::SpeckleConnector::ToSpeckle
       "@(31250)vertices" => [],
       "@(62500)faces" => [],
       "@(31250)textureCoordinates" => [],
-      pt_log: {},
+      pt_count: -1,
       renderMaterial: face.material.nil? ? nil : material_to_speckle(face.material)
     }
   end