From 307e124a1cb0dbf70edc53cd813a268771e1540f Mon Sep 17 00:00:00 2001 From: MiiBond Date: Wed, 22 Mar 2017 11:51:57 -0700 Subject: [PATCH] Update: Adjust default camera distance for model3d viewer (#5) --- src/lib/viewers/box3d/Box3dAssets.js | 4 ++-- src/lib/viewers/box3d/model3d/Model3dRenderer.js | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/viewers/box3d/Box3dAssets.js b/src/lib/viewers/box3d/Box3dAssets.js index 9999a135c..31ea076c8 100644 --- a/src/lib/viewers/box3d/Box3dAssets.js +++ b/src/lib/viewers/box3d/Box3dAssets.js @@ -1,8 +1,8 @@ const STATIC_URI = 'third-party/model3d/'; const BOX3D = [ - `${STATIC_URI}boxsdk.js`, + `${STATIC_URI}boxsdk.min.js`, `${STATIC_URI}three.min.js`, - `${STATIC_URI}box3d-runtime.js`, + `${STATIC_URI}box3d-runtime.min.js`, `${STATIC_URI}webvr-polyfill.js`, `${STATIC_URI}WebVR/VRConfig.js` ]; diff --git a/src/lib/viewers/box3d/model3d/Model3dRenderer.js b/src/lib/viewers/box3d/model3d/Model3dRenderer.js index c6675b6a7..7af2f8e8a 100644 --- a/src/lib/viewers/box3d/model3d/Model3dRenderer.js +++ b/src/lib/viewers/box3d/model3d/Model3dRenderer.js @@ -31,6 +31,7 @@ const ORIGIN_VECTOR = { x: 0, y: 0, z: 0 }; const FLOOR_VECTOR = { x: 0, y: -1, z: 0 }; const IDENTITY_QUATERNION = { x: 0, y: 0, z: 0, w: 1 }; +const PREVIEW_CAMERA_ORBIT_DISTANCE_FACTOR = 1.5; const PREVIEW_CAMERA_POSITION = { x: -0.559, y: 0.197, @@ -311,7 +312,8 @@ class Model3dRenderer extends Box3DRenderer { // Set the origin point (so that we always point at the center of the model when the camera reloads) orbitController.originPoint.copy(center); orbitController.setPivotPosition(center); - orbitController.setOrbitDistance(Math.max(Math.max(maxDimension.x, maxDimension.y), maxDimension.z)); + const distance = PREVIEW_CAMERA_ORBIT_DISTANCE_FACTOR * Math.max(Math.max(maxDimension.x, maxDimension.y), maxDimension.z); + orbitController.setOrbitDistance(distance); } /** @inheritdoc */