浏览代码

Merge pull request #1264 from RaananW/vrCameraMetrices-constructor

Adding VRCameraMatrics to constructor
David Catuhe 9 年之前
父节点
当前提交
4b381cd5a3
共有 2 个文件被更改,包括 6 次插入8 次删除
  1. 3 4
      src/Cameras/VR/babylon.vrDeviceOrientationCamera.ts
  2. 3 4
      src/Cameras/VR/babylon.webVRCamera.ts

+ 3 - 4
src/Cameras/VR/babylon.vrDeviceOrientationCamera.ts

@@ -1,14 +1,13 @@
 module BABYLON {
     export class VRDeviceOrientationFreeCamera extends FreeCamera {
 
-        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion = true) {
+        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion = true, vrCameraMetrics: VRCameraMetrics = VRCameraMetrics.GetDefault()) {
             super(name, position, scene);
 
             this.rotationQuaternion = new Quaternion();
 
-            var metrics = VRCameraMetrics.GetDefault();
-            metrics.compensateDistortion = compensateDistortion;
-            this.setCameraRigMode(Camera.RIG_MODE_VR, { vrCameraMetrics: metrics });
+            vrCameraMetrics.compensateDistortion = compensateDistortion;
+            this.setCameraRigMode(Camera.RIG_MODE_VR, { vrCameraMetrics: vrCameraMetrics });
 
             this.inputs.addDeviceOrientation();
         }

+ 3 - 4
src/Cameras/VR/babylon.webVRCamera.ts

@@ -8,12 +8,11 @@ module BABYLON {
         private _cacheState = null;
         public _vrEnabled = false;
 
-        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion = true) {
+        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion = true, vrCameraMetrics: VRCameraMetrics = VRCameraMetrics.GetDefault()) {
             super(name, position, scene);
 
-            var metrics = VRCameraMetrics.GetDefault();
-            metrics.compensateDistortion = compensateDistortion;
-            this.setCameraRigMode(Camera.RIG_MODE_VR, { vrCameraMetrics: metrics });
+            vrCameraMetrics.compensateDistortion = compensateDistortion;
+            this.setCameraRigMode(Camera.RIG_MODE_VR, { vrCameraMetrics: vrCameraMetrics });
 
             this._getWebVRDevices = this._getWebVRDevices.bind(this);