Move Material Constants to constants

src/Engine/constants.ts

@@ -200,4 +200,34 @@ export class Constants {
     public static readonly SCALEMODE_NEAREST = 2;
     /** Defines that texture rescaling will use a ceil to find the closer power of 2 size */
     public static readonly SCALEMODE_CEILING = 3;
+
+    /**
+     * The dirty texture flag value
+     */
+    public static readonly MATERIAL_TextureDirtyFlag = 1;
+
+    /**
+     * The dirty light flag value
+     */
+    public static readonly MATERIAL_LightDirtyFlag = 2;
+
+    /**
+     * The dirty fresnel flag value
+     */
+    public static readonly MATERIAL_FresnelDirtyFlag = 4;
+
+    /**
+     * The dirty attribute flag value
+     */
+    public static readonly MATERIAL_AttributesDirtyFlag = 8;
+
+    /**
+     * The dirty misc flag value
+     */
+    public static readonly MATERIAL_MiscDirtyFlag = 16;
+
+    /**
+     * The all dirty flag value
+     */
+    public static readonly MATERIAL_AllDirtyFlag = 31;
 }

src/Materials/Textures/baseTexture.ts

@@ -7,7 +7,6 @@ import { Scene } from "scene";
 import { Matrix, Size, ISize } from "Math/math";
 import { SphericalPolynomial } from "Math/sphericalPolynomial";
 import { Engine } from "Engine/engine";
-import { Material } from "Materials/material";
 import { InternalTexture } from "Materials/Textures/internalTexture";
 import { Animation } from "Animations/animation";
 import { _TimeToken } from "Instrumentation/timeToken";
@@ -54,7 +53,7 @@ import { Constants } from "Engine/constants";
             }
             this._hasAlpha = value;
             if (this._scene) {
-                this._scene.markAllMaterialsAsDirty(Material.TextureDirtyFlag | Material.MiscDirtyFlag);
+                this._scene.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag | Constants.MATERIAL_MiscDirtyFlag);
             }
         }
         public get hasAlpha(): boolean {
@@ -107,7 +106,7 @@ import { Constants } from "Engine/constants";
             }
             this._coordinatesMode = value;
             if (this._scene) {
-                this._scene.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+                this._scene.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
             }
         }
         public get coordinatesMode(): number {

src/Materials/Textures/cubeTexture.ts

@@ -3,7 +3,6 @@ import { Tools } from "Tools/tools";
 import { Nullable } from "types";
 import { Scene } from "scene";
 import { Matrix, Vector3 } from "Math/math";
-import { Material } from "Materials/material";
 import { BaseTexture } from "Materials/Textures/baseTexture";
 import { Texture } from "Materials/Textures/texture";
 import { Animation } from "Animations/animation";
@@ -41,7 +40,7 @@ import { Constants } from "Engine/constants";
             this._boundingBoxSize = value;
             let scene = this.getScene();
             if (scene) {
-                scene.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+                scene.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
             }
         }
         /**

src/Materials/Textures/hdrCubeTexture.ts

@@ -4,7 +4,7 @@ import { Matrix, Vector3, ToGammaSpace } from "Math/math";
 import { Engine } from "Engine/engine";
 import { BaseTexture } from "Materials/Textures/baseTexture";
 import { Texture } from "Materials/Textures/texture";
-import { Material } from "Materials/material";
+import { Constants } from "Engine/constants";
 import { _TimeToken } from "Instrumentation/timeToken";
 import { _DepthCullingState, _StencilState, _AlphaState } from "States";
 import { HDRTools } from "Tools/Hdr/hdr";
@@ -93,7 +93,7 @@ import { CubeMapToSphericalPolynomialTools } from "Tools/hdr/cubemapToSphericalP
             this._boundingBoxSize = value;
             let scene = this.getScene();
             if (scene) {
-                scene.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+                scene.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
             }
         }
         public get boundingBoxSize(): Vector3 {

src/Materials/Textures/renderTargetTexture.ts

@@ -8,7 +8,6 @@ import { Matrix, Vector3, Color4 } from "Math/math";
 import { Engine, RenderTargetCreationOptions } from "Engine/engine";
 import { AbstractMesh } from "Mesh/abstractMesh";
 import { SubMesh } from "Mesh/subMesh";
-import { Material } from "Materials/material";
 import { InternalTexture } from "Materials/Textures/internalTexture";
 import { Texture } from "Materials/Textures/texture";
 import { PostProcessManager } from "PostProcess/postProcessManager";
@@ -247,7 +246,7 @@ import { Constants } from "Engine/constants";
             this._boundingBoxSize = value;
             let scene = this.getScene();
             if (scene) {
-                scene.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+                scene.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
             }
         }
         public get boundingBoxSize(): Vector3 {

src/Materials/Textures/texture.ts

@@ -4,7 +4,6 @@ import { Tools } from "Tools/tools";
 import { Nullable } from "types";
 import { Scene } from "scene";
 import { Matrix, Vector3, Plane } from "Math/math";
-import { Material } from "Materials/material";
 import { BaseTexture } from "Materials/Textures/baseTexture";
 import { Constants } from "Engine/constants";
 import { _AlphaState } from "States";
@@ -483,7 +482,7 @@ declare type RenderTargetTexture = import ("Materials/Textures/renderTargetTextu
                 return this._cachedTextureMatrix;
             }
 
-            scene.markAllMaterialsAsDirty(Material.TextureDirtyFlag, (mat) => {
+            scene.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag, (mat) => {
                 return mat.hasTexture(this);
             });
 
@@ -556,7 +555,7 @@ declare type RenderTargetTexture = import ("Materials/Textures/renderTargetTextu
                     break;
             }
 
-            scene.markAllMaterialsAsDirty(Material.TextureDirtyFlag, (mat) => {
+            scene.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag, (mat) => {
                 return (mat.getActiveTextures().indexOf(this) !== -1);
             });
 

src/Materials/effect.ts

@@ -9,7 +9,7 @@ import { PostProcess } from "PostProcess/postProcess";
 import { InternalTexture } from "Materials/Textures/internalTexture";
 import { BaseTexture } from "Materials/Textures/baseTexture";
 import { RenderTargetTexture } from "Materials/Textures/renderTargetTexture";
-import { Material } from "Materials/material";
+import { Constants } from "Engine/constants";
 
     /**
      * EffectFallbacks can be used to add fallbacks (properties to disable) to certain properties when desired to improve performance.
@@ -771,7 +771,7 @@ import { Material } from "Materials/material";
             this.onCompiled = () => {
                 var scenes = this.getEngine().scenes;
                 for (var i = 0; i < scenes.length; i++) {
-                    scenes[i].markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+                    scenes[i].markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
                 }
 
                 if (onCompiled) {

src/Materials/fresnelParameters.ts

@@ -1,8 +1,8 @@
 import { Tools } from "Tools/tools";
 import { Color3 } from "Math/math";
 import { Engine } from "Engine/engine";
-import { Material } from "Materials/material";
 import { SerializationHelper } from "Tools/decorators";
+import { Constants } from "Engine/constants";
 
     /**
      * This represents all the required information to add a fresnel effect on a material:
@@ -22,7 +22,7 @@ import { SerializationHelper } from "Tools/decorators";
             }
 
             this._isEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.FresnelDirtyFlag | Material.MiscDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_FresnelDirtyFlag | Constants.MATERIAL_MiscDirtyFlag);
         }
 
         /**

src/Materials/material.ts

@@ -126,32 +126,32 @@ declare var BABYLON: any;
         /**
          * The dirty texture flag value
          */
