Fix && || logical operators in if statements

fuzzie360 · fuzzie360 · commit 408beafa68a0 · 2016-03-05T23:40:54.000+08:00
diff --git a/src/backend/functionNode_webgl.js b/src/backend/functionNode_webgl.js
@@ -281,8 +281,6 @@ var functionNode_webgl = (function() {
 		return retArr;
 	}
 	
-	var epsilon = 0.00001;
-	
 	/// Prases the abstract syntax tree, binary expression
 	///
 	/// @param ast          the AST object to parse
@@ -297,12 +295,6 @@ var functionNode_webgl = (function() {
 			retArr.push(",");
 			ast_generic(ast.right, retArr, funcParam);
 			retArr.push(")");
-		} else if (ast.operator == "==" || ast.operator == "===") {
-			retArr.push("abs((");
-			ast_generic(ast.left, retArr, funcParam);
-			retArr.push(") - (");
-			ast_generic(ast.right, retArr, funcParam);
-			retArr.push(")) < " + epsilon);
 		} else {
 			ast_generic(ast.left, retArr, funcParam);
 			retArr.push(ast.operator);
@@ -523,17 +515,9 @@ var functionNode_webgl = (function() {
 	}
 
 	function ast_LogicalExpression(logNode, retArr, funcParam) {
-		if (logNode.operator == "==" || logNode.operator == "===") {
-			retArr.push("abs((");
-			ast_generic(logNode.left, retArr, funcParam);
-			retArr.push(") - (");
-			ast_generic(logNode.right, retArr, funcParam);
-			retArr.push(")) < " + epsilon);
-		} else {
-			ast_generic(logNode.left, retArr, funcParam);
-			ast_generic(logNode.operator, retArr, funcParam);
-			ast_generic(logNode.right, retArr, funcParam);
-		}
+		ast_generic(logNode.left, retArr, funcParam);
+		retArr.push(logNode.operator);
+		ast_generic(logNode.right, retArr, funcParam);
 		return retArr;
 	}
 
diff --git a/src/backend/mode_gpu.js b/src/backend/mode_gpu.js
@@ -280,7 +280,6 @@
 					'highp float decode32(highp vec4 rgba) {',
 					(endianness == 'LE' ? '' : '	rgba.rgba = rgba.abgr;'),
 					'	rgba *= 255.0;',
-					'	rgba = floor(rgba+0.5);',
 					'	highp float sign = rgba.a > 127.0 ? -1.0 : 1.0;',
 					'	highp float exponent = 2.0 * integerMod(rgba.a, 128.0) + (rgba.b > 127.0 ? 1.0 : 0.0);',
 					'	highp float res;',
@@ -467,7 +466,6 @@
 					
 					var argBuffer = new Uint8Array((new Float32Array(paramArray)).buffer);
 					gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, paramSize[0], paramSize[1], 0, gl.RGBA, gl.UNSIGNED_BYTE, argBuffer);
-
 					textures[textureCount] = texture;
 
 					var paramLoc = gl.getUniformLocation(program, "user_" + paramNames[textureCount]);
