From 400f01baf65b224e06ebb5bf2b4f2bf49ba548ca Mon Sep 17 00:00:00 2001
From: Dimitrie Stefanescu <didimitrie@gmail.com>
Date: Thu, 25 Feb 2021 19:08:27 +0000
Subject: [PATCH] fix(viewer): selecting curves now working as it should

split up selection handling logic per object type, and not supporting points because of bbox issues
and general zoom to object constraints (for now)
---
 packages/viewer/src/modules/Converter.js      |  2 --
 .../viewer/src/modules/InteractionHandler.js  | 26 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/viewer/src/modules/Converter.js b/packages/viewer/src/modules/Converter.js
index 0f94302fa..ecf32043b 100644
--- a/packages/viewer/src/modules/Converter.js
+++ b/packages/viewer/src/modules/Converter.js
@@ -221,7 +221,6 @@ export default class Coverter {
   // TODOs:
   async PointToBufferGeometry( obj ) {
     let v = this.PointToVector3( obj )
-    console.log( 'Point to buffer', obj )
     let buf = new THREE.BufferGeometry().setFromPoints( [ v ] )
 
     delete obj.value
@@ -232,7 +231,6 @@ export default class Coverter {
   }
 
   async LineToBufferGeometry( object ) {
-    console.log( 'Line conversion', object )
     if ( object.value ){
       //Old line format, treat as polyline
       return this.PolylineToBufferGeometry( object )
diff --git a/packages/viewer/src/modules/InteractionHandler.js b/packages/viewer/src/modules/InteractionHandler.js
index 544b589f8..5c988fda0 100644
--- a/packages/viewer/src/modules/InteractionHandler.js
+++ b/packages/viewer/src/modules/InteractionHandler.js
@@ -13,8 +13,12 @@ export default class InteractionHandler {
     this.preventSelection = false
 
     this.selectionHelper = new SelectionHelper( this.viewer, { subset: this.viewer.sceneManager.userObjects, sectionBox: this.sectionBox } )
-    this.selectionMaterial = new THREE.MeshLambertMaterial( { color: 0x0B55D2, emissive: 0x0B55D2, side: THREE.DoubleSide } )
-    this.selectionMaterial.clippingPlanes = this.sectionBox.planes
+    this.selectionMeshMaterial = new THREE.MeshLambertMaterial( { color: 0x0B55D2, emissive: 0x0B55D2, side: THREE.DoubleSide } )
+    this.selectionMeshMaterial.clippingPlanes = this.sectionBox.planes
+
+    this.selectionLineMaterial = new THREE.LineBasicMaterial( { color: 0x0B55D2 } )
+    this.selectionLineMaterial.clippingPlanes = this.sectionBox.planes
+
     this.selectionEdgesMaterial = new THREE.LineBasicMaterial( { color: 0x23F3BD } )
     this.selectionEdgesMaterial.clippingPlanes = this.sectionBox.planes
 
@@ -44,10 +48,22 @@ export default class InteractionHandler {
 
     if ( !this.selectionHelper.multiSelect ) this.deselectObjects()
 
-    let mesh = new THREE.Mesh( objs[0].object.geometry, this.selectionMaterial )
-    let box = new THREE.BoxHelper( mesh, 0x23F3BD )
+    // console.log(objs[0].object.geometry.type)
+    const selType = objs[0].object.type
+    switch ( selType ) {
+    case 'Mesh':
+      this.selectedObjects.add( new THREE.Mesh( objs[0].object.geometry, this.selectionMeshMaterial ) )
+      break
+    case 'Line':
+      this.selectedObjects.add( new THREE.Line( objs[0].object.geometry, this.selectionMeshMaterial ) )
+      break
+    case 'Point':
+      console.warn( 'Point selection not implemented.' )
+      return // exit the whole func here, points cause all sorts of trouble when being selected (ie, bbox stuff)
+    }
+
+    let box = new THREE.BoxHelper( objs[0].object, 0x23F3BD )
     box.material = this.selectionEdgesMaterial
-    this.selectedObjects.add( mesh )
     this.selectedObjects.add( box )
     this.viewer.needsRender = true
   }