Rename to imageProcessingConfiguration

src/Materials/PBR/babylon.pbrBaseMaterial.ts

@@ -1,5 +1,5 @@
 module BABYLON {
-    class PBRMaterialDefines extends MaterialDefines implements IImageProcessingDefines {
+    class PBRMaterialDefines extends MaterialDefines implements IImageProcessingConfigurationDefines {
         public PBR = true;
         public ALBEDO = false;
         public AMBIENT = false;
@@ -364,19 +364,19 @@
         /**
          * Default configuration related to image processing available in the PBR Material.
          */
-        @serializeAsImageProcessing()
-        protected _imageProcessingConfiguration: ImageProcessing;
+        @serializeAsImageProcessingConfiguration()
+        protected _imageProcessingConfiguration: ImageProcessingConfiguration;
 
         /**
          * Keep track of the image processing observer to allow dispose and replace.
          */
-        private _imageProcessingObserver: Observer<ImageProcessing>;
+        private _imageProcessingObserver: Observer<ImageProcessingConfiguration>;
 
         /**
          * Attaches a new image processing configuration to the PBR Material.
          * @param configuration 
          */
-        protected _attachImageProcessingConfiguration(configuration: ImageProcessing): void {
+        protected _attachImageProcessingConfiguration(configuration: ImageProcessingConfiguration): void {
             if (configuration === this._imageProcessingConfiguration) {
                 return;
             }
@@ -853,8 +853,8 @@
                 var samplers = ["albedoSampler", "ambientSampler", "opacitySampler", "reflectionCubeSampler", "reflection2DSampler", "emissiveSampler", "reflectivitySampler", "microSurfaceSampler", "bumpSampler", "lightmapSampler", "refractionCubeSampler", "refraction2DSampler"];
                 var uniformBuffers = ["Material", "Scene"];
 
-                ImageProcessing.PrepareUniforms(uniforms, defines);
-                ImageProcessing.PrepareSamplers(samplers, defines);
+                ImageProcessingConfiguration.PrepareUniforms(uniforms, defines);
+                ImageProcessingConfiguration.PrepareSamplers(samplers, defines);
 
                 MaterialHelper.PrepareUniformsAndSamplersList(<EffectCreationOptions>{
                     uniformsNames: uniforms, 

src/Materials/PBR/babylon.pbrMaterial.ts

@@ -378,7 +378,7 @@
         /**
          * Gets the image processing configuration used either in this material.
          */
-        public get imageProcessingConfiguration(): ImageProcessing {
+        public get imageProcessingConfiguration(): ImageProcessingConfiguration {
             return this._imageProcessingConfiguration;
         }
 
@@ -387,7 +387,7 @@
          * 
          * If sets to null, the scene one is in use.
          */
-        public set imageProcessingConfiguration(value: ImageProcessing) {
+        public set imageProcessingConfiguration(value: ImageProcessingConfiguration) {
             this._attachImageProcessingConfiguration(value);
 
             // Ensure the effect will be rebuilt.

src/Materials/babylon.imageProcessing.ts

@@ -3,7 +3,7 @@ module BABYLON {
      * Interface to follow in your material defines to integrate easily the
      * Image proccessing functions.
      */
-    export interface IImageProcessingDefines {
+    export interface IImageProcessingConfigurationDefines {
         IMAGEPROCESSING: boolean;
         VIGNETTE: boolean;
         VIGNETTEBLENDMODEMULTIPLY: boolean;
@@ -22,7 +22,7 @@ module BABYLON {
      * or through post processing effect depending on the use of the image processing pipeline in your scene 
      * or not.
      */
-    export class ImageProcessing {
+    export class ImageProcessingConfiguration {
 
         /**
          * Color curves setup used in the effect if colorCurvesEnabled is set to true 
@@ -200,7 +200,7 @@ module BABYLON {
         public cameraFov = 0.5;
 
         @serialize()
-        private _vignetteBlendMode = ImageProcessing.VIGNETTEMODE_MULTIPLY;
+        private _vignetteBlendMode = ImageProcessingConfiguration.VIGNETTEMODE_MULTIPLY;
         /**
          * Gets the vignette blend mode allowing different kind of effect.
          */
@@ -263,7 +263,7 @@ module BABYLON {
         * An event triggered when the configuration changes and requires Shader to Update some parameters.
         * @type {BABYLON.Observable}
         */
-        public onUpdateParameters = new Observable<ImageProcessing>();
+        public onUpdateParameters = new Observable<ImageProcessingConfiguration>();
 
         /**
          * Method called each time the image processing information changes requires to recompile the effect.
@@ -277,7 +277,7 @@ module BABYLON {
          * @param uniformsList The list of uniforms used in the effect
          * @param defines the list of defines currently in use
          */
-        public static PrepareUniforms(uniforms: string[], defines: IImageProcessingDefines): void {
+        public static PrepareUniforms(uniforms: string[], defines: IImageProcessingConfigurationDefines): void {
             if (defines.CONTRAST) {
                 uniforms.push("contrast");
             }
@@ -302,7 +302,7 @@ module BABYLON {
          * @param uniformsList The list of uniforms used in the effect
          * @param defines the list of defines currently in use
          */
-        public static PrepareSamplers(samplersList: string[], defines: IImageProcessingDefines): void {
+        public static PrepareSamplers(samplersList: string[], defines: IImageProcessingConfigurationDefines): void {
             if (defines.COLORGRADING) {
                 samplersList.push("txColorTransform");
             }
@@ -312,9 +312,9 @@ module BABYLON {
          * Prepare the list of defines associated to the shader.
          * @param defines the list of defines to complete
          */
-        public prepareDefines(defines: IImageProcessingDefines): void {
+        public prepareDefines(defines: IImageProcessingConfigurationDefines): void {
             defines.VIGNETTE = this.vignetteEnabled;
-            defines.VIGNETTEBLENDMODEMULTIPLY = (this.vignetteBlendMode === ImageProcessing._VIGNETTEMODE_MULTIPLY);
+            defines.VIGNETTEBLENDMODEMULTIPLY = (this.vignetteBlendMode === ImageProcessingConfiguration._VIGNETTEMODE_MULTIPLY);
             defines.VIGNETTEBLENDMODEOPAQUE = !defines.VIGNETTEBLENDMODEMULTIPLY;
             defines.TONEMAPPING = this.toneMappingEnabled;
             defines.CONTRAST = (this.cameraContrast !== 1.0);
@@ -387,8 +387,8 @@ module BABYLON {
          * Clones the current image processing instance.
          * @return The cloned image processing
          */
-        public clone(): ImageProcessing {
-            return SerializationHelper.Clone(() => new ImageProcessing(), this);
+        public clone(): ImageProcessingConfiguration {
+            return SerializationHelper.Clone(() => new ImageProcessingConfiguration(), this);
         }
 
         /**
@@ -404,8 +404,8 @@ module BABYLON {
          * @param source the JSON source to parse
          * @return The parsed image processing
          */      
-        public static Parse(source: any) : ImageProcessing {
-            return SerializationHelper.Parse(() => new ImageProcessing(), source, null, null);
+        public static Parse(source: any) : ImageProcessingConfiguration {
+            return SerializationHelper.Parse(() => new ImageProcessingConfiguration(), source, null, null);
         }
 
         // Static constants associated to the image processing.

src/Materials/babylon.standardMaterial.ts

@@ -1,5 +1,5 @@
 module BABYLON {
-   export class StandardMaterialDefines extends MaterialDefines implements IImageProcessingDefines {
+   export class StandardMaterialDefines extends MaterialDefines implements IImageProcessingConfigurationDefines {
         public DIFFUSE = false;
         public AMBIENT = false;
         public OPACITY = false;
@@ -283,12 +283,12 @@ module BABYLON {
         /**
          * Default configuration related to image processing available in the standard Material.
          */
-        protected _imageProcessingConfiguration: ImageProcessing;
+        protected _imageProcessingConfiguration: ImageProcessingConfiguration;
 
         /**
          * Gets the image processing configuration used either in this material.
          */
-        public get imageProcessingConfiguration(): ImageProcessing {
+        public get imageProcessingConfiguration(): ImageProcessingConfiguration {
             return this._imageProcessingConfiguration;
         }
 
@@ -297,7 +297,7 @@ module BABYLON {
          * 
          * If sets to null, the scene one is in use.
          */
-        public set imageProcessingConfiguration(value: ImageProcessing) {
+        public set imageProcessingConfiguration(value: ImageProcessingConfiguration) {
             this._attachImageProcessingConfiguration(value);
 
             // Ensure the effect will be rebuilt.
@@ -307,13 +307,13 @@ module BABYLON {
         /**
          * Keep track of the image processing observer to allow dispose and replace.
          */
-        private _imageProcessingObserver: Observer<ImageProcessing>;
+        private _imageProcessingObserver: Observer<ImageProcessingConfiguration>;
 
         /**
          * Attaches a new image processing configuration to the Standard Material.
          * @param configuration 
          */
-        protected _attachImageProcessingConfiguration(configuration: ImageProcessing): void {
+        protected _attachImageProcessingConfiguration(configuration: ImageProcessingConfiguration): void {
             if (configuration === this._imageProcessingConfiguration) {
                 return;
             }
@@ -834,8 +834,8 @@ module BABYLON {
 
                 var uniformBuffers = ["Material", "Scene"];
 
-                ImageProcessing.PrepareUniforms(uniforms, defines);
-                ImageProcessing.PrepareSamplers(samplers, defines);
+                ImageProcessingConfiguration.PrepareUniforms(uniforms, defines);
+                ImageProcessingConfiguration.PrepareSamplers(samplers, defines);
 
                 MaterialHelper.PrepareUniformsAndSamplersList(<EffectCreationOptions>{
                     uniformsNames: uniforms, 

src/PostProcess/babylon.imageProcessingPostProcess.ts

@@ -4,12 +4,12 @@
         /**
          * Default configuration related to image processing available in the PBR Material.
          */
-        protected _imageProcessingConfiguration: ImageProcessing;
+        protected _imageProcessingConfiguration: ImageProcessingConfiguration;
 
         /**
          * Gets the image processing configuration used either in this material.
          */
-        public get imageProcessingConfiguration(): ImageProcessing {
+        public get imageProcessingConfiguration(): ImageProcessingConfiguration {
             return this._imageProcessingConfiguration;
         }
 
@@ -18,20 +18,20 @@
          * 
          * If sets to null, the scene one is in use.
          */
-        public set imageProcessingConfiguration(value: ImageProcessing) {
+        public set imageProcessingConfiguration(value: ImageProcessingConfiguration) {
             this._attachImageProcessingConfiguration(value);
         }
 
         /**
          * Keep track of the image processing observer to allow dispose and replace.
          */
-        private _imageProcessingObserver: Observer<ImageProcessing>;
+        private _imageProcessingObserver: Observer<ImageProcessingConfiguration>;
 
         /**
          * Attaches a new image processing configuration to the PBR Material.
          * @param configuration 
          */
-        protected _attachImageProcessingConfiguration(configuration: ImageProcessing): void {
+        protected _attachImageProcessingConfiguration(configuration: ImageProcessingConfiguration): void {
             if (configuration === this._imageProcessingConfiguration) {
                 return;
             }
@@ -280,7 +280,7 @@
         /**
          * Defines cache preventing GC.
          */
-        private _defines: IImageProcessingDefines & { FROMLINEARSPACE: boolean } = {
+        private _defines: IImageProcessingConfigurationDefines & { FROMLINEARSPACE: boolean } = {
             IMAGEPROCESSING: false,
             VIGNETTE: false,
             VIGNETTEBLENDMODEMULTIPLY: false,
@@ -322,10 +322,10 @@
             }
 
             var samplers = ["textureSampler"];
-            ImageProcessing.PrepareSamplers(samplers, this._defines);
+            ImageProcessingConfiguration.PrepareSamplers(samplers, this._defines);
 
             var uniforms = [];
-            ImageProcessing.PrepareUniforms(uniforms, this._defines);
+            ImageProcessingConfiguration.PrepareUniforms(uniforms, this._defines);
 
             this.updateEffect(defines, uniforms, samplers);
         }

src/Tools/babylon.decorators.ts

@@ -72,7 +72,7 @@
         return generateSerializableMember(8, sourceName); // color 4
     }
 
-    export function serializeAsImageProcessing(sourceName?: string) {
+    export function serializeAsImageProcessingConfiguration(sourceName?: string) {
         return generateSerializableMember(9, sourceName); // image processing
     }
 
@@ -126,7 +126,7 @@
                             serializationObject[targetPropertyName] = (<Color4>sourceProperty).asArray();
                             break;
                         case 9:     // Image Processing
-                            serializationObject[targetPropertyName] = (<ImageProcessing>sourceProperty).serialize();
+                            serializationObject[targetPropertyName] = (<ImageProcessingConfiguration>sourceProperty).serialize();
                             break;
                     }
                 }
@@ -179,7 +179,7 @@
                             destination[property] = Color4.FromArray(sourceProperty);
                             break;
                         case 9:     // Image Processing
-                            destination[property] = ImageProcessing.Parse(sourceProperty);
+                            destination[property] = ImageProcessingConfiguration.Parse(sourceProperty);
                             break;
                     }
                 }

src/babylon.scene.ts

@@ -209,7 +209,7 @@
             this.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
         }
 
-        protected _imageProcessingConfiguration: ImageProcessing;
+        protected _imageProcessingConfiguration: ImageProcessingConfiguration;
         /**
          * Default image processing configuration used either in the rendering
          * Forward main pass or through the imageProcessingPostProcess if present.
@@ -218,7 +218,7 @@
          * 
          * No setter as we it is a shared configuration, you can set the values instead.
          */
-        public get imageProcessingConfiguration(): ImageProcessing {
+        public get imageProcessingConfiguration(): ImageProcessingConfiguration {
             return this._imageProcessingConfiguration;
         }
 
@@ -807,7 +807,7 @@
             this._createUbo();
 
             // Default Image processing definition.
-            this._imageProcessingConfiguration = new ImageProcessing();
+            this._imageProcessingConfiguration = new ImageProcessingConfiguration();
         }
 
         // Properties