rename depthOfFieldMerge to defaultPipelineMerge

Tools/Gulp/config.json

@@ -61,7 +61,7 @@
             "additionalPostProcess_depthOfFieldBlur",
             "additionalPostProcess_fxaa",
             "additionalPostProcess_circleOfConfusion",
-            "additionalPostProcess_depthOfFieldMerge",
+            "additionalPostProcess_defaultPipelineMerge",
             "additionalPostProcess_depthOfFieldEffect",
             "additionalPostProcess_bloomEffect",
             "additionalPostProcess_imageProcessing",
@@ -792,15 +792,15 @@
                 "chromaticAberration.fragment"
             ]
         },
-        "additionalPostProcess_depthOfFieldMerge": {
+        "additionalPostProcess_defaultPipelineMerge": {
             "files": [
-                "../../src/PostProcess/babylon.depthOfFieldMergePostProcess.js"
+                "../../src/PostProcess/babylon.defaultPipelineMergePostProcess.js"
             ],
             "dependUpon": [
                 "postProcesses"
             ],
             "shaders": [
-                "depthOfFieldMerge.fragment"
+                "defaultPipelineMerge.fragment"
             ]
         },
         "additionalPostProcess_depthOfFieldEffect": {
@@ -809,7 +809,7 @@
             ],
             "dependUpon": [
                 "additionalPostProcess_depthOfFieldBlur",
-                "additionalPostProcess_depthOfFieldMerge",
+                "additionalPostProcess_defaultPipelineMerge",
                 "additionalPostProcess_circleOfConfusion"
             ]
         },
@@ -819,7 +819,7 @@
             ],
             "dependUpon": [
                 "additionalPostProcess_blur",
-                "additionalPostProcess_depthOfFieldMerge"
+                "additionalPostProcess_defaultPipelineMerge"
             ]
         },
         "additionalPostProcess_fxaa": {

src/PostProcess/RenderPipeline/Pipelines/babylon.defaultRenderingPipeline.ts

@@ -392,7 +392,7 @@
                     this.depthOfField._updateEffects();
                 }
                 this.addEffect(this.depthOfField);