-        public static readonly TextureDirtyFlag = 1;
+        public static readonly TextureDirtyFlag = Constants.MATERIAL_TextureDirtyFlag;
 
         /**
          * The dirty light flag value
          */
-        public static readonly LightDirtyFlag = 2;
+        public static readonly LightDirtyFlag = Constants.MATERIAL_LightDirtyFlag;
 
         /**
          * The dirty fresnel flag value
          */
-        public static readonly FresnelDirtyFlag = 4;
+        public static readonly FresnelDirtyFlag = Constants.MATERIAL_FresnelDirtyFlag;
 
         /**
          * The dirty attribute flag value
          */
-        public static readonly AttributesDirtyFlag = 8;
+        public static readonly AttributesDirtyFlag = Constants.MATERIAL_AttributesDirtyFlag;
 
         /**
          * The dirty misc flag value
          */
-        public static readonly MiscDirtyFlag = 16;
+        public static readonly MiscDirtyFlag = Constants.MATERIAL_MiscDirtyFlag;
 
         /**
          * The all dirty flag value
          */
-        public static readonly AllDirtyFlag = 31;
+        public static readonly AllDirtyFlag = Constants.MATERIAL_AllDirtyFlag;
 
         /**
          * The ID of the material

src/Materials/standardMaterial.ts

@@ -1724,7 +1724,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._DiffuseTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _AmbientTextureEnabled = true;
@@ -1740,7 +1740,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._AmbientTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _OpacityTextureEnabled = true;
@@ -1756,7 +1756,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._OpacityTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _ReflectionTextureEnabled = true;
@@ -1772,7 +1772,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._ReflectionTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _EmissiveTextureEnabled = true;
@@ -1788,7 +1788,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._EmissiveTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _SpecularTextureEnabled = true;
@@ -1804,7 +1804,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._SpecularTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _BumpTextureEnabled = true;
@@ -1820,7 +1820,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._BumpTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _LightmapTextureEnabled = true;
@@ -1836,7 +1836,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._LightmapTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _RefractionTextureEnabled = true;
@@ -1852,7 +1852,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._RefractionTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _ColorGradingTextureEnabled = true;
@@ -1868,7 +1868,7 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._ColorGradingTextureEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         private static _FresnelEnabled = true;
@@ -1884,6 +1884,6 @@ import { Constants } from "Engine/constants";
             }
 
             StandardMaterial._FresnelEnabled = value;
-            Engine.MarkAllMaterialsAsDirty(Material.FresnelDirtyFlag);
+            Engine.MarkAllMaterialsAsDirty(Constants.MATERIAL_FresnelDirtyFlag);
         }
     }

src/Mesh/abstractMesh.ts

@@ -21,6 +21,7 @@ import { ActionManager } from "Actions/actionManager";
 import { Skeleton } from "Bones/skeleton";
 import { IEdgesRenderer } from "Rendering/edgesRenderer";
 import { SolidParticle } from "Particles/solidParticle";
+import { Constants } from "Engine/constants";
 
     /** @hidden */
     class _FacetDataStorage {
@@ -721,7 +722,7 @@ import { SolidParticle } from "Particles/solidParticle";
             for (var subMesh of this.subMeshes) {
                 var material = subMesh.getMaterial();
                 if (material) {
-                    material.markAsDirty(Material.MiscDirtyFlag);
+                    material.markAsDirty(Constants.MATERIAL_MiscDirtyFlag);
                 }
             }
         }

