From fbb4fefaa9e30ea790e3b24a7f4d930ab2d14d3b Mon Sep 17 00:00:00 2001
From: howard <twpride@gmail.com>
Date: Sat, 17 Apr 2021 02:54:41 -0700
Subject: [PATCH] hover not working

---
 src/Scene.js         | 51 ++++++++++++++++++++++----------------------
 src/Sketch.js        |  3 +++
 src/mouseEvents.js   | 20 +++++++++++++++++
 src/react/dialog.jsx | 20 ++++++++++-------
 4 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/src/Scene.js b/src/Scene.js
index 25e23dc..2a6d126 100644
--- a/src/Scene.js
+++ b/src/Scene.js
@@ -7,7 +7,7 @@ import { Sketch } from './Sketch'
 import Stats from '../lib/stats.module.js';
 
 import { extrude, flipBufferGeometryNormals } from './extrude'
-import { onHover, onPick } from './mouseEvents';
+import { onHover, onPick, clearSelection } from './mouseEvents';
 import { _vec2, _vec3, color, awaitSelection, ptObj, setHover } from './shared'
 
 import { AxesHelper } from './axes'
@@ -133,6 +133,7 @@ export class Scene {
     this.extrude = extrude.bind(this);
     this.onHover = onHover.bind(this);
     this.onPick = onPick.bind(this);
+    this.clearSelection = clearSelection.bind(this);
     this.setHover = setHover.bind(this);
     this.awaitSelection = awaitSelection.bind(this);
 
@@ -225,26 +226,26 @@ export class Scene {
     return entry
   }
 
-  clearSelection() {
-    for (let x = 0, obj; x < this.selected.length; x++) {
-      obj = this.selected[x]
-      if (obj.userData.type == 'selpoint') {
-        obj.visible = false
-      } else {
-        setHover(obj, 0)
-      }
-    }
-    this.selected = []
+  // clearSelection() {
+  //   for (let x = 0, obj; x < this.selected.length; x++) {
+  //     obj = this.selected[x]
+  //     if (obj.userData.type == 'selpoint') {
+  //       obj.visible = false
+  //     } else {
+  //       setHover(obj, 0)
+  //     }
+  //   }
+  //   this.selected = []
 
-    for (let x = 0; x < this.hovered.length; x++) {
+  //   for (let x = 0; x < this.hovered.length; x++) {
 
-      const obj = this.hovered[x]
-      setHover(obj, 0)
+  //     const obj = this.hovered[x]
+  //     setHover(obj, 0)
 
 
-    }
+  //   }
 
-  }
+  // }
 
 
   boolOp(m1, m2, op, refresh = false) {
@@ -315,18 +316,18 @@ export class Scene {
     const { byId, tree } = this.store.getState().treeEntries
     while (idx < que.length) {
       curId = que[idx++]
-      console.log(curId,byId,'cc')
 
-      const info = byId[curId].userData.featureInfo
-      let newNode
-      if (info.length == 2) {
-        newNode = this.extrude(byId[info[0]], info[1], true)
-      } else if (info.length == 3) {
-        newNode = this.boolOp(byId[info[0]], byId[info[1]], info[2], true)
+      if (byId[curId].userData) {
+        const info = byId[curId].userData.featureInfo
+        let newNode
+        if (info.length == 2) {
+          newNode = this.extrude(byId[info[0]], info[1], true)
+        } else if (info.length == 3) {
+          newNode = this.boolOp(byId[info[0]], byId[info[1]], info[2], true)
+        }
+        byId[curId].geometry.copy(newNode.geometry)
       }
 
-      byId[curId].geometry.copy(newNode.geometry)
-
       for (let k in tree[curId]) {
         que.push(k)
       }
diff --git a/src/Sketch.js b/src/Sketch.js
index 5e5572b..7742148 100644
--- a/src/Sketch.js
+++ b/src/Sketch.js
@@ -174,7 +174,9 @@ class Sketch {
     // overkill but good solution if this check was more costly
     this.hasChanged = false
     this.idOnActivate = id
+    // console.log(this,this.selected)
     const changeDetector = (e) => {
+      console.log(this.selected.length, e.buttons)
       if (this.selected.length && e.buttons) {
         this.canvas.removeEventListener('pointermove', changeDetector)
         this.hasChanged = true
@@ -193,6 +195,7 @@ class Sketch {
     this.obj3d.traverse(e => e.layers.disable(2))
     this.scene.axes.visible = false
     this.scene.activeSketch = null
+    this.selected = []
   }
 
 
diff --git a/src/mouseEvents.js b/src/mouseEvents.js
index 8d594c4..f611e2b 100644
--- a/src/mouseEvents.js
+++ b/src/mouseEvents.js
@@ -254,3 +254,23 @@ export function onRelease(e) {
   }
 }
 
+export function clearSelection() {
+  for (let x = 0, obj; x < this.selected.length; x++) {
+    obj = this.selected[x]
+    if (obj.userData.type == 'selpoint') {
+      obj.visible = false
+    } else {
+      setHover(obj, 0)
+    }
+  }
+  this.selected = []
+
+  for (let x = 0; x < this.hovered.length; x++) {
+
+    const obj = this.hovered[x]
+    setHover(obj, 0)
+
+
+  }
+
+}
diff --git a/src/react/dialog.jsx b/src/react/dialog.jsx
index 8fa8ada..3020160 100644
--- a/src/react/dialog.jsx
+++ b/src/react/dialog.jsx
@@ -52,29 +52,33 @@ export const Dialog = () => {
           className="btn w-auto h-full p-3.5"
           onClick={() => {
             if (sc.activeSketch.hasChanged || sc.activeSketch.idOnActivate != id) {
-              console.log(sc.activeSketch)
-              for (let k in sc.store.getState().treeEntries.tree[sc.activeSketch.obj3d.name]) {
-                console.log('circlllles',k)
-                sc.refreshNode(k)
-              }
-              sc.render()
+
+              // for (let k in sc.store.getState().treeEntries.tree[sc.activeSketch.obj3d.name]) {
+              //   console.log('circlllles',k)
+              // }
+
+              sc.refreshNode(sc.activeSketch.obj3d.name)
             }
             // dispatch({ type: 'update-descendents', sketch})
-
             sc.activeSketch.deactivate()
+            sc.render()
+
             dispatch({ type: "clear-dialog" })
           }}
         />
         <MdClose className="btn w-auto h-full p-3.5 mr-6"
           onClick={() => {
+            console.log('cancle',sc.activeSketch.hasChanged, sc.activeSketch.idOnActivate, id)
             if (sc.activeSketch.hasChanged || sc.activeSketch.idOnActivate != id) {
               console.log('has changed')
               dispatch({ type: "cancel-sketch" })
-              sc.render()
             }
 
             sc.activeSketch.deactivate()
+            sc.render()
+
             dispatch({ type: "clear-dialog" })
+
           }
           }
         />