Merge pull request #17196 from Mugen87/dev34

Mugen87 · web-flow · commit 9c5c76aa80ee · 2019-08-07T20:55:04.000+02:00
WebXR: Fix Reflector and Refractor.
diff --git a/examples/js/objects/Reflector.js b/examples/js/objects/Reflector.js
@@ -170,9 +170,11 @@ THREE.Reflector = function ( geometry, options ) {
 
 		// Restore viewport
 
-		if ( camera.isArrayCamera ) {
+		var viewport = camera.viewport;
 
-			renderer.state.viewport( camera.viewport );
+		if ( viewport !== undefined ) {
+
+			renderer.state.viewport( viewport );
 
 		}
 
diff --git a/examples/js/objects/Refractor.js b/examples/js/objects/Refractor.js
@@ -205,9 +205,11 @@ THREE.Refractor = function ( geometry, options ) {
 
 		// restore viewport
 
-		if ( camera.isArrayCamera ) {
+		var viewport = camera.viewport;
 
-			renderer.state.viewport( camera.viewport );
+		if ( viewport !== undefined ) {
+
+			renderer.state.viewport( viewport );
 
 		}
 
diff --git a/examples/jsm/objects/Reflector.js b/examples/jsm/objects/Reflector.js
@@ -186,9 +186,11 @@ var Reflector = function ( geometry, options ) {
 
 		// Restore viewport
 
-		if ( camera.isArrayCamera ) {
+		var viewport = camera.viewport;
 
-			renderer.state.viewport( camera.viewport );
+		if ( viewport !== undefined ) {
+
+			renderer.state.viewport( viewport );
 
 		}
 
diff --git a/examples/jsm/objects/Refractor.js b/examples/jsm/objects/Refractor.js
@@ -222,9 +222,11 @@ var Refractor = function ( geometry, options ) {
 
 		// restore viewport
 
-		if ( camera.isArrayCamera ) {
+		var viewport = camera.viewport;
 
-			renderer.state.viewport( camera.viewport );
+		if ( viewport !== undefined ) {
+
+			renderer.state.viewport( viewport );
 
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,11 @@ THREE.Reflector = function ( geometry, options ) {`
`170`	`170`
`171`	`171`	`// Restore viewport`
`172`	`172`
`173`		`- if ( camera.isArrayCamera ) {`
	`173`	`+ var viewport = camera.viewport;`
`174`	`174`
`175`		`- renderer.state.viewport( camera.viewport );`
	`175`	`+ if ( viewport !== undefined ) {`
	`176`	`+`
	`177`	`+ renderer.state.viewport( viewport );`
`176`	`178`
`177`	`179`	`}`
`178`	`180`
Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,11 @@ THREE.Refractor = function ( geometry, options ) {`
`205`	`205`
`206`	`206`	`// restore viewport`
`207`	`207`
`208`		`- if ( camera.isArrayCamera ) {`
	`208`	`+ var viewport = camera.viewport;`
`209`	`209`
`210`		`- renderer.state.viewport( camera.viewport );`
	`210`	`+ if ( viewport !== undefined ) {`
	`211`	`+`
	`212`	`+ renderer.state.viewport( viewport );`
`211`	`213`
`212`	`214`	`}`
`213`	`215`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,11 @@ var Reflector = function ( geometry, options ) {`
`186`	`186`
`187`	`187`	`// Restore viewport`
`188`	`188`
`189`		`- if ( camera.isArrayCamera ) {`
	`189`	`+ var viewport = camera.viewport;`
`190`	`190`
`191`		`- renderer.state.viewport( camera.viewport );`
	`191`	`+ if ( viewport !== undefined ) {`
	`192`	`+`
	`193`	`+ renderer.state.viewport( viewport );`
`192`	`194`
`193`	`195`	`}`
`194`	`196`
Original file line number	Diff line number	Diff line change
`@@ -222,9 +222,11 @@ var Refractor = function ( geometry, options ) {`
`222`	`222`
`223`	`223`	`// restore viewport`
`224`	`224`
`225`		`- if ( camera.isArrayCamera ) {`
	`225`	`+ var viewport = camera.viewport;`
`226`	`226`
`227`		`- renderer.state.viewport( camera.viewport );`
	`227`	`+ if ( viewport !== undefined ) {`
	`228`	`+`
	`229`	`+ renderer.state.viewport( viewport );`
`228`	`230`
`229`	`231`	`}`
`230`	`232`