瀏覽代碼

Merge pull request #2834 from makc/patch-1

allow whitespace before ( in shaders
David Catuhe 8 年之前
父節點
當前提交
eda430976e
共有 1 個文件被更改,包括 5 次插入5 次删除
  1. 5 5
      src/Materials/babylon.effect.ts

+ 5 - 5
src/Materials/babylon.effect.ts

@@ -398,14 +398,14 @@
             result = result.replace(/[ \t]attribute/g, " in");
             result = result.replace(/[ \t]attribute/g, " in");
             
             
             if (isFragment) {
             if (isFragment) {
-                result = result.replace(/texture2DLodEXT\(/g, "textureLod(");
-                result = result.replace(/textureCubeLodEXT\(/g, "textureLod(");
-                result = result.replace(/texture2D\(/g, "texture(");
-                result = result.replace(/textureCube\(/g, "texture(");
+                result = result.replace(/texture2DLodEXT\s*\(/g, "textureLod(");
+                result = result.replace(/textureCubeLodEXT\s*\(/g, "textureLod(");
+                result = result.replace(/texture2D\s*\(/g, "texture(");
+                result = result.replace(/textureCube\s*\(/g, "texture(");
                 result = result.replace(/gl_FragDepthEXT/g, "gl_FragDepth");
                 result = result.replace(/gl_FragDepthEXT/g, "gl_FragDepth");
                 result = result.replace(/gl_FragColor/g, "glFragColor");
                 result = result.replace(/gl_FragColor/g, "glFragColor");
                 result = result.replace(/gl_FragData/g, "glFragData");
                 result = result.replace(/gl_FragData/g, "glFragData");
-                result = result.replace(/void\s+?main\(/g, (hasDrawBuffersExtension ? "" : "out vec4 glFragColor;\n") + "void main(");
+                result = result.replace(/void\s+?main\s*\(/g, (hasDrawBuffersExtension ? "" : "out vec4 glFragColor;\n") + "void main(");
             }
             }
             
             
             callback(result);
             callback(result);