Browse Source

WebGLRenderer: More MorphTargets code clean up.

Mr.doob 10 năm trước cách đây
mục cha
commit
3c31516686
1 tập tin đã thay đổi với 12 bổ sung12 xóa
  1. 12 12
      src/renderers/WebGLRenderer.js

+ 12 - 12
src/renderers/WebGLRenderer.js

@@ -803,7 +803,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 			if ( geometryGroupsList !== undefined ) {
 			if ( geometryGroupsList !== undefined ) {
 
 
-				for ( var i = 0,l = geometryGroupsList.length; i < l; i ++ ) {
+				for ( var i = 0, l = geometryGroupsList.length; i < l; i ++ ) {
 
 
 					var geometryGroup = geometryGroupsList[ i ];
 					var geometryGroup = geometryGroupsList[ i ];
 
 
@@ -3162,27 +3162,29 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 			};
 			};
 
 
-			var m = 0;
-
-			while ( m < material.numSupportedMorphTargets ) {
+			for ( var m = 0, ml = material.numSupportedMorphTargets; m < ml; m ++ ) {
 
 
 				if ( activeInfluenceIndices[ m ] ) {
 				if ( activeInfluenceIndices[ m ] ) {
 
 
 					var influenceIndex = activeInfluenceIndices[ m ][ 1 ];
 					var influenceIndex = activeInfluenceIndices[ m ][ 1 ];
 
 
-					if ( attributes[ 'morphTarget' + m ] >= 0 ) {
+					var attribute = attributes[ 'morphTarget' + m ];
+
+					if ( attribute >= 0 ) {
 
 
 						_gl.bindBuffer( _gl.ARRAY_BUFFER, geometryGroup.__webglMorphTargetsBuffers[ influenceIndex ] );
 						_gl.bindBuffer( _gl.ARRAY_BUFFER, geometryGroup.__webglMorphTargetsBuffers[ influenceIndex ] );
-						enableAttribute( attributes[ 'morphTarget' + m ] );
-						_gl.vertexAttribPointer( attributes[ 'morphTarget' + m ], 3, _gl.FLOAT, false, 0, 0 );
+						enableAttribute( attribute );
+						_gl.vertexAttribPointer( attribute, 3, _gl.FLOAT, false, 0, 0 );
 
 
 					}
 					}
 
 
-					if ( material.morphNormals && attributes[ 'morphNormal' + m ] >= 0 ) {
+					var attribute = attributes[ 'morphNormal' + m ];
+
+					if ( material.morphNormals && attribute >= 0 ) {
 
 
 						_gl.bindBuffer( _gl.ARRAY_BUFFER, geometryGroup.__webglMorphNormalsBuffers[ influenceIndex ] );
 						_gl.bindBuffer( _gl.ARRAY_BUFFER, geometryGroup.__webglMorphNormalsBuffers[ influenceIndex ] );
-						enableAttribute( attributes[ 'morphNormal' + m ] );
-						_gl.vertexAttribPointer( attributes[ 'morphNormal' + m ], 3, _gl.FLOAT, false, 0, 0 );
+						enableAttribute( attribute );
+						_gl.vertexAttribPointer( attribute, 3, _gl.FLOAT, false, 0, 0 );
 
 
 
 
 					}
 					}
@@ -3205,8 +3207,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				}
 				}
 
 
-				m ++;
-
 			}
 			}
 
 
 		}
 		}