Merge branch 'master' of https://github.com/toji/three.js into dev

mrdoob · mrdoob · commit 1cdddbb22406 · 2015-03-30T12:01:51.000-04:00
Conflicts:
	examples/js/controls/VRControls.js
diff --git a/examples/js/controls/VRControls.js b/examples/js/controls/VRControls.js
@@ -71,16 +71,29 @@ THREE.VRControls = function ( object, callback ) {
 
 	};
 
-	this.zeroSensor = function () {
+	this.resetSensor = function () {
 
 		for ( var i = 0; i < vrInputs.length; i++ ) {
 
 			var vrInput = vrInputs[ i ];
 
+		if ( vrInput.resetSensor !== undefined ) {
+
+			vrInput.resetSensor();
+
+		} else if ( vrInput.zeroSensor !== undefined ) {
+
 			vrInput.zeroSensor();
 
 		}
 
 	};
 
+	this.zeroSensor = function () {
+
+		THREE.warn( 'THREE.VRControls: .zeroSensor() is now .resetSensor().' );
+		this.resetSensor();
+
+	};
+
 };
diff --git a/examples/js/effects/VREffect.js b/examples/js/effects/VREffect.js
@@ -46,10 +46,23 @@ THREE.VREffect = function ( renderer, done ) {
 				if ( devices[i] instanceof HMDVRDevice ) {
 					vrHMD = devices[i];
 					self._vrHMD = vrHMD;
-					self.leftEyeTranslation = vrHMD.getEyeTranslation( "left" );
-					self.rightEyeTranslation = vrHMD.getEyeTranslation( "right" );
-					self.leftEyeFOV = vrHMD.getRecommendedEyeFieldOfView( "left" );
-					self.rightEyeFOV = vrHMD.getRecommendedEyeFieldOfView( "right" );
+
+					if ( vrHMD.getEyeParameters !== undefined ) {
+						var leftEyeParams = vrHMD.getEyeParameters( 'left' );
+						var rightEyeParams = vrHMD.getEyeParameters( 'right' );
+						self.leftEyeTranslation = leftEyeParams.eyeTranslation;
+						self.rightEyeTranslation = rightEyeParams.eyeTranslation;
+						self.leftEyeFOV = leftEyeParams.recommendedFieldOfView;
+						self.rightEyeFOV = rightEyeParams.recommendedFieldOfView;
+					} else {
+						// TODO: This is an older code path and not spec compliant.
+						// It should be removed at some point in the near future.
+						self.leftEyeTranslation = vrHMD.getEyeTranslation( 'left' );
+						self.rightEyeTranslation = vrHMD.getEyeTranslation( 'right' );
+						self.leftEyeFOV = vrHMD.getRecommendedEyeFieldOfView( 'left' );
+						self.rightEyeFOV = vrHMD.getRecommendedEyeFieldOfView( 'right' );
+					}
+
 					break; // We keep the first we encounter
 				}
 			}
