Browse Source

Code style fixes.

Mr.doob 9 years ago
parent
commit
41812cf115
2 changed files with 37 additions and 20 deletions
  1. 5 5
      src/renderers/WebGLRenderer.js
  2. 32 15
      src/renderers/webgl/WebGLProgram.js

+ 5 - 5
src/renderers/WebGLRenderer.js

@@ -2337,9 +2337,9 @@ THREE.WebGLRenderer = function ( parameters ) {
 				case 'sa':
 				case 'sa':
 
 
 					// TODO: Optimize this.
 					// TODO: Optimize this.
-					for( var i = 0; i < value.length; i ++ ) {
+					for ( var i = 0; i < value.length; i ++ ) {
 
 
-						for( var propertyName in uniform.properties ) {
+						for ( var propertyName in uniform.properties ) {
 
 
 							var property = uniform.properties[ propertyName ];
 							var property = uniform.properties[ propertyName ];
 							var locationProperty =  location[ i ][ propertyName ];
 							var locationProperty =  location[ i ][ propertyName ];
@@ -2672,7 +2672,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				} else {
 				} else {
 
 
-					uniforms.shadow = -1;
+					uniforms.shadow = - 1;
 
 
 				}
 				}
 
 
@@ -2698,7 +2698,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				} else {
 				} else {
 
 
-					uniforms.shadow = -1;
+					uniforms.shadow = - 1;
 
 
 				}
 				}
 
 
@@ -2731,7 +2731,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				} else {
 				} else {
 
 
-					uniforms.shadow = -1;
+					uniforms.shadow = - 1;
 
 
 				}
 				}
 
 

+ 32 - 15
src/renderers/webgl/WebGLProgram.js

@@ -54,49 +54,66 @@ THREE.WebGLProgram = ( function () {
 
 
 			//console.log("THREE.WebGLProgram: ACTIVE UNIFORM:", name);
 			//console.log("THREE.WebGLProgram: ACTIVE UNIFORM:", name);
 
 
-			var matches = structRe.exec(name);
-			if( matches ) {
+			var matches = structRe.exec( name );
+			if ( matches ) {
 
 
-				var structName = matches[1];
-				var structProperty = matches[2];
+				var structName = matches[ 1 ];
+				var structProperty = matches[ 2 ];
 
 
 				var uniformsStruct = uniforms[ structName ];
 				var uniformsStruct = uniforms[ structName ];
-				if( ! uniformsStruct ) {
+
+				if ( ! uniformsStruct ) {
+
 					uniformsStruct = uniforms[ structName ] = {};
 					uniformsStruct = uniforms[ structName ] = {};
+
 				}
 				}
+
 				uniformsStruct[ structProperty ] = location;
 				uniformsStruct[ structProperty ] = location;
 
 
 				continue;
 				continue;
+
 			}
 			}
 
 
-			matches = arrayStructRe.exec(name);
-			if( matches ) {
+			matches = arrayStructRe.exec( name );
 
 
-				var arrayName = matches[1];
-				var arrayIndex = matches[2];
-				var arrayProperty = matches[3];
+			if ( matches ) {
+
+				var arrayName = matches[ 1 ];
+				var arrayIndex = matches[ 2 ];
+				var arrayProperty = matches[ 3 ];
 
 
 				var uniformsArray = uniforms[ arrayName ];
 				var uniformsArray = uniforms[ arrayName ];
-				if( ! uniformsArray ) {
+
+				if ( ! uniformsArray ) {
+
 					uniformsArray = uniforms[ arrayName ] = [];
 					uniformsArray = uniforms[ arrayName ] = [];
+
 				}
 				}
+
 				var uniformsArrayIndex = uniformsArray[ arrayIndex ];
 				var uniformsArrayIndex = uniformsArray[ arrayIndex ];
-				if( ! uniformsArrayIndex ) {
+
+				if ( ! uniformsArrayIndex ) {
+
 					uniformsArrayIndex = uniformsArray[ arrayIndex ] = {};
 					uniformsArrayIndex = uniformsArray[ arrayIndex ] = {};
+
 				}
 				}
+
 				uniformsArrayIndex[ arrayProperty ] = location;
 				uniformsArrayIndex[ arrayProperty ] = location;
 
 
 				continue;
 				continue;
+
 			}
 			}
 
 
-			matches = arrayRe.exec(name)
-			if( matches ) {
+			matches = arrayRe.exec( name );
 
 
-				var arrayName = matches[1];
+			if ( matches ) {
+
+				var arrayName = matches[ 1 ];
 
 
 				uniforms[ arrayName ] = location;
 				uniforms[ arrayName ] = location;
 
 
 				continue;
 				continue;
+
 			}
 			}
 
 
 			uniforms[ name ] = location;
 			uniforms[ name ] = location;