use es6 string templates in core node generation

raytranuk · raytranuk · commit ccccbf6516f3 · 2021-01-04T21:06:41.000Z
diff --git a/shader-nodes/shader-nodes/flexOp.js b/shader-nodes/shader-nodes/flexOp.js
@@ -10,17 +10,14 @@ var flexOp = {
         }
         return comp2Type[maxComp];
     },
-    getHeadCode: function (retType, opName, argTypes, outputRetComponents ) {
-        var code = retType + ' ' + opName + '( ';
+    getHeadCode: function (retType, opName, argTypes, precision) {
+        precision = precision ? `_${precision}` : '';
+        var code = `${retType} ${opName}${precision}( `; // alter name to create variant
         for (var argIndex = 0; argIndex < argTypes.length; argIndex++) {
-            code += 'in ' + argTypes[argIndex] + ' arg' + argIndex;
+            code += `in ${argTypes[argIndex]} arg${argIndex}`;
 
             code += (argIndex === argTypes.length - 1) ? ' )\n' : ', ';
         }
-        if (outputRetComponents && type2Comp[retType] === 4) {
-            code.replace(' )\n', ', out vec3 rgb, out float r, out float g, out float b, out float a )\n');
-        }
-
         return code;
     },
     genOp: function (opName, opCode, label ) {
@@ -40,31 +37,23 @@ var flexOp = {
         var retType = this.getRetType(argTypes);
 
         // construct head code
-        var code = this.getHeadCode(retType, opName, argTypes);
-
-        // precision - alter name to create variant
-        if (options && options.precision) {
-            code = code.replace(' ' + opName, ' ' + opName + '_' + options.precision);
-        }
+        var code = this.getHeadCode(retType, opName, argTypes, options ? options.precision : '');
 
         // construct body code
         code += '{\n';
 
-        // precision - tmp: useful comment
-        code += ((options && options.precision) ? '// precision ' + options.precision + ' float;\n' : '');
-
         code += '    return ';
 
         for (var argIndex = 0; argIndex < argTypes.length; argIndex++) {
             // convert all arguments to return type
-            code += retType + '(arg' + argIndex;
+            code += `${retType}(arg${argIndex}`;
 
             // expand if needed - extra components are set to zero - NB scalar values are broadcast to all components
             var argComp = type2Comp[argTypes[argIndex]];
             var extend = type2Comp[retType] - argComp;
-            code += (extend > 0 && argComp !== 1) ? ', ' + comp2Type[expand] + '(0))' : ')';
+            code += (extend > 0 && argComp !== 1) ? `, ${comp2Type[expand]}(0))` : ')';
 
-            code += (argIndex === argTypes.length - 1) ? ';\n' : ' ' + opCode + ' ';
+            code += (argIndex === argTypes.length - 1) ? ';\n' : ` ${opCode} `;
         }
 
         code += '}\n';
diff --git a/shader-nodes/shader-nodes/select.js b/shader-nodes/shader-nodes/select.js
@@ -10,27 +10,19 @@ var select = {
         var retType = flexOp.getRetType(argTypes);
 
         // construct head code
-        var code = flexOp.getHeadCode(retType, 'select', argTypes);
-
-        // precision - alter name to create variant
-        if (options && options.precision) {
-            code = code.replace(' select', ' select_' + options.precision);
-        }
+        var code = flexOp.getHeadCode(retType, 'select', argTypes, options ? options.precision : '');
 
         // construct body code
         code += '{\n';
 
-        // precision - tmp: useful comment
-        code += ((options && options.precision) ? '// precision ' + options.precision + ' float;\n' : '');
-
         for (var argIndex = 1; argIndex < argTypes.length; argIndex++) {
-            code += 'if (arg0>=float(' + (argIndex - 1) + ') && arg0<float(' + (argIndex + 0) + ') )\n';
+            code += `if (arg0>=float(${argIndex - 1}) && arg0<float(${argIndex + 0}) )\n`;
             code += '{\n';
             code += '    return ';
-            code += retType + '(arg' + argIndex;
+            code += `${retType}(arg${argIndex}`;
             var argComp = type2Comp[argTypes[argIndex]];
             var extend = type2Comp[retType] - argComp;
-            code += (extend > 0 && argComp !== 1) ? ', ' + comp2Type[extend] + '(0))' : ')';
+            code += (extend > 0 && argComp !== 1) ? `, ${comp2Type[extend]}(0))` : ')';
             code += ';\n';
             code += '}\n';
         }
diff --git a/shader-nodes/shader-nodes/simpleOp.js b/shader-nodes/shader-nodes/simpleOp.js
@@ -6,13 +6,8 @@ var simpleOp = {
             editor: { label: label },
             // generator
             gen: function ( argTypes, options ) {
-                var code = retType + " " + opName + "(){\n    return " + retName + ";\n}\n";
-                if (options && options.precision) {
-                    // precision - alter name to create variant
-                    code = code.replace(' ' + opName, ' ' + opName + '_' + options.precision);
-                    // precision - tmp: useful comment
-                    code = code.replace( '{\n', '{\n// precision ' + options.precision + ' float;\n');
-                }
+                var precision = (options && options.precision) ? `_${options.precision}` : ''; // alter name to create variant
+                var code = `${retType} ${opName}${precision}(){\n    return ${retName};\n}\n`;
                 return code;
             }
         };
diff --git a/shader-nodes/shader-nodes/texSample.js b/shader-nodes/shader-nodes/texSample.js
@@ -6,19 +6,12 @@ var texSample = {
     // generator
     gen: function ( argTypes, options ) {
         // header
-        var code = "void texSample(in sampler2D tex, in vec2 uv, out vec4 rgba, out vec4 srgba, out vec3 rgbm)\n";
-
-        // precision - alter name to create variant
-        if (options && options.precision) {
-            code = code.replace(' texSample', ' texSample_' + options.precision);
-        }
+        var precision = (options && options.precision) ? `_${options.precision}` : ''; // alter name to create variant
+        var code = `void texSample${precision}(in sampler2D tex, in vec2 uv, out vec4 rgba, out vec4 srgba, out vec3 rgbm)\n`;
 
         // body
         code += '{\n';
 
-        // precision - tmp: useful comment
-        code += ((options && options.precision) ? '// precision ' + options.precision + ' float;\n' : '');
-
         code += 'rgba = texture2D(tex, uv);\n';
 
         code += 'srgba.rgb = gammaCorrectInput(rgba.rgb);\n';
