소스 검색

Merge pull request #7751 from borismus/dev

VREffect should respond to live changes to the current HMDVRDevice.
Mr.doob 9 년 전
부모
커밋
e22171e352
1개의 변경된 파일8개의 추가작업 그리고 21개의 파일을 삭제
  1. 8 21
      examples/js/effects/VREffect.js

+ 8 - 21
examples/js/effects/VREffect.js

@@ -23,27 +23,6 @@ THREE.VREffect = function ( renderer, onError ) {
 
 				vrHMD = devices[ i ];
 
-				if ( vrHMD.getEyeParameters !== undefined ) {
-
-					var eyeParamsL = vrHMD.getEyeParameters( 'left' );
-					var eyeParamsR = vrHMD.getEyeParameters( 'right' );
-
-					eyeTranslationL = eyeParamsL.eyeTranslation;
-					eyeTranslationR = eyeParamsR.eyeTranslation;
-					eyeFOVL = eyeParamsL.recommendedFieldOfView;
-					eyeFOVR = eyeParamsR.recommendedFieldOfView;
-
-				} else {
-
-					// TODO: This is an older code path and not spec compliant.
-					// It should be removed at some point in the near future.
-					eyeTranslationL = vrHMD.getEyeTranslation( 'left' );
-					eyeTranslationR = vrHMD.getEyeTranslation( 'right' );
-					eyeFOVL = vrHMD.getRecommendedEyeFieldOfView( 'left' );
-					eyeFOVR = vrHMD.getRecommendedEyeFieldOfView( 'right' );
-
-				}
-
 				break; // We keep the first we encounter
 
 			}
@@ -113,6 +92,14 @@ THREE.VREffect = function ( renderer, onError ) {
 
 		if ( vrHMD ) {
 
+			var eyeParamsL = vrHMD.getEyeParameters( 'left' );
+			var eyeParamsR = vrHMD.getEyeParameters( 'right' );
+
+			eyeTranslationL = eyeParamsL.eyeTranslation;
+			eyeTranslationR = eyeParamsR.eyeTranslation;
+			eyeFOVL = eyeParamsL.recommendedFieldOfView;
+			eyeFOVR = eyeParamsR.recommendedFieldOfView;
+
 			var sceneL, sceneR;
 
 			if ( Array.isArray( scene ) ) {