Browse Source

Preliminary PR changes.

Justin Murray 6 years ago
parent
commit
849098d991

+ 1 - 1
src/Engines/Native/nativeShaderProcessor.ts

@@ -26,7 +26,7 @@ export class NativeShaderProcessor extends WebGL2ShaderProcessor {
     private _textureCount: number;
     private _uniforms: Array<string>;
 
-    public linePreProcessor(line: string): string {
+    public lineProcessor(line: string): string {
         for (const replacement of this._replacements) {
             line = line.replace(replacement.searchValue, replacement.replaceValue);
         }

+ 1 - 1
src/Engines/Processors/iShaderProcessor.ts

@@ -1,11 +1,11 @@
 /** @hidden */
 export interface IShaderProcessor {
-    linePreProcessor?: (line: string, isFragment: boolean) => string;
     attributeProcessor?: (attribute: string) => string;
     varyingProcessor?: (varying: string, isFragment: boolean) => string;
     uniformProcessor?: (uniform: string, isFragment: boolean) => string;
     uniformBufferProcessor?: (uniformBuffer: string, isFragment: boolean) => string;
     endOfUniformBufferProcessor?: (closingBracketLine: string, isFragment: boolean) => string;
+    lineProcessor?: (line: string, isFragment: boolean) => string;
     preProcessor?: (code: string, defines: string[], isFragment: boolean) => string;
     postProcessor?: (code: string, defines: string[], isFragment: boolean) => string;
 }

+ 4 - 4
src/Engines/Processors/shaderCodeNode.ts

@@ -18,10 +18,6 @@ export class ShaderCodeNode {
             let value: string = this.line;
             let processor = options.processor;
             if (processor) {
-                if (processor.linePreProcessor) {
-                    value = processor.linePreProcessor(value, options.isFragment);
-                }
-
                 if (processor.attributeProcessor && StringTools.StartsWith(this.line, "attribute")) {
                     value = processor.attributeProcessor(this.line);
                 } else if (processor.varyingProcessor && StringTools.StartsWith(this.line, "varying")) {
@@ -47,6 +43,10 @@ export class ShaderCodeNode {
                         value = processor.endOfUniformBufferProcessor(this.line, options.isFragment);
                     }
                 }
+
+                if (processor.lineProcessor) {
+                    value = processor.lineProcessor(value, options.isFragment);
+                }
             }
 
             result += value + "\r\n";

+ 1 - 1
src/Materials/Node/Blocks/index.ts

@@ -19,4 +19,4 @@ export * from "./vectorSplitterBlock";
 export * from "./lerpBlock";
 export * from "./divideBlock";
 export * from "./subtractBlock";
-export * from "./stepBlock";
+export * from "./stepBlock";