fix issue where scroll-scaling wasn't updating its local scale value; fix issue where media-loader wasn't setting the bounding box corrrectly in certain cases

Author: InfiniteLee

src/components/media-loader.js

@@ -21,6 +21,7 @@ AFRAME.registerComponent("media-loader", {
     this.showLoader = this.showLoader.bind(this);
     this.clearLoadingTimeout = this.clearLoadingTimeout.bind(this);
     this.shapeAdded = false;
+    this.hasBakedShapes = false;
   },
 
   setShapeAndScale(resize) {
@@ -31,7 +32,7 @@ AFRAME.registerComponent("media-loader", {
     if (this.el.body && this.shapeAdded && this.el.body.shapes.length > 1) {
       this.el.removeAttribute("shape");
       this.shapeAdded = false;
-    } else if (this.el.body.shapes.length === 0) {
+    } else if (!this.hasBakedShapes) {
       const center = new THREE.Vector3();
       const { min, max } = box;
       const halfExtents = {
@@ -75,6 +76,10 @@ AFRAME.registerComponent("media-loader", {
       this.loadingClip.play();
     }
     this.el.setObject3D("mesh", mesh);
+    //check if the object has baked shape data and that it's not a spawner
+    //if it is a spawner, this will ignore the baked shape data so that it resizes correctly
+    //TODO: update DefaultEnvironment.json so this is not required
+    this.hasBakedShapes = this.el.body.shapes.length > 0 && !this.el.components.hasOwnProperty("super-spawner");
     this.setShapeAndScale(true);
     delete this.showLoaderTimeout;
   },
@@ -149,6 +154,7 @@ AFRAME.registerComponent("media-loader", {
           "model-loaded",
           () => {
             this.clearLoadingTimeout();
+            this.hasBakedShapes = this.el.body.shapes.length > (this.shapeAdded ? 1 : 0);
             this.setShapeAndScale(this.data.resize);
           },
           { once: true }

src/components/super-networked-interactable.js

@@ -55,6 +55,7 @@ AFRAME.registerComponent("super-networked-interactable", {
       if (NAF.utils.takeOwnership(this.networkedEl)) {
         this.el.setAttribute("body", { type: "dynamic" });
         this.counter.register(this.networkedEl);
+        this.currentScale.copy(this.el.getAttribute("scale"));
       } else {
         this.el.emit("grab-end", { hand: this.hand });
         this.hand = null;

src/components/tools/pen.js

@@ -25,8 +25,8 @@ AFRAME.registerComponent("pen", {
         "#9900FF",
         "#FF6600",
         "#FFFFFF",
-        "#AAAAAA",
-        "#777777",
+        "#222222",
+        "#111111",
         "#000000"
       ]
     },