浏览代码

Merge pull request #1457 from BabylonJS/revert-1454-master

Revert "ShaderMaterial Base64 Encoded Vertex And Fragment Programs"
David Catuhe 8 年之前
父节点
当前提交
1de5eb62e2
共有 2 个文件被更改,包括 0 次插入26 次删除
  1. 0 12
      src/Materials/babylon.effect.js
  2. 0 14
      src/Materials/babylon.effect.ts

+ 0 - 12
src/Materials/babylon.effect.js

@@ -133,12 +133,6 @@ var BABYLON;
                 callback(vertexCode);
                 callback(vertexCode);
                 return;
                 return;
             }
             }
-            // Base64 encoded ?
-            if (vertex.startsWith("base64:")) {
-            	var vertexBinary = window.atob(vertex.substr(7));
-            	callback(vertexBinary);
-            	return;
-            }
             // Is in local store ?
             // Is in local store ?
             if (Effect.ShadersStore[vertex + "VertexShader"]) {
             if (Effect.ShadersStore[vertex + "VertexShader"]) {
                 callback(Effect.ShadersStore[vertex + "VertexShader"]);
                 callback(Effect.ShadersStore[vertex + "VertexShader"]);
@@ -161,12 +155,6 @@ var BABYLON;
                 callback(fragmentCode);
                 callback(fragmentCode);
                 return;
                 return;
             }
             }
-            // Base64 encoded ?
-            if (fragment.startsWith("base64:")) {
-            	var fragmentBinary = window.atob(fragment.substr(7));
-            	callback(fragmentBinary);
-            	return;
-            }
             // Is in local store ?
             // Is in local store ?
             if (Effect.ShadersStore[fragment + "PixelShader"]) {
             if (Effect.ShadersStore[fragment + "PixelShader"]) {
                 callback(Effect.ShadersStore[fragment + "PixelShader"]);
                 callback(Effect.ShadersStore[fragment + "PixelShader"]);

+ 0 - 14
src/Materials/babylon.effect.ts

@@ -177,13 +177,6 @@
                 return;
                 return;
             }
             }
 
 
-            // Base64 encoded ?
-            if (vertex.startsWith("base64:")) {
-            	var vertexBinary = window.atob(vertex.substr(7));
-            	callback(vertexBinary);
-            	return;
-            }
-
             // Is in local store ?
             // Is in local store ?
             if (Effect.ShadersStore[vertex + "VertexShader"]) {
             if (Effect.ShadersStore[vertex + "VertexShader"]) {
                 callback(Effect.ShadersStore[vertex + "VertexShader"]);
                 callback(Effect.ShadersStore[vertex + "VertexShader"]);
@@ -210,13 +203,6 @@
                 return;
                 return;
             }
             }
 
 
-            // Base64 encoded ?
-            if (fragment.startsWith("base64:")) {
-            	var fragmentBinary = window.atob(fragment.substr(7));
-            	callback(fragmentBinary);
-            	return;
-            }
-
             // Is in local store ?
             // Is in local store ?
             if (Effect.ShadersStore[fragment + "PixelShader"]) {
             if (Effect.ShadersStore[fragment + "PixelShader"]) {
                 callback(Effect.ShadersStore[fragment + "PixelShader"]);
                 callback(Effect.ShadersStore[fragment + "PixelShader"]);