sub and simple input ops added

raytranuk · raytranuk · commit 000212c40e21 · 2020-12-24T19:31:22.000Z
diff --git a/shader-nodes/shader-nodes/add.js b/shader-nodes/shader-nodes/add.js
@@ -18,5 +18,4 @@ add.gen = function ( argTypes, options ) {
     return flexOp.gen(argTypes, opt );
 };
 
-// export { add };
-export default add;
+export { add };
diff --git a/shader-nodes/shader-nodes/cross.js b/shader-nodes/shader-nodes/cross.js
@@ -34,5 +34,4 @@ cross.gen = function ( argTypes, options ) {
     return code;
 };
 
-// export { cross };
-export default cross;
+export { cross };
diff --git a/shader-nodes/shader-nodes/flexOp.js b/shader-nodes/shader-nodes/flexOp.js
@@ -95,4 +95,3 @@ flexOp.gen = function ( argTypes, options ) {
 };
 
 export { flexOp };
-export default flexOp;
diff --git a/shader-nodes/shader-nodes/join.js b/shader-nodes/shader-nodes/join.js
@@ -38,5 +38,4 @@ join.gen = function ( argTypes, options ) {
     return code;
 };
 
-// export { join };
-export default join;
+export { join };
diff --git a/shader-nodes/shader-nodes/mul.js b/shader-nodes/shader-nodes/mul.js
@@ -1,4 +1,4 @@
-import flexOp from './flexOp.js';
+import { flexOp } from './flexOp.js';
 
 // node
 var mul = {
@@ -18,5 +18,4 @@ mul.gen = function ( argTypes, options ) {
     return flexOp.gen(argTypes, opt );
 };
 
-// export { mul };
-export default mul;
+export { mul };
diff --git a/shader-nodes/shader-nodes/select.js b/shader-nodes/shader-nodes/select.js
@@ -68,5 +68,4 @@ select.gen = function ( argTypes, options ) {
     return code;
 };
 
-// export { cross };
-export default select;
+export { select };
diff --git a/shader-nodes/shader-nodes/shader-nodes.js b/shader-nodes/shader-nodes/shader-nodes.js
@@ -1,20 +1,33 @@
-import add from './add.js';
-import cross from './cross.js';
-import mul from './mul.js';
-import join from './join.js';
-import uv0 from './uv0.js';
-import texSample from './texSample.js';
-import select from './select.js';
+import { add } from './add.js';
+import { mul } from './mul.js';
+import { sub } from './sub.js';
+import { cross } from './cross.js';
+import { join } from './join.js';
+import { uv0 } from './uv0.js';
+import { worldPos } from './worldPos.js';
+import { worldNorm } from './worldNorm.js';
+import { texSample } from './texSample.js';
+import { select } from './select.js';
+import { stdAlpha, stdNormalMap, stdGlossiness, stdSpecularity, stdAlbedo, stdEmission } from './stdInputs.js';
 
 // Object containing all default shader nodes used by shader graphs
 var shaderNodes = {
     add: add,
-    cross: cross,
     mul: mul,
+    sub: sub,
+    cross: cross,
     join: join,
     uv0: uv0,
+    worldPos: worldPos,
+    worldNorm: worldNorm,
     texSample: texSample,
-    select: select
+    select: select,
+    stdAlpha: stdAlpha,
+    stdNormalMap: stdNormalMap,
+    stdGlossiness: stdGlossiness,
+    stdSpecularity: stdSpecularity,
+    stdAlbedo: stdAlbedo,
+    stdEmission: stdEmission
 };
 
 export { shaderNodes };
diff --git a/shader-nodes/shader-nodes/simpleOp.js b/shader-nodes/shader-nodes/simpleOp.js
@@ -0,0 +1,22 @@
+var simpleOp = {};
+
+simpleOp.genOp = function ( retType, opName, retName, metaLabel ) {
+    var op = {};
+
+    op.code = retType + " " + opName + "(){\n    return " + retName + ";\n}\n";
+    op.meta = { label: metaLabel };
+    op.gen = function ( argTypes, options ) {
+        var code = this.code;
+        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');
+        }
+        return code;
+    };
+
+    return op;
+};
+
+export { simpleOp };
diff --git a/shader-nodes/shader-nodes/stdInputs.js b/shader-nodes/shader-nodes/stdInputs.js
@@ -0,0 +1,10 @@
+import { simpleOp } from "./simpleOp";
+
+var stdAlpha = simpleOp.genOp('float', 'stdAlpha', 'dAlpha', 'STD MAT ALPHA');
+var stdNormalMap = simpleOp.genOp('vec3', 'stdNormalMap', 'dNormalMap', 'STD MAT NORMALMAP');
+var stdGlossiness = simpleOp.genOp('float', 'stdGlossiness', 'dGlossiness', 'STD MAT GLOSSINESS');
+var stdSpecularity = simpleOp.genOp('vec3', 'stdSpecularity', 'dSpecularity', 'STD MAT SPECULARITY');
+var stdAlbedo = simpleOp.genOp('vec3', 'stdAlbedo', 'dAlbedo', 'STD MAT ALBEDO');
+var stdEmission = simpleOp.genOp('vec3', 'stdEmission', 'dEmission', 'STD MAT EMISSION');
+
+export { stdAlpha, stdNormalMap, stdGlossiness, stdSpecularity, stdAlbedo, stdEmission };
diff --git a/shader-nodes/shader-nodes/sub.js b/shader-nodes/shader-nodes/sub.js
@@ -0,0 +1,21 @@
+import { flexOp } from './flexOp.js';
+
+// node
+var sub = {
+    // placeholder meta data - structure will be finalized in MVP S3
+    meta: flexOp.meta.ports,
+    // placeholder editor data - structure will be finalized in MVP S3
+    editor: {
+        label: "SUB",
+        ports: flexOp.editor.ports
+    }
+};
+
+// generator
+sub.gen = function ( argTypes, options ) {
+    var opt = { opName: 'sub', opCode: '-' };
+    Object.assign(opt, options);
+    return flexOp.gen(argTypes, opt );
+};
+
+export { sub };
diff --git a/shader-nodes/shader-nodes/texSample.js b/shader-nodes/shader-nodes/texSample.js
@@ -48,5 +48,4 @@ texSample.gen = function ( argTypes, options ) {
     return code;
 };
 
