Explorar o código

revert to remove bloom mix fallback

Trevor Baron %!s(int64=7) %!d(string=hai) anos
pai
achega
71c9a74422

+ 4 - 10
src/PostProcess/RenderPipeline/Pipelines/babylon.defaultRenderingPipeline.ts

@@ -84,7 +84,7 @@
         public get sharpenEnabled(): boolean {
         public get sharpenEnabled(): boolean {
             return this._sharpenEnabled;
             return this._sharpenEnabled;
         }
         }
-        
+
         private _resizeObserver:Nullable<Observer<Engine>> = null;
         private _resizeObserver:Nullable<Observer<Engine>> = null;
         private _hardwareScaleLevel = 1.0;
         private _hardwareScaleLevel = 1.0;
         private _bloomKernel: number = 64;
         private _bloomKernel: number = 64;
@@ -140,14 +140,8 @@
             if (this._bloomThreshold === value) {
             if (this._bloomThreshold === value) {
                 return;
                 return;
             }
             }
-            if((this.bloom.threshold > 0 && value == 0) || (this.bloom.threshold == 0 && value > 0)){
-                this.bloom.threshold = value;
-                this._bloomThreshold = value;
-                this._buildPipeline();
-            }else{
-                this.bloom.threshold = value;
-                this._bloomThreshold = value;
-            }
+            this.bloom.threshold = value;
+            this._bloomThreshold = value;
         }
         }
 
 
         @serialize()
         @serialize()
@@ -474,7 +468,7 @@
                 if(!this.bloom._isReady()){
                 if(!this.bloom._isReady()){
                     this.bloom._updateEffects();
                     this.bloom._updateEffects();
                 }
                 }
-                mergeOptions.bloom = {blurred: this.bloom._effects[this.bloom._effects.length-1], weight: this.bloomWeight, mix: this._bloomThreshold == 0}
+                mergeOptions.bloom = {blurred: this.bloom._effects[this.bloom._effects.length-1], weight: this.bloomWeight}
                 if(!mergeOptions.originalFromInput){
                 if(!mergeOptions.originalFromInput){
                     mergeOptions.originalFromInput=this.bloom._effects[0];
                     mergeOptions.originalFromInput=this.bloom._effects[0];
                 }
                 }

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

@@ -20,7 +20,6 @@ module BABYLON {
         public bloom?: {
         public bloom?: {
             blurred: PostProcess;
             blurred: PostProcess;
             weight: number;
             weight: number;
-            mix?: boolean
         };
         };
     }
     }
 
 
@@ -88,9 +87,6 @@ module BABYLON {
                 }
                 }
                 if(this._mergeOptions.bloom){
                 if(this._mergeOptions.bloom){
                     defines += "#define BLOOM 1\n";
                     defines += "#define BLOOM 1\n";
-                    if(this._mergeOptions.bloom.mix){
-                        defines += "#define MIX 1\n";
-                    }
                 }
                 }
             }
             }
             super.updateEffect(defines, uniforms, samplers, indexParameters, onCompiled, onError);
             super.updateEffect(defines, uniforms, samplers, indexParameters, onCompiled, onError);

+ 1 - 5
src/Shaders/defaultPipelineMerge.fragment.fx

@@ -52,10 +52,6 @@ void main(void)
 #endif
 #endif
 #ifdef BLOOM
 #ifdef BLOOM
     vec3 blurred = texture2D(bloomBlur, vUV).rgb;
     vec3 blurred = texture2D(bloomBlur, vUV).rgb;
-    #ifdef MIX
-        gl_FragColor.rgb = mix(gl_FragColor.rgb, blurred.rgb, bloomWeight);
-    #else
-        gl_FragColor.rgb = gl_FragColor.rgb + (blurred.rgb * bloomWeight);
-    #endif    
+    gl_FragColor.rgb = gl_FragColor.rgb + (blurred.rgb * bloomWeight); 
 #endif
 #endif
 }
 }