Merge pull request #14 from specklesystems/izzy/blocks

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

.rubocop.yml

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

speckle_connector.rb

@@ -21,6 +21,8 @@ module SpeckleSystems
 
     # Run from localhost or from build files
     DEV_MODE = false
+    puts("Loading Speckle Connector v#{CONNECTOR_VERSION} from #{DEV_MODE ? 'dev' : 'build'}")
+
 
     unless file_loaded?(__FILE__)
 

speckle_connector/converter/to_native.rb

@@ -6,8 +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")
-      props = obj.keys.filter_map { |key| key if key.start_with?("@") }
-      %w[displayMesh displayValue data].each { |prop| props.push(prop) if obj.key?(prop) }
+      props = obj.keys.filter_map { |key| key unless key.start_with?("_") }
       props.each { |prop| traverse_commit_object(obj[prop]) }
     elsif obj.is_a?(Hash)
       obj.each_value { |value| traverse_commit_object(value) }
@@ -25,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"
@@ -37,13 +37,14 @@ 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
-  # rescue StandardError => e
-  #   puts("Failed to convert #{obj["speckle_type"]} (id: #{obj["id"]})")
-  #   puts(e)
-  #   nil
+    # rescue StandardError => e
+    #   puts("Failed to convert #{obj["speckle_type"]} (id: #{obj["id"]})")
+    #   puts(e)
+    #   nil
   end
 
   def length_to_native(length, units = @units)
@@ -51,11 +52,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
@@ -68,29 +74,26 @@ 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"])
     block_def["geometry"].each { |obj| convert_to_native(obj, definition.entities) }
+    puts("definition finished: #{block_def["name"]} (#{block_def["id"]})")
+    puts("    entity count: #{definition.entities.count}")
     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`
+    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?
-      size = faces.shift
-      num_pts =
-        case size
-        when 0 then 3
-        when 1 then 4
-        else size
-        end
+      num_pts = faces.shift
+      num_pts += 3 if num_pts < 3 # 0 -> 3, 1 -> 4 to preserve backwards compatibility
       indices = faces.shift(num_pts)
       native_mesh.add_polygon(indices.map { |index| points[index] })
     end
@@ -113,6 +116,10 @@ module SpeckleSystems::SpeckleConnector::ToNative
         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
     instance.transformation = transform if is_group
     instance.material = material_to_native(block["renderMaterial"])
     instance
@@ -121,13 +128,22 @@ module SpeckleSystems::SpeckleConnector::ToNative
   def transform_to_native(t_arr, units = @units)
     Geom::Transformation.new(
       [
-      t_arr[0], t_arr[4], t_arr[8],  t_arr[12],
-      t_arr[1], t_arr[5], t_arr[9],  t_arr[13],
-      t_arr[2], t_arr[6], t_arr[10], t_arr[14],
-      length_to_native(t_arr[3], units),
-      length_to_native(t_arr[7], units),
-      length_to_native(t_arr[11], units),
-      t_arr[15]
+        t_arr[0],
+        t_arr[4],
+        t_arr[8],
+        t_arr[12],
+        t_arr[1],
+        t_arr[5],
+        t_arr[9],
+        t_arr[13],
+        t_arr[2],
+        t_arr[6],
+        t_arr[10],
+        t_arr[14],
+        length_to_native(t_arr[3], units),
+        length_to_native(t_arr[7], units),
+        length_to_native(t_arr[11], units),
+        t_arr[15]
       ]
     )
   end

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

speckle_connector/dialog.rb

@@ -42,13 +42,13 @@ module SpeckleSystems::SpeckleConnector
         init_local_accounts
 
       end
-      puts DEV_MODE
       if DEV_MODE
+        puts('Launching Speckle Connector from http://localhost:8081')
         @dialog.set_url("http://localhost:8081")
       else
-        basedir = File.join(File.dirname(File.expand_path(__FILE__)), "html")
-        html = File.read(File.join(basedir, "index.html"))
-        @dialog.set_html(html)
+        html_file = File.join(File.dirname(File.expand_path(__FILE__)), "html", "index.html")
+        puts("Launching Speckle Connector from #{html_file}")
+        @dialog.set_file(html_file)
       end
 
       @dialog.show

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 }) {

ui/src/vue-apollo.js

@@ -11,6 +11,8 @@ const AUTH_TOKEN = `SpeckleSketchup.AuthToken`
 if (process.env.NODE_ENV === 'development') {
   localStorage.setItem(AUTH_TOKEN, process.env.VUE_APP_DEV_TOKEN)
   localStorage.setItem('serverUrl', process.env.VUE_APP_DEFAULT_SERVER)
+} else if (!localStorage.getItem('serverUrl')) {
+  localStorage.setItem('serverUrl', 'https://speckle.xyz')
 }
 
 const authLink = setContext((_, { headers }) => {

ui/vue.config.js

@@ -1,10 +1,7 @@
 const path = require('path')
 
 module.exports = {
-  publicPath:
-    process.env.NODE_ENV === 'production'
-      ? path.resolve(__dirname, '../speckle_connector', 'html')
-      : '/',
+  publicPath: "./",
   outputDir: path.resolve(__dirname, '../speckle_connector', 'html'),
   transpileDependencies: ['vuetify', '@speckle/objectloader']
 }