Move UV defines into a mixin

Author: Mike Bond

packages/dev/core/src/Materials/Node/nodeMaterial.ts

@@ -72,6 +72,7 @@ import { ShaderLanguage } from "../shaderLanguage";
 import { AbstractEngine } from "../../Engines/abstractEngine";
 import type { LoopBlock } from "./Blocks/loopBlock";
 import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering";
+import { UVDefinesMixin } from "../uv.defines";
 
 const onCreatedEffectParameters = { effect: null as unknown as Effect, subMesh: null as unknown as Nullable<SubMesh> };
 
@@ -91,7 +92,7 @@ export interface INodeMaterialEditorOptions {
     };
 }
 
-class NodeMaterialDefinesBase extends MaterialDefines {}
+class NodeMaterialDefinesBase extends UVDefinesMixin(MaterialDefines) {}
 
 /** @internal */
 export class NodeMaterialDefines extends ImageProcessingDefinesMixin(NodeMaterialDefinesBase) {
@@ -101,18 +102,6 @@ export class NodeMaterialDefines extends ImageProcessingDefinesMixin(NodeMateria
     public TANGENT = false;
     /** Vertex color */
     public VERTEXCOLOR_NME = false;
-    /**  Uv1 **/
-    public UV1 = false;
-    /** Uv2 **/
-    public UV2 = false;
-    /** Uv3 **/
-    public UV3 = false;
-    /** Uv4 **/
-    public UV4 = false;
-    /** Uv5 **/
-    public UV5 = false;
-    /** Uv6 **/
-    public UV6 = false;
 
     /** Prepass **/
     public PREPASS = false;

packages/dev/core/src/Materials/PBR/pbrBaseMaterial.ts

@@ -68,10 +68,11 @@ import {
 } from "../materialHelper.functions";
 import { ShaderLanguage } from "../shaderLanguage";
 import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering";
+import { UVDefinesMixin } from "../uv.defines";
 
 const onCreatedEffectParameters = { effect: null as unknown as Effect, subMesh: null as unknown as Nullable<SubMesh> };
 
-class PBRMaterialDefinesBase extends MaterialDefines {}
+class PBRMaterialDefinesBase extends UVDefinesMixin(MaterialDefines) {}
 
 /**
  * Manages the defines for the PBR Material.
@@ -83,18 +84,6 @@ export class PBRMaterialDefines extends ImageProcessingDefinesMixin(PBRMaterialD
     public NUM_SAMPLES = "0";
     public REALTIME_FILTERING = false;
     public IBL_CDF_FILTERING = false;
-    public MAINUV1 = false;
-    public MAINUV2 = false;
-    public MAINUV3 = false;
-    public MAINUV4 = false;
-    public MAINUV5 = false;
-    public MAINUV6 = false;
-    public UV1 = false;
-    public UV2 = false;
-    public UV3 = false;
-    public UV4 = false;
-    public UV5 = false;
-    public UV6 = false;
 
     public ALBEDO = false;
     public GAMMAALBEDO = false;

packages/dev/core/src/Materials/standardMaterial.ts

@@ -61,19 +61,14 @@ import {
 import { SerializationHelper } from "../Misc/decorators.serialization";
 import { ShaderLanguage } from "./shaderLanguage";
 import { MaterialHelperGeometryRendering } from "./materialHelper.geometryrendering";
+import { UVDefinesMixin } from "./uv.defines";
 
 const onCreatedEffectParameters = { effect: null as unknown as Effect, subMesh: null as unknown as Nullable<SubMesh> };
 
-class StandardMaterialDefinesBase extends MaterialDefines {}
+class StandardMaterialDefinesBase extends UVDefinesMixin(MaterialDefines) {}
 
 /** @internal */
 export class StandardMaterialDefines extends ImageProcessingDefinesMixin(StandardMaterialDefinesBase) {
-    public MAINUV1 = false;
-    public MAINUV2 = false;
-    public MAINUV3 = false;
-    public MAINUV4 = false;
-    public MAINUV5 = false;
-    public MAINUV6 = false;
     public DIFFUSE = false;
     public DIFFUSEDIRECTUV = 0;
     public BAKED_VERTEX_ANIMATION_TEXTURE = false;
@@ -113,12 +108,6 @@ export class StandardMaterialDefines extends ImageProcessingDefinesMixin(Standar
     public FRESNEL = false;
     public NORMAL = false;
     public TANGENT = false;
-    public UV1 = false;
-    public UV2 = false;
-    public UV3 = false;
-    public UV4 = false;
-    public UV5 = false;
-    public UV6 = false;
     public VERTEXCOLOR = false;
     public VERTEXALPHA = false;
     public NUM_BONE_INFLUENCERS = 0;

packages/dev/core/src/Materials/uv.defines.ts

@@ -0,0 +1,22 @@
+type Constructor<T = {}> = new (...args: any[]) => T;
+
+/**
+ * Mixin to add UV defines to your material defines
+ * @internal
+ */
+export function UVDefinesMixin<Tbase extends Constructor>(base: Tbase) {
+    return class extends base {
+        public MAINUV1 = false;
+        public MAINUV2 = false;
+        public MAINUV3 = false;
+        public MAINUV4 = false;
+        public MAINUV5 = false;
+        public MAINUV6 = false;
+        public UV1 = false;
+        public UV2 = false;
+        public UV3 = false;
+        public UV4 = false;
+        public UV5 = false;
+        public UV6 = false;
+    };
+}

packages/dev/materials/src/water/waterMaterial.ts

@@ -13,7 +13,7 @@ import type { BaseTexture } from "core/Materials/Textures/baseTexture";
 import { RenderTargetTexture } from "core/Materials/Textures/renderTargetTexture";
 import type { IEffectCreationOptions } from "core/Materials/effect";
 import { MaterialDefines } from "core/Materials/materialDefines";
-import { ImageProcessingDefinesMixin } from "core/Materials/imageProcessingConfiguration.defines";
+import type { IImageProcessingConfigurationDefines } from "core/Materials/imageProcessingConfiguration.defines";
 import { ImageProcessingConfiguration } from "core/Materials/imageProcessingConfiguration";
 import { PushMaterial } from "core/Materials/pushMaterial";
 import { MaterialFlags } from "core/Materials/materialFlags";
@@ -47,9 +47,7 @@ import {
 
 import "core/Rendering/boundingBoxRenderer";
 
-class WaterMaterialDefinesBase extends MaterialDefines {}
-
-class WaterMaterialDefines extends ImageProcessingDefinesMixin(WaterMaterialDefinesBase) {
+class WaterMaterialDefines extends MaterialDefines implements IImageProcessingConfigurationDefines {
     public BUMP = false;
     public REFLECTION = false;
     public CLIPPLANE = false;
@@ -79,6 +77,22 @@ class WaterMaterialDefines extends ImageProcessingDefinesMixin(WaterMaterialDefi
     public BUMPAFFECTSREFLECTION = false;
     public USE_WORLD_COORDINATES = false;
 
+    public IMAGEPROCESSING = false;
+    public VIGNETTE = false;
+    public VIGNETTEBLENDMODEMULTIPLY = false;
+    public VIGNETTEBLENDMODEOPAQUE = false;
+    public TONEMAPPING = 0;
+    public CONTRAST = false;
+    public EXPOSURE = false;
+    public COLORCURVES = false;
+    public COLORGRADING = false;
+    public COLORGRADING3D = false;
+    public SAMPLER3DGREENDEPTH = false;
+    public SAMPLER3DBGRMAP = false;
+    public DITHER = false;
+    public IMAGEPROCESSINGPOSTPROCESS = false;
+    public SKIPFINALCOLORCLAMP = false;
+
     constructor() {
         super();
         this.rebuild();