Updated builds.

apple01150525 · Apr 5, 2017 · e557ad2 · e557ad2
1 parent 8c72ccc
commit e557ad2
Show file tree

Hide file tree

Showing 3 changed files with 304 additions and 312 deletions.
diff --git a/build/three.js b/build/three.js
@@ -21122,79 +21122,73 @@
 
 			if ( ! object.visible ) return;
 
-			var visible = object.layers.test( camera.layers );
-
-			if ( visible ) {
+			if ( object.isLight ) {
 
-				if ( object.isLight ) {
+				lights.push( object );
 
-					lights.push( object );
+			} else if ( object.isSprite ) {
 
-				} else if ( object.isSprite ) {
+				if ( ! object.frustumCulled || _frustum.intersectsSprite( object ) ) {
 
-					if ( ! object.frustumCulled || _frustum.intersectsSprite( object ) ) {
+					sprites.push( object );
 
-						sprites.push( object );
-
-					}
-
-				} else if ( object.isLensFlare ) {
+				}
 
-					lensFlares.push( object );
+			} else if ( object.isLensFlare ) {
 
-				} else if ( object.isImmediateRenderObject ) {
+				lensFlares.push( object );
 
-					if ( sortObjects ) {
+			} else if ( object.isImmediateRenderObject ) {
 
-						_vector3.setFromMatrixPosition( object.matrixWorld )
-							.applyMatrix4( _projScreenMatrix );
+				if ( sortObjects ) {
 
-					}
+					_vector3.setFromMatrixPosition( object.matrixWorld )
+						.applyMatrix4( _projScreenMatrix );
 
-					currentRenderList.push( object, null, object.material, _vector3.z, null );
+				}
 
-				} else if ( object.isMesh || object.isLine || object.isPoints ) {
+				currentRenderList.push( object, null, object.material, _vector3.z, null );
 
-					if ( object.isSkinnedMesh ) {
+			} else if ( object.isMesh || object.isLine || object.isPoints ) {
 
-						object.skeleton.update();
+				if ( object.isSkinnedMesh ) {
 
-					}
+					object.skeleton.update();
 
-					if ( ! object.frustumCulled || _frustum.intersectsObject( object ) ) {
+				}
 
-						if ( sortObjects ) {
+				if ( ! object.frustumCulled || _frustum.intersectsObject( object ) ) {
 
-							_vector3.setFromMatrixPosition( object.matrixWorld )
-								.applyMatrix4( _projScreenMatrix );
+					if ( sortObjects ) {
 
-						}
+						_vector3.setFromMatrixPosition( object.matrixWorld )
+							.applyMatrix4( _projScreenMatrix );
 
-						var geometry = objects.update( object );
-						var material = object.material;
+					}
 
-						if ( Array.isArray( material ) ) {
+					var geometry = objects.update( object );
+					var material = object.material;
 
-							var groups = geometry.groups;
+					if ( Array.isArray( material ) ) {
 
-							for ( var i = 0, l = groups.length; i < l; i ++ ) {
+						var groups = geometry.groups;
 
-								var group = groups[ i ];
-								var groupMaterial = material[ group.materialIndex ];
+						for ( var i = 0, l = groups.length; i < l; i ++ ) {
 
-								if ( groupMaterial && groupMaterial.visible ) {
+							var group = groups[ i ];
+							var groupMaterial = material[ group.materialIndex ];
 
-									currentRenderList.push( object, geometry, groupMaterial, _vector3.z, group );
+							if ( groupMaterial && groupMaterial.visible ) {
 
-								}
+								currentRenderList.push( object, geometry, groupMaterial, _vector3.z, group );
 
 							}
 
-						} else if ( material.visible ) {
+						}
 
-							currentRenderList.push( object, geometry, material, _vector3.z, null );
+					} else if ( material.visible ) {
 
-						}
+						currentRenderList.push( object, geometry, material, _vector3.z, null );
 
 					}
 
@@ -21262,6 +21256,8 @@
 
 		function renderObject( object, scene, camera, geometry, material, group ) {
 
+			if ( object.layers.test( camera.layers ) === false ) return;
+
 			object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
 			object.normalMatrix.getNormalMatrix( object.modelViewMatrix );