Update: Update Box3D to 12.3.0

build/karma.conf.js

@@ -3,7 +3,7 @@ const webpackConfig = require('./webpack.karma.config');
 
 const DOC_STATIC_ASSETS_VERSION = '1.7.0';
 const MEDIA_STATIC_ASSETS_VERSION = '1.8.0';
-const MODEL3D_STATIC_ASSETS_VERSION = '1.6.1';
+const MODEL3D_STATIC_ASSETS_VERSION = '1.9.1';
 const SWF_STATIC_ASSETS_VERSION = '0.112.0';
 const TEXT_STATIC_ASSETS_VERSION = '0.114.0';
 

src/lib/constants.js

@@ -84,7 +84,7 @@ export const X_REP_HINT_VIDEO_MP4 = '[mp4]';
 // whenever a file in that third party directory is updated
 export const DOC_STATIC_ASSETS_VERSION = '1.7.0';
 export const MEDIA_STATIC_ASSETS_VERSION = '1.8.0';
-export const MODEL3D_STATIC_ASSETS_VERSION = '1.6.1';
+export const MODEL3D_STATIC_ASSETS_VERSION = '1.9.1';
 export const SWF_STATIC_ASSETS_VERSION = '0.112.0';
 export const TEXT_STATIC_ASSETS_VERSION = '0.114.0';
 

src/lib/viewers/box3d/model3d/Model3DRenderer.js

@@ -141,11 +141,20 @@ class Model3DRenderer extends Box3DRenderer {
                 reject(new Error('Provided Box3D application must include node named "Preview Model"'));
             }
 
-            this.instance.once('remoteInstanceCreated', () => {
-                this.setupScene();
-                resolve();
-            });
-            this.instance.trigger('createRemoteInstance', fileId);
+            // If the preview model has the component that loads a model from Box, trigger it.
+            if (this.instance.getComponentByScriptId('remote_instance')) {
+                this.instance.once('remoteInstanceCreated', () => {
+                    this.setupScene();
+                    resolve();
+                });
+                this.instance.trigger('createRemoteInstance', fileId);
+                // Otherwise, just let the scene load.
+            } else {
+                this.instance.when('load', () => {
+                    this.setupScene();
+                    resolve();
+                });
+            }
         });
     }
 

src/third-party/model3d/1.9.1/WebVR/VRConfig.js

@@ -0,0 +1,49 @@
+window.WebVRConfig = {
+    // Forces availability of VR mode, even for non-mobile devices.
+    FORCE_ENABLE_VR: false,
+
+    // Complementary filter coefficient. 0 for accelerometer, 1 for gyro.
+    K_FILTER: 0.98,
+
+    // How far into the future to predict during fast motion (in seconds).
+    PREDICTION_TIME_S: 0.040,
+
+    // Flag to disable touch panner. In case you have your own touch controls.
+    TOUCH_PANNER_DISABLED: false,
+
+    // Flag to disabled the UI in VR Mode.
+    CARDBOARD_UI_DISABLED: false, // Default: false
+
+    // Flag to disable the instructions to rotate your device.
+    ROTATE_INSTRUCTIONS_DISABLED: false, // Default: false.
+
+    // Enable yaw panning only, disabling roll and pitch. This can be useful
+    // for panoramas with nothing interesting above or below.
+    YAW_ONLY: false,
+
+    // To disable keyboard and mouse controls, if you want to use your own
+    // implementation.
+    MOUSE_KEYBOARD_CONTROLS_DISABLED: true,
+
+    // Prevent the polyfill from initializing immediately. Requires the app
+    // to call InitializeWebVRPolyfill() before it can be used.
+    DEFER_INITIALIZATION: false,
+
+    // Enable the deprecated version of the API (navigator.getVRDevices).
+    ENABLE_DEPRECATED_API: false,
+
+    // Scales the recommended buffer size reported by WebVR, which can improve
+    // performance.
+    // UPDATE(2016-05-03): Setting this to 0.5 by default since 1.0 does not
+    // perform well on many mobile devices.
+    BUFFER_SCALE: 0.5,
+
+    // Allow VRDisplay.submitFrame to change gl bindings, which is more
+    // efficient if the application code will re-bind its resources on the
+    // next frame anyway. This has been seen to cause rendering glitches with
+    // THREE.js.
+    // Dirty bindings include: gl.FRAMEBUFFER_BINDING, gl.CURRENT_PROGRAM,
+    // gl.ARRAY_BUFFER_BINDING, gl.ELEMENT_ARRAY_BUFFER_BINDING,
+    // and gl.TEXTURE_BINDING_2D for texture unit 0.
+    DIRTY_SUBMIT_FRAME_BINDINGS: false
+};