Minor changes

Author: Mike Bond

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

@@ -5,7 +5,7 @@ import type { Nullable } from "../../types";
 import { Scene } from "../../scene";
 import { Color3, Color4, TmpColors } from "../../Maths/math.color";
 import { ImageProcessingConfiguration } from "../imageProcessingConfiguration";
-import type { BaseTexture } from "../Textures/baseTexture";
+import type { BaseTexture } from "../../Materials/Textures/baseTexture";
 import { PBRBaseMaterial } from "./pbrBaseMaterial";
 import { RegisterClass } from "../../Misc/typeStore";
 import { Material } from "../material";
@@ -166,7 +166,7 @@ export class OpenPBRMaterialDefines extends ImageProcessingDefinesMixin(OpenPBRM
     public MICROSURFACEMAP = false;
     public MICROSURFACEMAPDIRECTUV = 0;
 
-    public METALLICWORKFLOW = false;
+    public METALLICWORKFLOW = true;
     public ROUGHNESSSTOREINMETALMAPALPHA = false;
     public ROUGHNESSSTOREINMETALMAPGREEN = false;
     public METALLNESSSTOREINMETALMAPBLUE = false;
@@ -2121,8 +2121,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                     TmpColors.Color4[0].a = f0;
                     ubo.updateDirectColor4("vReflectivityColor", TmpColors.Color4[0]);
                     ubo.updateColor4("vMetallicReflectanceFactors", this._metallicReflectanceColor, this._metallicF0Factor);
-                } else {
-                    ubo.updateColor4("vReflectivityColor", this._reflectivityColor, this._microSurface);
                 }
 
                 ubo.updateColor3("vEmissiveColor", MaterialFlags.EmissiveTextureEnabled ? this._emissiveColor : Color3.BlackReadOnly);

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

@@ -15,23 +15,23 @@ import { PBRBRDFConfiguration } from "./pbrBRDFConfiguration";
 import { PrePassConfiguration } from "../prePassConfiguration";
 import { Color3, TmpColors } from "../../Maths/math.color";
 
-import { ImageProcessingDefinesMixin } from "../imageProcessingConfiguration.defines";
-import { ImageProcessingConfiguration } from "../imageProcessingConfiguration";
-import type { Effect, IEffectCreationOptions } from "../effect";
-import type { IMaterialCompilationOptions, ICustomShaderNameResolveOptions } from "../material";
-import { Material } from "../material";
+import { ImageProcessingDefinesMixin } from "../../Materials/imageProcessingConfiguration.defines";
+import { ImageProcessingConfiguration } from "../../Materials/imageProcessingConfiguration";
+import type { Effect, IEffectCreationOptions } from "../../Materials/effect";
+import type { IMaterialCompilationOptions, ICustomShaderNameResolveOptions } from "../../Materials/material";
+import { Material } from "../../Materials/material";
 import { MaterialPluginEvent } from "../materialPluginEvent";
-import { MaterialDefines } from "../materialDefines";
-import { PushMaterial } from "../pushMaterial";
+import { MaterialDefines } from "../../Materials/materialDefines";
+import { PushMaterial } from "../../Materials/pushMaterial";
 
-import type { BaseTexture } from "../Textures/baseTexture";
-import type { RenderTargetTexture } from "../Textures/renderTargetTexture";
+import type { BaseTexture } from "../../Materials/Textures/baseTexture";
+import type { RenderTargetTexture } from "../../Materials/Textures/renderTargetTexture";
 
 import { MaterialFlags } from "../materialFlags";
 import { Constants } from "../../Engines/constants";
 import type { IAnimatable } from "../../Animations/animatable.interface";
 
-import "../Textures/baseTexture.polynomial";
+import "../../Materials/Textures/baseTexture.polynomial";
 
 import { EffectFallbacks } from "../effectFallbacks";
 import { PBRClearCoatConfiguration } from "./pbrClearCoatConfiguration";

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

@@ -3,12 +3,12 @@ import { serializeAsImageProcessingConfiguration } from "../Misc/decorators";
 import type { Nullable } from "../types";
 import type { ImageProcessingConfiguration } from "./imageProcessingConfiguration";
 import type { Observer } from "../Misc/observable";
-import type { BaseTexture } from "./Textures/baseTexture";
-import type { ColorCurves } from "./colorCurves";
+import type { BaseTexture } from "../Materials/Textures/baseTexture";
+import type { ColorCurves } from "../Materials/colorCurves";
 
 // Explicit re-export of types to help TypeScript resolve them in declaration files
-export type { Observer } from "../Misc/observable";
-export type { ColorCurves } from "./colorCurves";
+// export type { Observer } from "../Misc/observable";
+// export type { ColorCurves } from "./colorCurves";
 
 type Constructor<T = {}> = new (...args: any[]) => T;
 

packages/dev/core/src/Shaders/openpbr.vertex.fx

@@ -48,34 +48,6 @@ attribute vec4 color;
 #include<samplerVertexDeclaration>(_DEFINENAME_,BUMP,_VARYINGNAME_,Bump)
 #include<samplerVertexDeclaration>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal)
 
-#ifdef CLEARCOAT
-    #include<samplerVertexDeclaration>(_DEFINENAME_,CLEARCOAT_TEXTURE,_VARYINGNAME_,ClearCoat)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,CLEARCOAT_TEXTURE_ROUGHNESS,_VARYINGNAME_,ClearCoatRoughness)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,CLEARCOAT_BUMP,_VARYINGNAME_,ClearCoatBump)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,CLEARCOAT_TINT_TEXTURE,_VARYINGNAME_,ClearCoatTint)
-#endif
-
-#ifdef IRIDESCENCE
-    #include<samplerVertexDeclaration>(_DEFINENAME_,IRIDESCENCE_TEXTURE,_VARYINGNAME_,Iridescence)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,IRIDESCENCE_THICKNESS_TEXTURE,_VARYINGNAME_,IridescenceThickness)
-#endif
-
-#ifdef SHEEN
-    #include<samplerVertexDeclaration>(_DEFINENAME_,SHEEN_TEXTURE,_VARYINGNAME_,Sheen)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,SHEEN_TEXTURE_ROUGHNESS,_VARYINGNAME_,SheenRoughness)
-#endif
-
-#ifdef ANISOTROPIC
-    #include<samplerVertexDeclaration>(_DEFINENAME_,ANISOTROPIC_TEXTURE,_VARYINGNAME_,Anisotropy)
-#endif
-
-#ifdef SUBSURFACE
-    #include<samplerVertexDeclaration>(_DEFINENAME_,SS_THICKNESSANDMASK_TEXTURE,_VARYINGNAME_,Thickness)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,SS_REFRACTIONINTENSITY_TEXTURE,_VARYINGNAME_,RefractionIntensity)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,SS_TRANSLUCENCYINTENSITY_TEXTURE,_VARYINGNAME_,TranslucencyIntensity)
-    #include<samplerVertexDeclaration>(_DEFINENAME_,SS_TRANSLUCENCYCOLOR_TEXTURE,_VARYINGNAME_,TranslucencyColor)
-#endif
-
 // Output
 varying vec3 vPositionW;
 #if DEBUGMODE > 0