Merge branch 'develop'

Author: robertleeplummerjr

bin/gpu-core.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 1.6.1
- * @date Sun Sep 02 2018 12:23:56 GMT-0400 (EDT)
+ * @version 1.6.2
+ * @date Sun Sep 02 2018 13:35:51 GMT-0400 (EDT)
  *
  * @license MIT
  * The MIT License

bin/gpu-core.min.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 1.6.1
- * @date Sun Sep 02 2018 12:23:57 GMT-0400 (EDT)
+ * @version 1.6.2
+ * @date Sun Sep 02 2018 13:35:52 GMT-0400 (EDT)
  *
  * @license MIT
  * The MIT License
@@ -2467,7 +2467,7 @@ module.exports = function (_FunctionNodeBase) {
 				if (!inGetParams) {
 					retArr.push('.0');
 				}
-			} else if (this.isState('in-get-call-parameters')) {
+			} else if (inGetParams) {
 				retArr.pop();
 				retArr.push('int(');
 				retArr.push(ast.value);
@@ -2481,6 +2481,11 @@ module.exports = function (_FunctionNodeBase) {
 	}, {
 		key: 'astBinaryExpression',
 		value: function astBinaryExpression(ast, retArr) {
+			var inGetParams = this.isState('in-get-call-parameters');
+			if (inGetParams) {
+				this.pushState('not-in-get-call-parameters');
+				retArr.push('int');
+			}
 			retArr.push('(');
 
 			if (ast.operator === '%') {
@@ -2511,6 +2516,10 @@ module.exports = function (_FunctionNodeBase) {
 
 			retArr.push(')');
 
+			if (inGetParams) {
+				this.popState('not-in-get-call-parameters');
+			}
+
 			return retArr;
 		}
 

bin/gpu.js

@@ -234,7 +234,7 @@ module.exports = function (_FunctionNodeBase) {
 				if (!inGetParams) {
 					retArr.push('.0');
 				}
-			} else if (this.isState('in-get-call-parameters')) {
+			} else if (inGetParams) {
 				// or cast to an int as we are addressing an input array
 				retArr.pop();
 				retArr.push('int(');
@@ -261,6 +261,11 @@ module.exports = function (_FunctionNodeBase) {
 	}, {
 		key: 'astBinaryExpression',
 		value: function astBinaryExpression(ast, retArr) {
+			var inGetParams = this.isState('in-get-call-parameters');
+			if (inGetParams) {
+				this.pushState('not-in-get-call-parameters');
+				retArr.push('int');
+			}
 			retArr.push('(');
 
 			if (ast.operator === '%') {
@@ -291,6 +296,10 @@ module.exports = function (_FunctionNodeBase) {
 
 			retArr.push(')');
 
+			if (inGetParams) {
+				this.popState('not-in-get-call-parameters');
+			}
+
 			return retArr;
 		}
 

bin/gpu.min.js

@@ -1,6 +1,6 @@
 {
   "name": "gpu.js",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "GPU Accelerated JavaScript",
   "main": "./dist/index.js",
   "directories": {

dist/backend/web-gl/function-node.js

@@ -235,7 +235,7 @@ module.exports = class WebGLFunctionNode extends FunctionNodeBase {
 			if (!inGetParams) {
 				retArr.push('.0');
 			}
-		} else if (this.isState('in-get-call-parameters')) {
+		} else if (inGetParams) {
 			// or cast to an int as we are addressing an input array
 			retArr.pop();
 			retArr.push('int(');
@@ -259,6 +259,11 @@ module.exports = class WebGLFunctionNode extends FunctionNodeBase {
 	 * @returns {Array} the append retArr
 	 */
 	astBinaryExpression(ast, retArr) {
+		const inGetParams = this.isState('in-get-call-parameters');
+		if (inGetParams) {
+			this.pushState('not-in-get-call-parameters');
+			retArr.push('int');
+		}
 		retArr.push('(');
 
 		if (ast.operator === '%') {
@@ -289,6 +294,10 @@ module.exports = class WebGLFunctionNode extends FunctionNodeBase {
 
 		retArr.push(')');
 
+		if (inGetParams) {
+			this.popState('not-in-get-call-parameters');
+		}
+
 		return retArr;
 	}
 

package.json

@@ -71,5 +71,6 @@
   <script src="issues/335-missing-z-index-issue.js"></script>
   <script src="issues/346-uint8array-converted.js"></script>
   <script src="issues/349-division-by-factors-of-3.js"></script>
+  <script src="issues/357-modulus-issue.js"></script>
 </body>
 </html>

src/backend/web-gl/function-node.js

@@ -0,0 +1,29 @@
+(function() {
+	function testModKernel(mode) {
+		var gpu = new GPU({mode});
+		var nValues = 100;
+
+		var myFunc3 = gpu.createKernel(function(x) {
+			return x[this.thread.x % 3];
+		}).setOutput([nValues]);
+		
+		var input = [1, 2, 3];
+		myFunc3(input); 
+	
+		var expected = new Float32Array(nValues);
+		for (var i = 0; i < nValues; i++) {
+			expected[i] = input[i % 3];
+		}
+		QUnit.assert.deepEqual(myFunc3([1, 2, 3]), expected);
+		// QUnit.assert.ok()
+		gpu.destroy();
+	}
+
+	QUnit.test('Issue #357 - modulus issue (webgl)', function() {
+		testModKernel('webgl')
+	});
+
+	QUnit.test('Issue #357 - modulus issue (webgl2)', function() {
+		testModKernel('webgl2')
+	})
+})();