From 09d5248f24e212ec84dfb0be29aadd1c0d6f623b Mon Sep 17 00:00:00 2001
From: Sander Moolin <sandermoolin@gmail.com>
Date: Thu, 25 Mar 2021 10:06:22 -0400
Subject: [PATCH] mousemove element fixes

---
 src/core/Object3D.js | 48 +++++++++++++++++++++++++++++++++++++++-----
 src/core/useThree.js | 12 ++++++-----
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/core/Object3D.js b/src/core/Object3D.js
index 3a921a3..9be47ba 100644
--- a/src/core/Object3D.js
+++ b/src/core/Object3D.js
@@ -4,7 +4,7 @@ import { bindProp } from '../tools/index.js';
 export default {
   name: 'Object3D',
   inject: ['three', 'scene', 'rendererComponent'],
-  emits: ['created', 'ready'],
+  emits: ['created', 'ready', 'pointerEnter', 'pointerOver', 'pointerLeave'],
   props: {
     position: { type: Object, default: { x: 0, y: 0, z: 0 } },
     rotation: { type: Object, default: { x: 0, y: 0, z: 0 } },
@@ -12,11 +12,12 @@ export default {
     lookAt: { type: Object, default: null },
     onPointerEnter: { type: Function, default: null },
     onPointerOver: { type: Function, default: null },
-    onPointerLeave: { type: Function, default: null }
+    onPointerLeave: { type: Function, default: null },
+    usePointerEvents: { type: Boolean, default: false }
   },
-  data(){
+  data() {
     return {
-      pointerIsOver: null
+      pointerOver: null
     }
   },
   // can't use setup because it will not be used in sub components
@@ -60,7 +61,44 @@ export default {
       this.three.raycaster.setFromCamera(this.three.mouse, this.three.camera)
       const intersects = this.three.raycaster.intersectObjects([this.o3d])
       if (intersects.length) {
-        this.onPointerEnter(intersects[0])
+        // pass single intersection if we only have one, for convenience
+        const toPass = intersects.length === 1 ? intersects[0] : intersects;
+
+        // pointer is newly over o3d
+        if (!this.pointerOver) {
+          this.pointerOver = true;
+
+          if (this.onPointerEnter) {
+
+            this.onPointerEnter({ object: this.o3d, intersects: toPass });
+
+            if (this.usePointerEvents) {
+              this.$emit('pointerEnter', toPass);
+            }
+          }
+        }
+        // pointer is still over o3d
+        else if (this.onPointerOver) {
+          this.onPointerOver({ object: this.o3d, intersects: toPass });
+
+          if (this.usePointerEvents) {
+            this.$emit('pointerOver', toPass);
+          }
+        }
+      } else {
+        // pointer is not over o3d
+
+        // pointer has just left o3d
+        if (this.pointerOver) {
+          this.pointerOver = false;
+          if (this.onPointerLeave) {
+            this.onPointerLeave({ object: this.o3d });
+          }
+
+          if (this.usePointerEvents) {
+            this.$emit('pointerLeave');
+          }
+        }
       }
     }
   },
diff --git a/src/core/useThree.js b/src/core/useThree.js
index ced8d12..05c27a6 100644
--- a/src/core/useThree.js
+++ b/src/core/useThree.js
@@ -114,9 +114,11 @@ export default function useThree() {
     // conf.mouse_move = conf.mouse_move || conf.mouse_over;
     if (conf.use_pointer) {
       if (conf.use_pointer === true) {
-        obj.mouse_move_element = document.body;
-      } else {
+        // use renderer as mousemove by default
         obj.mouse_move_element = obj.renderer.domElement;
+      } else {
+        // use custom element as mousemove element
+        obj.mouse_move_element = conf.use_pointer;
       }
       obj.mouse_move_element.addEventListener('mousemove', onMousemove);
       obj.mouse_move_element.addEventListener('mouseleave', onMouseleave);
@@ -223,9 +225,9 @@ export default function useThree() {
   /**
    */
   function updateMouse(e) {
-    const rect = e.target.getBoundingClientRect();
-    mouse.x = ((e.clientX - rect.left) / size.width) * 2 - 1;
-    mouse.y = -((e.clientY - rect.top) / size.height) * 2 + 1;
+    const rect = obj.mouse_move_element.getBoundingClientRect();
+    mouse.x = ((e.x - rect.left) / size.width) * 2 - 1;
+    mouse.y = -((e.y - rect.top) / size.height) * 2 + 1;
   }
 
   /**