Browse Source

Updated builds

Mr.doob 4 years ago
parent
commit
16b6fe0a9e
3 changed files with 45 additions and 27 deletions
  1. 20 13
      build/three.js
  2. 0 0
      build/three.min.js
  3. 25 14
      build/three.module.js

+ 20 - 13
build/three.js

@@ -18154,26 +18154,33 @@
 		function renderObjects(renderList, scene, camera) {
 			const overrideMaterial = scene.isScene === true ? scene.overrideMaterial : null;
 
-			for (let i = 0, l = renderList.length; i < l; i++) {
-				const renderItem = renderList[i];
-				const object = renderItem.object;
-				const geometry = renderItem.geometry;
-				const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
-				const group = renderItem.group;
+			if (camera.isArrayCamera) {
+				const cameras = camera.cameras;
 
-				if (camera.isArrayCamera) {
-					const cameras = camera.cameras;
+				for (let i = 0, l = cameras.length; i < l; i++) {
+					const camera2 = cameras[i];
+					state.viewport(_currentViewport.copy(camera2.viewport));
+					currentRenderState.setupLightsView(camera2);
 
-					for (let j = 0, jl = cameras.length; j < jl; j++) {
-						const camera2 = cameras[j];
+					for (let j = 0, jl = renderList.length; j < jl; j++) {
+						const renderItem = renderList[j];
+						const object = renderItem.object;
+						const geometry = renderItem.geometry;
+						const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
+						const group = renderItem.group;
 
 						if (object.layers.test(camera2.layers)) {
-							state.viewport(_currentViewport.copy(camera2.viewport));
-							currentRenderState.setupLightsView(camera2);
 							renderObject(object, scene, camera2, geometry, material, group);
 						}
 					}
-				} else {
+				}
+			} else {
+				for (let j = 0, jl = renderList.length; j < jl; j++) {
+					const renderItem = renderList[j];
+					const object = renderItem.object;
+					const geometry = renderItem.geometry;
+					const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
+					const group = renderItem.group;
 					renderObject(object, scene, camera, geometry, material, group);
 				}
 			}

File diff suppressed because it is too large
+ 0 - 0
build/three.min.js


+ 25 - 14
build/three.module.js

@@ -24682,28 +24682,28 @@ function WebGLRenderer( parameters = {} ) {
 
 		const overrideMaterial = scene.isScene === true ? scene.overrideMaterial : null;
 
-		for ( let i = 0, l = renderList.length; i < l; i ++ ) {
+		if ( camera.isArrayCamera ) {
 
-			const renderItem = renderList[ i ];
+			const cameras = camera.cameras;
 
-			const object = renderItem.object;
-			const geometry = renderItem.geometry;
-			const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
-			const group = renderItem.group;
+			for ( let i = 0, l = cameras.length; i < l; i ++ ) {
 
-			if ( camera.isArrayCamera ) {
+				const camera2 = cameras[ i ];
 
-				const cameras = camera.cameras;
+				state.viewport( _currentViewport.copy( camera2.viewport ) );
 
-				for ( let j = 0, jl = cameras.length; j < jl; j ++ ) {
+				currentRenderState.setupLightsView( camera2 );
 
-					const camera2 = cameras[ j ];
+				for ( let j = 0, jl = renderList.length; j < jl; j ++ ) {
 
-					if ( object.layers.test( camera2.layers ) ) {
+					const renderItem = renderList[ j ];
 
-						state.viewport( _currentViewport.copy( camera2.viewport ) );
+					const object = renderItem.object;
+					const geometry = renderItem.geometry;
+					const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
+					const group = renderItem.group;
 
-						currentRenderState.setupLightsView( camera2 );
+					if ( object.layers.test( camera2.layers ) ) {
 
 						renderObject( object, scene, camera2, geometry, material, group );
 
@@ -24711,7 +24711,18 @@ function WebGLRenderer( parameters = {} ) {
 
 				}
 
-			} else {
+			}
+
+		} else {
+
+			for ( let j = 0, jl = renderList.length; j < jl; j ++ ) {
+
+				const renderItem = renderList[ j ];
+
+				const object = renderItem.object;
+				const geometry = renderItem.geometry;
+				const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
+				const group = renderItem.group;
 
 				renderObject( object, scene, camera, geometry, material, group );
 

Some files were not shown because too many files changed in this diff