cleanup what needs to be same as main

Signed-off-by: Hannah Bollar <[email protected]>
Volumetrics-io · Feb 21, 2024 · 049b60d · 049b60d
1 parent 2f9d9b7
commit 049b60d
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 160 deletions.
diff --git a/dist/mr.js b/dist/mr.js
diff --git a/src/core/MRDivEntity.js b/src/core/MRDivEntity.js
@@ -56,9 +56,7 @@ export class MRDivEntity extends MREntity {
         if (mrjsUtils.xr.isPresenting) {
             return (rect.height / mrjsUtils.display.VIRTUAL_DISPLAY_RESOLUTION) * mrjsUtils.app.scale;
         }
-        let val = (rect.height / global.appHeight) * global.viewPortHeight;
-        // console.log('mrdiventity height: ', val);
-        return val;
+        return (rect.height / global.appHeight) * global.viewPortHeight;
     }
 
     /**
@@ -72,9 +70,7 @@ export class MRDivEntity extends MREntity {
         if (mrjsUtils.xr.isPresenting) {
             return (rect.width / mrjsUtils.display.VIRTUAL_DISPLAY_RESOLUTION) * mrjsUtils.app.scale;
         }
-        let val = (rect.width / global.appWidth) * global.viewPortWidth;
-        // console.log('mrdiventity width: ', val);
-        return val;
+        return (rect.width / global.appWidth) * global.viewPortWidth;
     }
 
     /**
@@ -126,6 +122,7 @@ export class MRDivEntity extends MREntity {
     connected() {
         this.background.geometry = mrjsUtils.geometry.UIPlane(this.width, this.height, [0], 18);
     }
+
 }
 
 customElements.get('mr-div') || customElements.define('mr-div', MRDivEntity);
diff --git a/src/core/MREntity.js b/src/core/MREntity.js
@@ -77,11 +77,7 @@ export class MREntity extends MRElement {
      * @returns {number} - the resolved width
      */
     get width() {
-        let val = (this.compStyle.width.split('px')[0] / global.appWidth) * global.viewPortWidth;
-        // if (this instanceof MRPanel) {
-            console.log('entity width:', val);
-        // }
-        return val;
+        return (this.compStyle.width.split('px')[0] / global.appWidth) * global.viewPortWidth;
     }
 
     /**
@@ -91,9 +87,6 @@ export class MREntity extends MRElement {
      */
     get contentWidth() {
         this.aabb.setFromObject(this.object3D).getSize(this.size);
-        // if (this instanceof MRPanel) {
-            console.log('entity contentWidth:', this.size.x);
-        // }
         return this.size.x;
     }
 
@@ -103,14 +96,7 @@ export class MREntity extends MRElement {
      * @returns {number} - the resolved height
      */
     get height() {
-        // let val = (this.compStyle.height.split('px')[0] / global.appHeight) * global.viewPortHeight;
-
-        // old impl
-        const styleHeight = this.compStyle.height.split('px')[0] > 0 ? this.compStyle.height.split('px')[0] : global.appHeight;
-        let val = (styleHeight / global.appHeight) * global.viewPortHeight;
-
-        console.log('entity height:', val);
-        return val;
+        return (this.compStyle.height.split('px')[0] / global.appHeight) * global.viewPortHeight;
     }
 
     /**
@@ -120,7 +106,6 @@ export class MREntity extends MRElement {
      */
     get contentHeight() {
         this.aabb.setFromObject(this.object3D).getSize(this.size);
-        console.log('entity contentHeight:', this.size.y);
         return this.size.y;
     }
 

diff --git a/src/core/componentSystems/ClippingSystem.js b/src/core/componentSystems/ClippingSystem.js
@@ -152,8 +152,6 @@ export class ClippingSystem extends MRSystem {
      * @param {MREntity} entity - given entity that will be clipped by the planes.
      */
     onNewEntity(entity) {
-        return;
-
         if (!entity.ignoreStencil) {
             // only apply clipping planes to entities that arent masked through the stencil
             // since doubling up on that is redundant and not helpful for runtime

diff --git a/src/core/componentSystems/GeometryStyleSystem.js b/src/core/componentSystems/GeometryStyleSystem.js
@@ -116,14 +116,14 @@ export class GeometryStyleSystem extends MRSystem {
         console.log('image width', w, 'contentwidth:', entity.contentWidth, 'textureWidth:', entity.textureWidth);
         let h = entity.height;
         let b = entity.borderRadii;
-        // if (entity._storedWidth != w || entity._storedHeight != h || entity._storedBorderRadii != b) {
-        //     entity._storedWidth = w;
-        //     entity._storedHeight = h;
-        //     entity._storedBorderRadii = b;
-        // } else {
-        //     // no update needed
-        //     return false;
-        // }
+        if (entity._storedWidth != w || entity._storedHeight != h || entity._storedBorderRadii != b) {
+            entity._storedWidth = w;
+            entity._storedHeight = h;
+            entity._storedBorderRadii = b;
+        } else {
+            // no update needed
+            return false;
+        }
 
         if (entity.object3D.geometry !== undefined) {
             entity.object3D.geometry.dispose();

diff --git a/src/core/componentSystems/MaskingSystem.js b/src/core/componentSystems/MaskingSystem.js
@@ -72,7 +72,6 @@ export class MaskingSystem extends MRSystem {
      * @param {MREntity} entity - the entity being added.
      */
     onNewEntity(entity) {
-        return;
         if (entity instanceof MRPanel) {
             // Using an array for the panels in case we need them for more manipulations down the line instead
             // of using the system's registry.

diff --git a/src/core/componentSystems/temp b/src/core/componentSystems/temp
diff --git a/src/core/entities/MRPanel.js b/src/core/entities/MRPanel.js
@@ -126,16 +126,10 @@ export class MRPanel extends MRDivEntity {
 
         let app = this.closest('mr-app');
 
-        if (app.compStyle.overflow == 'scroll' || app.compStyle.overflow == 'auto') {
-            let before = app.scrollTop;
+        if (app.compStyle.overflow == 'scroll') {
             app.scrollTop += mrjsUtils.css.threeToPx(this.delta);
-            console.log('scroll/auto: scrolling before', before, ' after', app.scrollTop);
         } else {
-                        let before = app.scrollTop;
-
-            app.scrollTop += mrjsUtils.css.threeToPx(this.delta);
-            // window.scrollBy(0, mrjsUtils.css.threeToPx(this.delta));
-            console.log('NOT scroll/auto: scrolling before', before, ' after', app.scrollTop);
+            this.scrollBy(0, mrjsUtils.css.threeToPx(this.delta));
         }
     };
 

diff --git a/src/defaultStyle.css b/src/defaultStyle.css
@@ -31,10 +31,7 @@ mr-panel {
     background-color: #fff;
     border-radius: 2%;
     position: fixed;
-/*    overflow: scroll;*/
     overflow: auto;
-/*      padding-right: 15px; /* Adjust based on expected scrollbar width */
-/*padding: 0;*/
     height: 100vh;
     width: 100vw;
 }