src/scene.ts

@@ -203,7 +203,7 @@ import { Constants } from "Engine/constants";
             }
 
             this._environmentTexture = value;
-            this.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         /** @hidden */
@@ -229,7 +229,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._forceWireframe = value;
-            this.markAllMaterialsAsDirty(Material.MiscDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_MiscDirtyFlag);
         }
         public get forceWireframe(): boolean {
             return this._forceWireframe;
@@ -244,7 +244,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._forcePointsCloud = value;
-            this.markAllMaterialsAsDirty(Material.MiscDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_MiscDirtyFlag);
         }
         public get forcePointsCloud(): boolean {
             return this._forcePointsCloud;
@@ -696,7 +696,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._useRightHandedSystem = value;
-            this.markAllMaterialsAsDirty(Material.MiscDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_MiscDirtyFlag);
         }
         public get useRightHandedSystem(): boolean {
             return this._useRightHandedSystem;
@@ -742,7 +742,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._fogEnabled = value;
-            this.markAllMaterialsAsDirty(Material.MiscDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_MiscDirtyFlag);
         }
         public get fogEnabled(): boolean {
             return this._fogEnabled;
@@ -764,7 +764,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._fogMode = value;
-            this.markAllMaterialsAsDirty(Material.MiscDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_MiscDirtyFlag);
         }
         public get fogMode(): number {
             return this._fogMode;
@@ -805,7 +805,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._shadowsEnabled = value;
-            this.markAllMaterialsAsDirty(Material.LightDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_LightDirtyFlag);
         }
         public get shadowsEnabled(): boolean {
             return this._shadowsEnabled;
@@ -820,7 +820,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._lightsEnabled = value;
-            this.markAllMaterialsAsDirty(Material.LightDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_LightDirtyFlag);
         }
 
         public get lightsEnabled(): boolean {
@@ -871,7 +871,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._texturesEnabled = value;
-            this.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         public get texturesEnabled(): boolean {
@@ -900,7 +900,7 @@ import { Constants } from "Engine/constants";
                 return;
             }
             this._skeletonsEnabled = value;
-            this.markAllMaterialsAsDirty(Material.AttributesDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_AttributesDirtyFlag);
         }
 
         public get skeletonsEnabled(): boolean {
@@ -5391,7 +5391,7 @@ import { Constants } from "Engine/constants";
                 texture._rebuild();
             }
 
-            this.markAllMaterialsAsDirty(Material.TextureDirtyFlag);
+            this.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag);
         }
 
         // Tags
@@ -5515,7 +5515,7 @@ import { Constants } from "Engine/constants";
             this._blockMaterialDirtyMechanism = value;
 
             if (!value) { // Do a complete update
-                this.markAllMaterialsAsDirty(Material.AllDirtyFlag);
+                this.markAllMaterialsAsDirty(Constants.MATERIAL_AllDirtyFlag);
             }
         }