remove WIP shadergraph script interface

raytranuk · raytranuk · commit 7726ddcf8ea2 · 2020-08-14T16:25:38.000+01:00
diff --git a/examples/graphics/shader-node.html b/examples/graphics/shader-node.html
diff --git a/src/index.js b/src/index.js
@@ -87,7 +87,7 @@ export { Model } from './scene/model.js';
 export { Morph } from './scene/morph.js';
 export { MorphInstance } from './scene/morph-instance.js';
 export { MorphTarget } from './scene/morph-target.js';
-export { NodeMaterial, shadergraph } from './scene/materials/node-material.js';
+export { NodeMaterial } from './scene/materials/node-material.js';
 export { ParticleEmitter } from './scene/particle-system/particle-emitter.js';
 export { Picker } from './scene/pick.js';
 export { Scene } from './scene/scene.js';
diff --git a/src/resources/parser/material/json-node-material.js b/src/resources/parser/material/json-node-material.js
@@ -1,4 +1,4 @@
-import { NodeMaterial, shadergraph } from '../../../scene/materials/node-material.js';
+import { NodeMaterial } from '../../../scene/materials/node-material.js';
 
 /**
  * @class
@@ -165,23 +165,7 @@ JsonNodeMaterialParser.prototype._validate = function (data) {
 };
 
 JsonNodeMaterialParser.prototype._genPlaceholderNodeMat = function () {
-    // start building shader graph
-    shadergraph.start();
-
-    // create a blank PS shader graph node
-    var blankPSNode = shadergraph.customNode('blankPS', 'vec4 blankPS() { return vec4(0,0,1,1); }');
-
-    // hook up PS outputs
-    shadergraph.connectFragOut(blankPSNode);
-
-    // create a blank vertex offset shader graph node
-    var blankVSNode = shadergraph.customNode('blankVS', 'vec3 blankVS() { return vec3(0,0,0); }');
-
-    // hook up VS output
-    shadergraph.connectVertexOffset(blankVSNode);
-
-    // end graph and assign built graph to material
-    var material = shadergraph.end();
+    var material = new NodeMaterial('void placeHolder(out vec3 vertOff, out vec4 fragOut){ vertOff=vec3(0); fragOut=vec4(0,0,1,1);}');
 
     // initialize shader and update uniforms
     material.initShader(this._device);
diff --git a/src/scene/materials/node-material.js b/src/scene/materials/node-material.js
@@ -722,111 +722,4 @@ Object.assign(NodeMaterial.prototype, {
 
 });
 
-var shadergraph = {};
-
-shadergraph.graphCounter = 0;
-
-shadergraph.nodeRegistry = {};
-
-shadergraph._getNode = function (name, funcString, declString) {
-    if (!this.nodeRegistry[name]) {
-        this.nodeRegistry[name] = new NodeMaterial(funcString, declString);
-    }
-
-    return this.nodeRegistry[name];
-};
-
-shadergraph.start = function () {
-    // check current graph is null?
-    shadergraph.graph = this._getNode('graphRoot_' + shadergraph.graphCounter);
-    shadergraph.graph.name = 'graphRoot_' + shadergraph.graphCounter;
-};
-
-shadergraph.end = function () {
-    var ret = shadergraph.graph;
-    shadergraph.graph = null;
-    shadergraph.graphCounter++;
-    return ret;
-};
-
-shadergraph.textureSample2D = function (name, texture, uv) {
-
-    var texSampNode = this.graph.addSubGraph(this._getNode('texSample', 'vec4 texSample(in sampler2D tex, in vec2 uv, out vec3 color, out float alpha) {\n vec4 samp=texture2D(tex, uv);\n color=samp.rgb;\n alpha=samp.a;\n return samp;\n}'));
-
-    // assumes name is unique TODO: verify?
-    var graphVar = this.graph.addInput('sampler2D', name, texture);
-    this.graph.connect(-1, graphVar.name, texSampNode, 'IN_tex');
-    this.graph.connect(uv, 'OUT_ret', texSampNode, 'IN_uv');
-
-    return texSampNode;
-};
-
-shadergraph.customNode = function (name, f, d) {
-    var nodeIndex = this.graph.addSubGraph(this._getNode(name, f, d));
-    return nodeIndex;
-};
-
-Object.defineProperty(shadergraph, 'uv0', {
-    get: function () {
-        var nodeIndex = this.graph.addSubGraph(this._getNode('uv0', 'vec2 uv0() { return vUv0; }'));
-        return nodeIndex;
-    }
-});
-
-Object.defineProperty(shadergraph, 'worldPosPS', {
-    get: function () {
-        var nodeIndex = this.graph.addSubGraph(this._getNode('worldPosPS', 'vec3 wpPS() { return vPosition; }'));
-        return nodeIndex;
-    }
-});
-
-Object.defineProperty(shadergraph, 'worldNormPS', {
-    get: function () {
-        var nodeIndex = this.graph.addSubGraph(this._getNode('worldNormPS', 'vec3 wnPS() { return vNormal; }'));
-        return nodeIndex;
-    }
-});
-
-Object.defineProperty(shadergraph, 'worldPosVS', {
-    get: function () {
-        var nodeIndex = this.graph.addSubGraph(this._getNode('worldPosVS', 'vec3 wpVS() { return getWorldPositionNM(); }'));
-        return nodeIndex;
-    }
-});
-
-Object.defineProperty(shadergraph, 'worldNormVS', {
-    get: function () {
-        var nodeIndex = this.graph.addSubGraph(this._getNode('worldNormVS', 'vec3 wnVS() { return getWorldNormalNM(); }'));
-        return nodeIndex;
-    }
-});
-
-shadergraph.param = function (type, name, value) {
-    // assumes name is unique TODO: verify this
-    var graphVar = this.graph.addInput(type, name, value);
-    return graphVar;
-};
-
-shadergraph.connectFragOut = function (nodeIndex, name) {
-    // assumes this is only called once per graph TODO: verify this
-    var graphVar = this.graph.addOutput('vec4', 'fragOut', [0, 0, 0, 0]);
-    this.graph.connect(nodeIndex, (name) ? 'OUT_' + name : 'OUT_ret', -1, graphVar.name);
-};
-
-shadergraph.connectVertexOffset = function (nodeIndex, name) {
-    // assumes this is only called once per graph TODO: verify this
-    var graphVar = this.graph.addOutput('vec3', 'vertOff', [0, 0, 0]);
-    this.graph.connect(nodeIndex, (name) ? 'OUT_' + name : 'OUT_ret', -1, graphVar.name);
-};
-
-shadergraph.connectCustom = function (destNodeIndex, destName, nodeIndex_or_param, name) {
-    if (typeof(nodeIndex_or_param) === 'number') {
-        var nodeIndex = nodeIndex_or_param;
-        this.graph.connect(nodeIndex, (name) ? 'OUT_' + name : 'OUT_ret', destNodeIndex, 'IN_' + destName);
-    } else {
-        var graphVar = nodeIndex_or_param;
-        this.graph.connect(-1, graphVar.name, destNodeIndex, 'IN_' + destName);
-    }
-};
-
-export { NodeMaterial, shadergraph };
+export { NodeMaterial };