-// export { texSample };
-export default texSample;
+export { texSample };
diff --git a/shader-nodes/shader-nodes/uv0.js b/shader-nodes/shader-nodes/uv0.js
@@ -19,5 +19,4 @@ uv0.gen = function ( argTypes, options ) {
 
     return code;};
 
-// export { uv0 };
-export default uv0;
+export { uv0 };
diff --git a/shader-nodes/shader-nodes/worldNorm.js b/shader-nodes/shader-nodes/worldNorm.js
@@ -0,0 +1,5 @@
+import { simpleOp } from "./simpleOp";
+
+var worldNorm = simpleOp.genOp('vec3', 'worldNorm', 'vNormalW', 'WORLD NORMAL');
+
+export { worldNorm };
diff --git a/shader-nodes/shader-nodes/worldPos.js b/shader-nodes/shader-nodes/worldPos.js
@@ -0,0 +1,16 @@
+var worldPos = {
+    code: "vec3 worldPos(){\n    return vPositionW;\n}\n",
+    meta: { label: "WORLD POSITION" },
+    gen: function ( argTypes, options ) {
+        var code = this.code;
+        if (options && options.precision) {
+            // precision - alter name to create variant
+            code = code.replace(' worldPos', ' worldPos_' + options.precision);
+            // precision - tmp: useful comment
+            code = code.replace( '{\n', '{\n// precision ' + options.precision + ' float;\n');
+        }
+        return code;
+    }
+};
+
+export { worldPos };

Original file line number	Diff line number	Diff line change
`@@ -95,4 +95,3 @@ flexOp.gen = function ( argTypes, options ) {`
`95`	`95`	`};`
`96`	`96`
`97`	`97`	`export { flexOp };`
`98`		`-export default flexOp;`