VREffects/VRControls: Reverted internal vrdisplays removal so it doesn't break backward compatibility.

mrdoob · mrdoob · commit 6c622248fd55 · 2016-09-27T07:47:46.000-07:00
diff --git a/examples/js/controls/VRControls.js b/examples/js/controls/VRControls.js
@@ -7,7 +7,7 @@ THREE.VRControls = function ( object, onError ) {
 
 	var scope = this;
 
-	var vrDisplay;
+	var vrDisplay, vrDisplays;
 
 	var standingMatrix = new THREE.Matrix4();
 
@@ -16,6 +16,28 @@ THREE.VRControls = function ( object, onError ) {
 		frameData = new VRFrameData();
 	}
 
+	function gotVRDisplays( displays ) {
+
+		vrDisplays = displays;
+
+		if ( displays.length > 0 ) {
+
+			vrDisplay = displays[ 0 ];
+
+		} else {
+
+			if ( onError ) onError( 'VR input not available.' );
+
+		}
+
+	}
+
+	if ( navigator.getVRDisplays ) {
+
+		navigator.getVRDisplays().then( gotVRDisplays );
+
+	}
+
 	// the Rift SDK returns the position in meters
 	// this scale factor allows the user to define how meters
 	// are converted to scene units.
diff --git a/examples/js/effects/VREffect.js b/examples/js/effects/VREffect.js
@@ -9,10 +9,9 @@
  *
  */
 
-THREE.VREffect = function ( renderer ) {
-
-	var vrDisplay;
+THREE.VREffect = function ( renderer, onError ) {
 
+	var vrDisplay, vrDisplays;
 	var eyeTranslationL = new THREE.Vector3();
 	var eyeTranslationR = new THREE.Vector3();
 	var renderRectL, renderRectR;
@@ -24,6 +23,28 @@ THREE.VREffect = function ( renderer ) {
 
 	}
 
+	function gotVRDisplays( displays ) {
+
+		vrDisplays = displays;
+
+		if ( displays.length > 0 ) {
+
+			vrDisplay = displays[ 0 ];
+
+		} else {
+
+			if ( onError ) onError( 'HMD not available' );
+
+		}
+
+	}
+
+	if ( navigator.getVRDisplays ) {
+
+		navigator.getVRDisplays().then( gotVRDisplays );
+
+	}
+
 	//
 
 	this.isPresenting = false;
