Temp fix for hackathon (#394)

Volumetrics-io · Feb 10, 2024 · 270bc0d · 270bc0d
1 parent eaabe7a
commit 270bc0d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mrjs",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "type": "module",
   "description": "an MR first webXR framework",
   "main": "dist/mr.js",

diff --git a/samples/index.html b/samples/index.html
@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>
   <body >
-   <mr-app>
+   <mr-app debug="true">
       <mr-panel class="layout">
         <mr-div id="navbar">
           <mr-a href="https://volumetrics.io" target="_blank" class="company">

diff --git a/src/core/componentSystems/ControlSystem.js b/src/core/componentSystems/ControlSystem.js
@@ -359,16 +359,22 @@ export class ControlSystem extends MRSystem {
         if (!this.currentEntity) {
             this.currentEntity = entity;
             this.currentEntity?.classList.add('hover');
-            this.currentEntity.dispatchEvent(new MouseEvent('mouseover'));
+            this.currentEntity.dispatchEvent(new MouseEvent('mouseover', {
+                bubbles: true
+            }));
             this.currentEntity.focus = true;
         } else if (!this.down && this.currentEntity != entity) {
             this.currentEntity.classList.remove('hover');
-            this.currentEntity.dispatchEvent(new MouseEvent('mouseleave'));
+            this.currentEntity.dispatchEvent(new MouseEvent('mouseleave', {
+                bubbles: true
+            }));
             this.currentEntity.focus = false;
 
             this.currentEntity = entity;
             this.currentEntity?.classList.add('hover');
-            this.currentEntity.dispatchEvent(new MouseEvent('mouseover'));
+            this.currentEntity.dispatchEvent(new MouseEvent('mouseover', {
+                bubbles: true
+            }));
             this.currentEntity.focus = true;
         }
 

diff --git a/src/core/componentSystems/MaterialStyleSystem.js b/src/core/componentSystems/MaterialStyleSystem.js
@@ -28,9 +28,9 @@ export class MaterialStyleSystem extends MRSystem {
      */
     update(deltaTime, frame) {
         for (const entity of this.registry) {
-            if (!entity.needsStyleUpdate) {
-                return;
-            }
+            // if (!entity.needsStyleUpdate) {
+            //     return;
+            // }
 
             // Anything needed for mrjs defined entities - the order of the below matters
             if (entity instanceof MRDivEntity) {
@@ -45,7 +45,7 @@ export class MaterialStyleSystem extends MRSystem {
             }
 
             // Cleanup
-            entity.dispatchEvent(new CustomEvent('child-updated', { bubbles: true }));
+            // entity.dispatchEvent(new CustomEvent('child-updated', { bubbles: true }));
             if (!entity.alwaysNeedsStyleUpdate) {
                 entity.needsStyleUpdate = false;
             }

diff --git a/src/core/entities/MRPanel.js b/src/core/entities/MRPanel.js
@@ -70,6 +70,14 @@ export class MRPanel extends MRDivEntity {
             this.clipping.geometry.copy(new THREE.BoxGeometry(this.width, this.height, 1));
         });
 
+        this.addEventListener('mouseover', () => {
+            this.focus = true
+        })
+
+        this.addEventListener('mouseleave', () => {
+            this.focus = false
+        })
+
         document.addEventListener('wheel', (event) => {
             this.onScroll(event);
         });