-                this._setAutoClearAndTextureSharing(this.depthOfField._depthOfFieldMerge);
+                this._setAutoClearAndTextureSharing(this.depthOfField._defaultPipelineMerge);
             }
 
             if (this.bloomEnabled) {

src/PostProcess/babylon.bloomEffect.ts

@@ -10,7 +10,7 @@ module BABYLON {
         /**
          * Internal
          */
-        public _merge:DepthOfFieldMergePostProcess;
+        public _merge:DefaultPipelineMergeMergePostProcess;
 
         /**
          * Creates a new instance of @see BloomEffect
@@ -40,7 +40,7 @@ module BABYLON {
                 this.blurY.kernel = bloomKernel * dh;
             });
             
-            this._merge = new DepthOfFieldMergePostProcess("depthOfFieldMerge", {originalFromInput: this.blurX, bloom: {blurred: this.blurY, weight: 0}}, 1, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false, pipelineTextureType, blockCompilation);
+            this._merge = new DefaultPipelineMergeMergePostProcess("defaultPipelineMerge", {originalFromInput: this.blurX, bloom: {blurred: this.blurY, weight: 0}}, 1, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false, pipelineTextureType, blockCompilation);
             this._merge.autoClear = false;
 
             this._effects = [this.blurX, this.blurY, this._merge]

src/PostProcess/babylon.depthOfFieldMergePostProcess.ts

@@ -2,7 +2,7 @@ module BABYLON {
     /**
      * Options to be set when merging outputs from the default pipeline.
      */
-	export class DepthOfFieldMergePostProcessOptions {
+	export class DefaultPipelineMergePostProcessOptions {
         /**
          * The original image to merge on top of
          */
@@ -24,16 +24,16 @@ module BABYLON {
     }
 
     /**
-     * The DepthOfFieldMergePostProcess merges blurred images with the original based on the values of the circle of confusion.
+     * The DefaultPipelineMergeMergePostProcess merges blurred images with the original based on the values of the circle of confusion.
      */
-    export class DepthOfFieldMergePostProcess extends PostProcess {
+    export class DefaultPipelineMergeMergePostProcess extends PostProcess {
         /**
          * Internal, optins for the merge post process
          */
-        public _mergeOptions:DepthOfFieldMergePostProcessOptions;
+        public _mergeOptions:DefaultPipelineMergePostProcessOptions;
 
         /**
-         * Creates a new instance of @see CircleOfConfusionPostProcess
+         * Creates a new instance of @see DefaultPipelineMergeMergePostProcess
          * @param name The name of the effect.
          * @param mergeOptions Options to be set when merging outputs from the default pipeline.
          * @param options The required width/height ratio to downsize to before computing the render pass.
@@ -44,8 +44,8 @@ module BABYLON {
          * @param textureType Type of textures used when performing the post process. (default: 0)
          * @param blockCompilation If compilation of the shader should not be done in the constructor. The updateEffect method can be used to compile the shader at a later time. (default: false)
          */
-        constructor(name: string, mergeOptions: DepthOfFieldMergePostProcessOptions, options: number | PostProcessOptions, camera: Nullable<Camera>, samplingMode?: number, engine?: Engine, reusable?: boolean, textureType: number = Engine.TEXTURETYPE_UNSIGNED_INT, blockCompilation = false) {
-            super(name, "depthOfFieldMerge", ["bloomWeight"], ["circleOfConfusionSampler", "blurStep0", "blurStep1", "blurStep2", "bloomBlur"], options, camera, samplingMode, engine, reusable, null, textureType, undefined, null, true);
+        constructor(name: string, mergeOptions: DefaultPipelineMergePostProcessOptions, options: number | PostProcessOptions, camera: Nullable<Camera>, samplingMode?: number, engine?: Engine, reusable?: boolean, textureType: number = Engine.TEXTURETYPE_UNSIGNED_INT, blockCompilation = false) {
+            super(name, "defaultPipelineMerge", ["bloomWeight"], ["circleOfConfusionSampler", "blurStep0", "blurStep1", "blurStep2", "bloomBlur"], options, camera, samplingMode, engine, reusable, null, textureType, undefined, null, true);
             this._mergeOptions = mergeOptions;
             this.onApplyObservable.add((effect: Effect) => {
                 if(mergeOptions.originalFromInput){

src/PostProcess/babylon.depthOfFieldEffect.ts

@@ -26,7 +26,7 @@ module BABYLON {
         /**
          * Private, last post process of dof
          */
-        public _depthOfFieldMerge: DepthOfFieldMergePostProcess;
+        public _defaultPipelineMerge: DefaultPipelineMergeMergePostProcess;
 
         private _effects: Array<PostProcess> = [];
 
@@ -116,8 +116,8 @@ module BABYLON {
             }
 
             // Merge blurred images with original image based on circleOfConfusion
-            this._depthOfFieldMerge = new DepthOfFieldMergePostProcess("depthOfFieldMerge", {originalFromInput: this._circleOfConfusion, depthOfField: {circleOfConfusion: this._circleOfConfusion, blurSteps: this._depthOfFieldBlurX}}, 1, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false, pipelineTextureType, blockCompilation);
-            this._depthOfFieldMerge.autoClear = false;
+            this._defaultPipelineMerge = new DefaultPipelineMergeMergePostProcess("defaultPipelineMerge", {originalFromInput: this._circleOfConfusion, depthOfField: {circleOfConfusion: this._circleOfConfusion, blurSteps: this._depthOfFieldBlurX}}, 1, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false, pipelineTextureType, blockCompilation);
+            this._defaultPipelineMerge.autoClear = false;
             
             // Set all post processes on the effect.
             this._effects= [this._circleOfConfusion];
@@ -125,7 +125,7 @@ module BABYLON {
                 this._effects.push(this._depthOfFieldBlurY[i]);
                 this._effects.push(this._depthOfFieldBlurX[i]);
             }
-            this._effects.push(this._depthOfFieldMerge);
+            this._effects.push(this._defaultPipelineMerge);
         }
 
         /**
@@ -147,7 +147,7 @@ module BABYLON {
             this._depthOfFieldBlurY.forEach(element => {
                 element.dispose(camera);
             });
-            this._depthOfFieldMerge.dispose(camera);
+            this._defaultPipelineMerge.dispose(camera);
         }
 
         /**