瀏覽代碼

rename input to inputs

SUNAG 9 年之前
父節點
當前提交
cf5ad999ef

+ 4 - 4
examples/js/nodes/FunctionCallNode.js

@@ -15,7 +15,7 @@ THREE.FunctionCallNode.prototype.constructor = THREE.FunctionCallNode;
 
 
 THREE.FunctionCallNode.prototype.setFunction = function( val ) {
 THREE.FunctionCallNode.prototype.setFunction = function( val ) {
 
 
-	this.input = [];
+	this.inputs = [];
 	this.value = val;
 	this.value = val;
 
 
 };
 };
@@ -44,10 +44,10 @@ THREE.FunctionCallNode.prototype.generate = function( builder, output ) {
 	var code = func.name + '(';
 	var code = func.name + '(';
 	var params = [];
 	var params = [];
 
 
-	for ( var i = 0; i < func.input.length; i ++ ) {
+	for ( var i = 0; i < func.inputs.length; i ++ ) {
 
 
-		var inpt = func.input[ i ];
-		var param = this.input[ i ] || this.input[ inpt.name ];
+		var inpt = func.inputs[ i ];
+		var param = this.inputs[ i ] || this.inputs[ inpt.name ];
 
 
 		params.push( param.build( builder, builder.getType( inpt.type ) ) );
 		params.push( param.build( builder, builder.getType( inpt.type ) ) );
 
 

+ 5 - 5
examples/js/nodes/FunctionNode.js

@@ -39,12 +39,12 @@ THREE.FunctionNode.prototype.getTypeNode = function( builder, type ) {
 
 
 THREE.FunctionNode.prototype.getInputByName = function( name ) {
 THREE.FunctionNode.prototype.getInputByName = function( name ) {
 
 
-	var i = this.input.length;
+	var i = this.inputs.length;
 
 
 	while ( i -- ) {
 	while ( i -- ) {
 
 
-		if ( this.input[ i ].name === name )
-			return this.input[ i ];
+		if ( this.inputs[ i ].name === name )
+			return this.inputs[ i ];
 
 
 	}
 	}
 
 
@@ -81,7 +81,7 @@ THREE.FunctionNode.prototype.parse = function( src, includes, extensions ) {
 
 
 	var match = src.match( rDeclaration );
 	var match = src.match( rDeclaration );
 
 
-	this.input = [];
+	this.inputs = [];
 
 
 	if ( match && match.length == 4 ) {
 	if ( match && match.length == 4 ) {
 
 
@@ -113,7 +113,7 @@ THREE.FunctionNode.prototype.parse = function( src, includes, extensions ) {
 
 
 				name = inputs[ i ++ ];
 				name = inputs[ i ++ ];
 
 
-				this.input.push( {
+				this.inputs.push( {
 					name : name,
 					name : name,
 					type : type,
 					type : type,
 					qualifier : qualifier
 					qualifier : qualifier

+ 6 - 6
examples/webgl_materials_nodes.html

@@ -708,13 +708,13 @@
 					].join( "\n" ) );
 					].join( "\n" ) );
 
 
 					var saturation = new THREE.FunctionCallNode( satrgb );
 					var saturation = new THREE.FunctionCallNode( satrgb );
-					saturation.input.rgb = tex;
-					saturation.input.adjustment = sat;
+					saturation.inputs.rgb = tex;
+					saturation.inputs.adjustment = sat;
 
 
 					// or try
 					// or try
 
 
-					//saturation.input[0] = tex;
-					//saturation.input[1] = sat;
+					//saturation.inputs[0] = tex;
+					//saturation.inputs[1] = sat;
 
 
 					mtl.color = saturation;
 					mtl.color = saturation;
 					mtl.environment = new THREE.CubeTextureNode( cubemap ); // optional
 					mtl.environment = new THREE.CubeTextureNode( cubemap ); // optional
@@ -1052,8 +1052,8 @@
 					);
 					);
 
 
 					var voronoi = new THREE.FunctionCallNode( voronoiLayers );
 					var voronoi = new THREE.FunctionCallNode( voronoiLayers );
-					voronoi.input.p = uvPos;
-					voronoi.input.time = timeOffset;
+					voronoi.inputs.p = uvPos;
+					voronoi.inputs.time = timeOffset;
 
 
 					var maskCaustic = new THREE.OperatorNode(
 					var maskCaustic = new THREE.OperatorNode(
 						alpha,
 						alpha,

+ 2 - 2
examples/webgl_postprocessing_nodes.html

@@ -313,8 +313,8 @@
 						].join( "\n" ) );
 						].join( "\n" ) );
 
 
 						var saturation = new THREE.FunctionCallNode( satrgb );
 						var saturation = new THREE.FunctionCallNode( satrgb );
-						saturation.input.rgb = screen;
-						saturation.input.adjustment = sat;
+						saturation.inputs.rgb = screen;
+						saturation.inputs.adjustment = sat;
 
 
 						nodepass.value = saturation;
 						nodepass.value = saturation;