parse some extra shader.stage parameters

Author: Daniel Leib

src/shader-parser.ts

@@ -28,6 +28,10 @@ export interface Shader {
 
 export interface ShaderStage {
     map?: string;
+    rgbGen?: string;
+    tcGen?: string;
+    tcMod?: string;
+    blendfunc?: string;
 }
 
 function parseShader(tokenizer: Tokenizer, name: string): Shader {
@@ -139,13 +143,21 @@ function parseShaderStage(tokenizer: Tokenizer): ShaderStage {
                 }
                 break;
             case 'blendfunc':
+                stage.blendfunc = tokenizer.skipLine().trim();
+                break;
             case 'rgbgen':
+                stage.rgbGen = tokenizer.skipLine().trim();
+                break;
             case 'tcgen':
+                stage.tcGen = tokenizer.skipLine().trim();
+                break;
+            case 'tcmod':
+                stage.tcMod = tokenizer.skipLine().trim();
+                break;
             case 'alphagen':
             case 'animmap':
             case 'clampmap':
             case 'videomap':
-            case 'tcmod':
             case 'detail':
             case 'alphafunc':
             case 'depthfunc':

src/utils/tokenizer.ts

@@ -61,7 +61,8 @@ export class Tokenizer {
     /**
      * Skips all chars until a new line was found
      */
-    public skipLine() {
+    public skipLine(): string {
+        let str = '';
         while (this.text.length > this.index) {
             const char = this.text[this.index++];
             if (char === '\r') {
@@ -74,7 +75,9 @@ export class Tokenizer {
                 this.lineNo += 1;
                 break;
             }
+            str += char;
         }
+        return str;
     }
 
     public skipWhitespace(): boolean {