Merge pull request #15 from specklesystems/izzy/blocks

fix(converter): receiving blocks

.rubocop.yml

@@ -26,6 +26,9 @@ Style/DocumentationMethod:
 
 Metrics/AbcSize:
   Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
   
 Metrics/ClassLength:
   Enabled: false

speckle_connector/converter/to_native.rb

@@ -6,6 +6,7 @@ module SpeckleSystems::SpeckleConnector::ToNative
     if can_convert_to_native(obj)
       convert_to_native(obj, Sketchup.active_model.entities)
     elsif obj.is_a?(Hash) && obj.key?("speckle_type")
+      puts(">>> Found #{obj["speckle_type"]}: #{obj["id"]}")
       props = obj.keys.filter_map { |key| key unless key.start_with?("_") }
       props.each { |prop| traverse_commit_object(obj[prop]) }
     elsif obj.is_a?(Hash)
@@ -24,6 +25,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 +38,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
@@ -50,11 +53,16 @@ module SpeckleSystems::SpeckleConnector::ToNative
   end
 
   def edge_to_native(line, entities)
-    return unless 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"]) }
-    entities.add_edges(*points)
+    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"])
+      end_pt = point_to_native(line["end"]["x"], line["end"]["y"], line["end"]["z"], line["units"])
+      entities.add_edges(start_pt, end_pt)
+    end
   end
 
   def face_to_native
@@ -65,9 +73,28 @@ module SpeckleSystems::SpeckleConnector::ToNative
     Geom::Point3d.new(length_to_native(x, units), length_to_native(y, units), length_to_native(z, units))
   end
 
+  def mesh_to_native(mesh, entities)
+    native_mesh = Geom::PolygonMesh.new(mesh["vertices"].count / 3)
+    points = []
+    mesh["vertices"].each_slice(3) do |pt|
+      points.push(point_to_native(pt[0], pt[1], pt[2], mesh["units"]))
+    end
+    faces = mesh["faces"]
+    while faces.count.positive?
+      num_pts = faces.shift
+      # 0 -> 3, 1 -> 4 to preserve backwards compatibility
+      num_pts += 3 if num_pts < 3
+      indices = faces.shift(num_pts)
+      native_mesh.add_polygon(indices.map { |index| points[index] })
+    end
+    entities.add_faces_from_mesh(native_mesh, 4, material_to_native(mesh["renderMaterial"]))
+
+    native_mesh
+  end
+
   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.name == block_def["name"] || definition.guid == block_def["applicationId"])
 
     definition&.entities&.clear!
     definition ||= Sketchup.active_model.definitions.add(block_def["name"])
@@ -77,34 +104,13 @@ module SpeckleSystems::SpeckleConnector::ToNative
     definition
   end
 
-  def mesh_to_native(mesh, entities)
-    native_mesh = Geom::PolygonMesh.new
-    points = [] # to preserve indices - duplicate points won't be added in `point_to_native`
-    mesh["vertices"].each_slice(3) do |pt|
-      points.push(point_to_native(pt[0], pt[1], pt[2], mesh["units"]))
-    end
-    faces = mesh["faces"]
-    while faces.count.positive?
-      size = faces.shift
-      num_pts =
-        case size
-        when 0 then 3
-        when 1 then 4
-        else size
-        end
-      indices = faces.shift(num_pts)
-      native_mesh.add_polygon(indices.map { |index| points[index] })
-    end
-    entities.add_faces_from_mesh(native_mesh, 4, material_to_native(mesh["renderMaterial"]))
-
-    native_mesh
-  end
-
   def component_instance_to_native(block, entities)
-    is_group = block.key?("is_sketchup_group") && block["is_sketchup_group"]
+    # is_group = block.key?("is_sketchup_group") && block["is_sketchup_group"]
+    # something about this conversion is freaking out if nested block geo is a group
+    # so this is set to false always until I can figure this out
+    is_group = false
 
     definition = component_definition_to_native(block["blockDefinition"])
-    # return unless definition.entities.count.positive?
 
     transform = transform_to_native(block["transform"], block["units"])
     instance =
@@ -113,11 +119,7 @@ module SpeckleSystems::SpeckleConnector::ToNative
       else
         entities.add_instance(definition, transform)
       end
-    puts("Failed to create instance for speckle object #{block["id"]}") if instance.nil?
-    if instance.nil?
-      p(definition.name)
-      p(definition.entities.to_a)
-    end
+    puts("Failed to create instance for speckle block instance #{block["id"]}") if instance.nil?
     instance.transformation = transform if is_group
     instance.material = material_to_native(block["renderMaterial"])
     instance

speckle_connector/converter/to_speckle.rb

@@ -82,10 +82,22 @@ module SpeckleSystems::SpeckleConnector::ToSpeckle
   def transform_to_speckle(transform)
     t_arr = transform.to_a
     [
-      t_arr[0], t_arr[4], t_arr[8],  length_to_speckle(t_arr[12]),
-      t_arr[1], t_arr[5], t_arr[9],  length_to_speckle(t_arr[13]),
-      t_arr[2], t_arr[6], t_arr[10], length_to_speckle(t_arr[14]),
-      t_arr[3], t_arr[7], t_arr[11], t_arr[15]
+      t_arr[0],
+      t_arr[4],
+      t_arr[8],
+      length_to_speckle(t_arr[12]),
+      t_arr[1],
+      t_arr[5],
+      t_arr[9],
+      length_to_speckle(t_arr[13]),
+      t_arr[2],
+      t_arr[6],
+      t_arr[10],
+      length_to_speckle(t_arr[14]),
+      t_arr[3],
+      t_arr[7],
+      t_arr[11],
+      t_arr[15]
     ]
   end
 
@@ -97,7 +109,7 @@ module SpeckleSystems::SpeckleConnector::ToSpeckle
       "@(31250)vertices" => [],
       "@(62500)faces" => [],
       "@(31250)textureCoordinates" => [],
-      pt_count: -1, # faces are 1 indexed
+      pt_count: -1,
       renderMaterial: face.material.nil? ? nil : material_to_speckle(face.material)
     }
   end

ui/src/components/StreamCard.vue

@@ -332,7 +332,24 @@ export default {
 
       let rootObj = await loader.getAndConstructObject(this.updateLoadingStage)
       console.log(rootObj)
+
       sketchup.receive_objects(rootObj, this.streamId)
+
+      await this.$apollo.mutate({
+        mutation: gql`
+          mutation commitReceive($input: CommitReceivedInput!) {
+            commitReceive(input: $input)
+          }
+        `,
+        variables: {
+          input: {
+            sourceApplication: 'sketchup',
+            streamId: this.streamId,
+            commitId: this.selectedCommit.id
+          }
+        }
+      })
+
       this.loadingStage = 'converting'
     },
     updateLoadingStage({ stage }) {