Merge pull request #137 from Smithsonian/dev-bugfix

Dev bugfix
Smithsonian · May 10, 2022 · 2083a83 · 2083a83
2 parents 06cb9e6 + 047311e
commit 2083a83
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/source/client/components/CVModel2.ts b/source/client/components/CVModel2.ts
@@ -369,8 +369,8 @@ export default class CVModel2 extends CObject3D
             this.addObject3D(this._boxFrame);
             this._boxFrame.updateMatrixWorld(true);
 
-            const setup = this.getGraphComponent(CVSetup);
-            if(setup.navigation.ins.autoZoom.value) {
+            const setup = this.getGraphComponent(CVSetup, true);
+            if(setup && setup.navigation.ins.autoZoom.value) {
                 setup.navigation.ins.zoomExtents.set();
             }
             outs.updated.set();

diff --git a/source/client/components/CVOrbitNavigation.ts b/source/client/components/CVOrbitNavigation.ts
@@ -208,10 +208,12 @@ export default class CVOrbitNavigation extends CObject3D
                 /*edge case when loaded event triggers before document parsing */
             }
             else {
-                controller.camera = cameraComponent.camera;
-
                 // Hack until we have a better way to make sure camera is initialized on first zoom
-                cameraComponent.camera.aspect = controller.camera.aspect;
+                if(controller.camera) {
+                    cameraComponent.camera.aspect = controller.camera.aspect;
+                }
+
+                controller.camera = cameraComponent.camera;
 
                 controller.zoomExtents(this._modelBoundingBox);
                 cameraComponent.ins.zoom.set();

diff --git a/source/client/components/CVScene.ts b/source/client/components/CVScene.ts
@@ -192,13 +192,16 @@ export default class CVScene extends CVNode
     {
         const {ins, outs} = this; 
         const lightNode = this.graph.findNodeByName("Lights");
-        const lightTransform = lightNode.getComponent(CTransform, true);
-
-        const unitScale = unitScaleFactor(outs.units.value, ins.units.value);
-        _vec3.setScalar(this.outs.boundingRadius.value * unitScale * 0.05);
-        lightTransform.ins.scale.setValue(_vec3.toArray());
 
-        lightTransform.object3D.updateMatrixWorld(true);
+        if(lightNode) {
+            const lightTransform = lightNode.getComponent(CTransform, true);
+
+            const unitScale = unitScaleFactor(outs.units.value, ins.units.value);
+            _vec3.setScalar(this.outs.boundingRadius.value * unitScale * 0.05);
+            lightTransform.ins.scale.setValue(_vec3.toArray());
+
+            lightTransform.object3D.updateMatrixWorld(true);
+        }
     }
 
     protected updateCameras()

diff --git a/source/client/nodes/NVScene.ts b/source/client/nodes/NVScene.ts
@@ -69,10 +69,12 @@ export default class NVScene extends NVNode
                 childNode.fromDocument(document, nodeIndex, pathMap);
             });
         }
-
-        const setupData = document.setups[scene.setup];
-        if (setupData.snapshots) {
-            this.setup.snapshots.fromData(setupData.snapshots, pathMap);
+
+        if (isFinite(scene.setup)) {
+            const setupData = document.setups[scene.setup];
+            if (setupData.snapshots) {
+                this.setup.snapshots.fromData(setupData.snapshots, pathMap);
+            }
         }
     }