浏览代码

Remove Blit Material

Sebastien Vandenberghe 8 年之前
父节点
当前提交
835fd6e216

文件差异内容过多而无法显示
+ 4784 - 4784
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 4784 - 4784
dist/preview release/babylon.module.d.ts


文件差异内容过多而无法显示
+ 3527 - 3527
dist/preview release/customConfigurations/minimalViewer/babylon.d.ts


文件差异内容过多而无法显示
+ 4 - 4
dist/preview release/customConfigurations/minimalViewer/babylon.js


+ 4 - 1
dist/preview release/customConfigurations/minimalViewer/babylon.max.js

@@ -32850,6 +32850,9 @@ var BABYLON;
         };
         PostProcess.prototype.updateEffect = function (defines, uniforms, samplers, indexParameters, onCompiled, onError) {
             this._effect = this._engine.createEffect({ vertex: this._vertexUrl, fragment: this._fragmentUrl }, ["position"], uniforms || this._parameters, samplers || this._samplers, defines !== undefined ? defines : "", null, onCompiled, onError, indexParameters || this._indexParameters);
+            if (onCompiled && this._effect.isReady()) {
+                onCompiled(this._effect);
+            }
         };
         PostProcess.prototype.isReusable = function () {
             return this._reusable;
@@ -44278,7 +44281,6 @@ var BABYLON;
         TextureTools.CreateResizedCopy = function (texture, width, height) {
             var rtt = new BABYLON.RenderTargetTexture('resized' + texture.name, { width: width, height: height }, scene, !texture.noMipmap, true, texture._texture.type, false, texture._samplingMode, false);
             var scene = texture.getScene();
-            rtt.anisotropicFilteringLevel = texture.anisotropicFilteringLevel;
             rtt.wrapU = texture.wrapU;
             rtt.wrapV = texture.wrapV;
             rtt.uOffset = texture.uOffset;
@@ -44299,6 +44301,7 @@ var BABYLON;
                 scene.postProcessManager.directRender([passPostProcess], rtt.getInternalTexture());
                 scene.getEngine().restoreDefaultFramebuffer();
                 rtt.disposeFramebufferObjects();
+                passPostProcess.dispose();
             });
             return rtt;
         };

文件差异内容过多而无法显示
+ 3527 - 3527
dist/preview release/customConfigurations/minimalViewer/babylon.module.d.ts


+ 4 - 0
src/PostProcess/babylon.postProcess.ts

@@ -192,6 +192,10 @@
                 onError,
                 indexParameters || this._indexParameters
                 );
+            
+            if (onCompiled && this._effect.isReady()) {
+                onCompiled(this._effect);
+            }
         }
 
         public isReusable(): boolean {

+ 2 - 2
src/Tools/babylon.textureTools.ts

@@ -22,13 +22,12 @@
 
             var scene = texture.getScene();
 
-			rtt.anisotropicFilteringLevel = texture.anisotropicFilteringLevel;
 			rtt.wrapU = texture.wrapU;
 			rtt.wrapV = texture.wrapV;
             rtt.uOffset = texture.uOffset;
             rtt.vOffset = texture.vOffset;
             rtt.uScale = texture.uScale;
-            rtt.vScale = texture.vScale;            
+            rtt.vScale = texture.vScale;
             rtt.uAng = texture.uAng;
             rtt.vAng = texture.vAng;
             rtt.wAng = texture.wAng;
@@ -46,6 +45,7 @@
 
                 scene.getEngine().restoreDefaultFramebuffer();
                 rtt.disposeFramebufferObjects();
+				passPostProcess.dispose();
             });
 
 			return rtt;