浏览代码

Remove .bounds from WebGLRenderer and Reflector and Refractor in examples

Fernando Serrano 6 年之前
父节点
当前提交
612b4fc109
共有 3 个文件被更改,包括 5 次插入36 次删除
  1. 2 10
      examples/js/objects/Reflector.js
  2. 2 10
      examples/js/objects/Refractor.js
  3. 1 16
      src/renderers/WebGLRenderer.js

+ 2 - 10
examples/js/objects/Reflector.js

@@ -172,17 +172,9 @@ THREE.Reflector = function ( geometry, options ) {
 
 
 		// Restore viewport
 		// Restore viewport
 
 
-		var bounds = camera.bounds;
+		var viewport = camera.viewport;
 
 
-		if ( bounds !== undefined ) {
-
-			renderer.getSize( size );
-			var pixelRatio = renderer.getPixelRatio();
-
-			viewport.x = bounds.x * size.width * pixelRatio;
-			viewport.y = bounds.y * size.height * pixelRatio;
-			viewport.z = bounds.z * size.width * pixelRatio;
-			viewport.w = bounds.w * size.height * pixelRatio;
+		if ( viewport !== undefined ) {
 
 
 			renderer.state.viewport( viewport );
 			renderer.state.viewport( viewport );
 
 

+ 2 - 10
examples/js/objects/Refractor.js

@@ -210,17 +210,9 @@ THREE.Refractor = function ( geometry, options ) {
 
 
 			// restore viewport
 			// restore viewport
 
 
-			var bounds = camera.bounds;
+			var viewport = camera.viewport;
 
 
-			if ( bounds !== undefined ) {
-
-				renderer.getSize( size );
-				var pixelRatio = renderer.getPixelRatio();
-
-				viewport.x = bounds.x * size.width * pixelRatio;
-				viewport.y = bounds.y * size.height * pixelRatio;
-				viewport.z = bounds.z * size.width * pixelRatio;
-				viewport.w = bounds.w * size.height * pixelRatio;
+			if ( viewport !== undefined ) {
 
 
 				renderer.state.viewport( viewport );
 				renderer.state.viewport( viewport );
 
 

+ 1 - 16
src/renderers/WebGLRenderer.js

@@ -1379,22 +1379,7 @@ function WebGLRenderer( parameters ) {
 
 
 					if ( object.layers.test( camera2.layers ) ) {
 					if ( object.layers.test( camera2.layers ) ) {
 
 
-						if ( 'viewport' in camera2 ) { // XR
-
-							state.viewport( _currentViewport.copy( camera2.viewport ) );
-
-						} else {
-
-							var bounds = camera2.bounds;
-
-							var x = bounds.x * _width;
-							var y = bounds.y * _height;
-							var width = bounds.z * _width;
-							var height = bounds.w * _height;
-
-							state.viewport( _currentViewport.set( x, y, width, height ).multiplyScalar( _pixelRatio ) );
-
-						}
+						state.viewport( _currentViewport.copy( camera2.viewport ) );
 
 
 						currentRenderState.setupLights( camera2 );
 						currentRenderState.setupLights( camera2 );