Merge commit 'ee0fe215121c8da9625b6e9fe68fbea6248e4c4e' into eugene-gpujs#4-async-api

PicoCreator · PicoCreator · commit 036bc66e5694 · 2016-03-13T00:00:18.000+08:00
diff --git a/src/backend/functionNode_webgl.js b/src/backend/functionNode_webgl.js
@@ -4,6 +4,7 @@ var functionNode_webgl = (function() {
 	var gpu, opt, jsFunctionString;
 	
 	function isIdentifierConstant(paramName) {
+		if (!opt.constants) return false;
 		return opt.constants.indexOf(paramName) != -1;
 	}
 	
@@ -38,6 +39,9 @@ var functionNode_webgl = (function() {
 	function functionNode_webgl( inNode, _opt ) {
 		gpu = inNode.gpu;
 		opt = _opt;
+		if (opt.debug) {
+			console.log(inNode);
+		}
 		jsFunctionString = inNode.jsFunctionString;
 		inNode.webglFunctionString_array = ast_generic( inNode.getJS_AST(), [], inNode );
 		inNode.webglFunctionString = webgl_regex_optimize(
@@ -289,6 +293,8 @@ var functionNode_webgl = (function() {
 	///
 	/// @returns  the appened retArr
 	function ast_BinaryExpression(ast, retArr, funcParam) {
+		retArr.push("(");
+		
 		if (ast.operator == "%") {
 			retArr.push("mod(");
 			ast_generic(ast.left, retArr, funcParam);
@@ -301,6 +307,8 @@ var functionNode_webgl = (function() {
 			ast_generic(ast.right, retArr, funcParam);
 		}
 		
+		retArr.push(")");
+		
 		return retArr;
 	}
 	
@@ -377,8 +385,12 @@ var functionNode_webgl = (function() {
 				retArr.push(forNode.test.operator);
 				ast_generic(forNode.test.right, retArr, funcParam);
 				retArr.push(") {\n");
-				for (var i = 0; i < forNode.body.body.length; i++) {
-					ast_generic(forNode.body.body[i], retArr, funcParam);
+				if (forNode.body.type == "BlockStatement") {
+					for (var i = 0; i < forNode.body.body.length; i++) {
+						ast_generic(forNode.body.body[i], retArr, funcParam);
+					}
+				} else {
+					ast_generic(forNode.body, retArr, funcParam);
 				}
 				retArr.push("} else {\n");
 				retArr.push("break;\n");
@@ -494,11 +506,23 @@ var functionNode_webgl = (function() {
 		retArr.push("if(");
 		ast_generic(ifNode.test, retArr, funcParam);
 		retArr.push(")");
-		ast_generic(ifNode.consequent, retArr, funcParam);
+		if (ifNode.consequent.type == "BlockStatement") {
+			ast_generic(ifNode.consequent, retArr, funcParam);
+		} else {
+			retArr.push(" {\n");
+			ast_generic(ifNode.consequent, retArr, funcParam);
+			retArr.push("\n}\n");
+		}
 		
 		if (ifNode.alternate) {
 			retArr.push("else ");
-			ast_generic(ifNode.alternate, retArr, funcParam);
+			if (ifNode.alternate.type == "BlockStatement") {
+				ast_generic(ifNode.alternate, retArr, funcParam);
+			} else {
+				retArr.push(" {\n");
+				ast_generic(ifNode.alternate, retArr, funcParam);
+				retArr.push("\n}\n");
+			}
 		}
 		return retArr;
 
diff --git a/src/backend/mode_gpu.js b/src/backend/mode_gpu.js
@@ -449,7 +449,8 @@
 			var textureCount = 0;
 			for (textureCount=0; textureCount<paramNames.length; textureCount++) {
 				var paramDim, paramSize, texture;
-				if (Array.isArray(arguments[textureCount])) {
+				var argType = getArgumentType(arguments[textureCount]);
+				if (argType == "Array") {
 					paramDim = getDimensions(arguments[textureCount], true);
 					paramSize = dimToTexSize(gpu, paramDim);
 
@@ -489,11 +490,11 @@
 						gl.uniform2fv(paramSizeLoc, paramSize);
 					}
 					gl.uniform1i(paramLoc, textureCount);
-				} else if (typeof arguments[textureCount] == "number") {
+				} else if (argType == "Number") {
 					var argLoc = gl.getUniformLocation(program, "user_"+paramNames[textureCount]);
 					gl.uniform1f(argLoc, arguments[textureCount]);
-				} else if (arguments[textureCount] instanceof GPUTexture) {
-					paramDim = getDimensions(arguments[textureCount]);
+				} else if (argType == "Texture") {
+					paramDim = getDimensions(arguments[textureCount], true);
 					paramSize = arguments[textureCount].size;
 					texture = arguments[textureCount].texture;
 					textures[textureCount] = texture;
