OpenPBRMaterial (including loading and exporting glTF)

packages/dev/buildTools/src/addJSToCompiledFiles.ts

@@ -8,6 +8,8 @@ function ProcessSource(sourceCode: string, forceMJS: boolean) {
     const extension = forceMJS ? ".mjs" : ".js";
     return (
         sourceCode
+            // replace imports from directories with index.js (mixins are generating them)
+            .replace(/import\("([./]+)"\)/g, `import("$1/index${extension}")`)
             // replace imports and exports with js extensions
             .replace(/((import|export).*["'](@babylonjs\/.*\/|\.{1,2}\/)((?!\.scss|\.svg|\.png|\.jpg).)*?)("|');/g, `$1${extension}$5;`)
             .replace(/((import|export)\(["']((@babylonjs\/.*\/|\.{1,2}\/)((?!\.scss|\.svg|\.png|\.jpg).)*?))(["'])\)/g, `$1${extension}$6)`)

packages/dev/buildTools/src/generateDeclaration.ts

@@ -76,6 +76,9 @@ function GetModuleDeclaration(
                     line = line.startsWith("    ") ? "    //" + line.substring(3) : "// " + line;
                 }
 
+                // replace type imports from directories with index (mixins are generating them)
+                line = line.replace(/import\("([./]+)"\)/g, `import("$1/index")`);
+
                 [
                     // Declaration
                     /declare module ['"](.*)['"]/,
@@ -85,15 +88,17 @@ function GetModuleDeclaration(
                     / {4}module ['"](.*)['"]/,
                     /^module ['"](\..*)['"]/,
                     // Inlined Import
-                    /import\(['"](.*)['"]/,
+                    /import\(['"]([^'"]*)['"]/,
                     // Side Effect Import
                     /import ['"](.*)['"]/,
                 ].forEach((regex) => {
                     const match = line.match(regex);
                     if (match) {
                         if (match[1][0] === ".") {
                             const newLocation = path.join(sourceDir, match[1]).replace(/\\/g, "/");
-                            line = line.replace(match[1], newLocation);
+                            // replaceAll only avaialable by modifying the typescript lib
+                            // which we prefered to not change for now
+                            line = (line as any).replaceAll(match[1], newLocation);
                         } else {
                             let found = false;
                             Object.keys(mapping).forEach((devPackageName) => {
@@ -319,8 +324,8 @@ function GetPackageDeclaration(
     while (i < lines.length) {
         let line = lines[i];
 
-        if (/import\("\.(.*)\)./g.test(line) && !/^declare type (.*) import/g.test(line)) {
-            line = line.replace(/import\((.*)\)./, "");
+        if (/import\("\.([^)]*)\)./g.test(line) && !/^declare type (.*) import/g.test(line)) {
+            line = line.replace(/import\(([^)]*)\)./g, "");
         }
 
         if (!line.includes("const enum") && !line.includes("=")) {

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

@@ -10,14 +10,12 @@ import { NodeMaterialBuildState } from "./nodeMaterialBuildState";
 import type { IEffectCreationOptions } from "../effect";
 import { Effect } from "../effect";
 import type { BaseTexture } from "../../Materials/Textures/baseTexture";
-import type { Observer } from "../../Misc/observable";
 import { Observable } from "../../Misc/observable";
 import { NodeMaterialBlockTargets } from "./Enums/nodeMaterialBlockTargets";
 import { NodeMaterialBuildStateSharedData } from "./nodeMaterialBuildStateSharedData";
 import type { SubMesh } from "../../Meshes/subMesh";
 import { MaterialDefines } from "../../Materials/materialDefines";
 import type { NodeMaterialOptimizer } from "./Optimizers/nodeMaterialOptimizer";
-import type { ImageProcessingConfiguration } from "../imageProcessingConfiguration";
 import type { Nullable } from "../../types";
 import { VertexBuffer } from "../../Buffers/buffer";
 import { Tools } from "../../Misc/tools";
@@ -67,11 +65,13 @@ import type { NodeMaterialTeleportOutBlock } from "./Blocks/Teleport/teleportOut
 import type { NodeMaterialTeleportInBlock } from "./Blocks/Teleport/teleportInBlock";
 import { Logger } from "core/Misc/logger";
 import { PrepareDefinesForCamera, PrepareDefinesForPrePass } from "../materialHelper.functions";
-import type { IImageProcessingConfigurationDefines } from "../imageProcessingConfiguration.defines";
+import { ImageProcessingDefinesMixin } from "../imageProcessingConfiguration.defines";
 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";
+import { ImageProcessingMixin } from "../imageProcessing";
 
 const onCreatedEffectParameters = { effect: null as unknown as Effect, subMesh: null as unknown as Nullable<SubMesh> };
 
@@ -91,26 +91,16 @@ export interface INodeMaterialEditorOptions {
     };
 }
 
+class NodeMaterialDefinesBase extends UVDefinesMixin(MaterialDefines) {}
+
 /** @internal */
-export class NodeMaterialDefines extends MaterialDefines implements IImageProcessingConfigurationDefines {
+export class NodeMaterialDefines extends ImageProcessingDefinesMixin(NodeMaterialDefinesBase) {
     /** Normal */
     public NORMAL = false;
     /** Tangent */
     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;
@@ -177,37 +167,6 @@ export class NodeMaterialDefines extends MaterialDefines implements IImageProces
     /** Using a texture to store morph target data */
     public MORPHTARGETS_TEXTURE = false;
 
-    /** IMAGE PROCESSING */
-    public IMAGEPROCESSING = false;
-    /** Vignette */
-    public VIGNETTE = false;
-    /** Multiply blend mode for vignette */
-    public VIGNETTEBLENDMODEMULTIPLY = false;
-    /** Opaque blend mode for vignette */
-    public VIGNETTEBLENDMODEOPAQUE = false;
-    /** Tone mapping */
-    public TONEMAPPING = 0;
-    /** Contrast */
-    public CONTRAST = false;
-    /** Exposure */
-    public EXPOSURE = false;
-    /** Color curves */
-    public COLORCURVES = false;
-    /** Color grading */
-    public COLORGRADING = false;
-    /** 3D color grading */
-    public COLORGRADING3D = false;
-    /** Sampler green depth */
-    public SAMPLER3DGREENDEPTH = false;
-    /** Sampler for BGR map */
-    public SAMPLER3DBGRMAP = false;
-    /** Dithering */
-    public DITHER = false;
-    /** Using post process for image processing */
-    public IMAGEPROCESSINGPOSTPROCESS = false;
-    /** Skip color clamp */
-    public SKIPFINALCOLORCLAMP = false;
-
     /** MISC. */
     public BUMPDIRECTUV = 0;
     /** Camera is orthographic */
@@ -272,10 +231,11 @@ export type NodeMaterialTextureBlocks =
     | BiPlanarBlock
     | PrePassTextureBlock;
 
+class NodeMaterialBase extends ImageProcessingMixin(PushMaterial) {}
 /**
  * Class used to create a node based material built by assembling shader blocks
  */
-export class NodeMaterial extends PushMaterial {
+export class NodeMaterial extends NodeMaterialBase {
     private static _BuildIdGenerator: number = 0;
     private _options: INodeMaterialOptions;
     private _vertexCompilationState: NodeMaterialBuildState;
@@ -416,30 +376,6 @@ export class NodeMaterial extends PushMaterial {
         this._options = options;
     }
 
-    /**
-     * Default configuration related to image processing available in the standard Material.
-     */
-    protected _imageProcessingConfiguration: ImageProcessingConfiguration;
-
-    /**
-     * Gets the image processing configuration used either in this material.
-     */
-    public get imageProcessingConfiguration(): ImageProcessingConfiguration {
-        return this._imageProcessingConfiguration;
-    }
-
-    /**
-     * Sets the Default image processing configuration used either in the this material.
-     *
-     * If sets to null, the scene one is in use.
-     */
-    public set imageProcessingConfiguration(value: ImageProcessingConfiguration) {
-        this._attachImageProcessingConfiguration(value);
-
-        // Ensure the effect will be rebuilt.
-        this._markAllSubMeshesAsTexturesDirty();
-    }
-
     /**
      * Gets an array of blocks that needs to be serialized even if they are not yet connected
      */
@@ -513,40 +449,6 @@ export class NodeMaterial extends PushMaterial {
         return "NodeMaterial";
     }
 
-    /**
-     * Keep track of the image processing observer to allow dispose and replace.
-     */
-    private _imageProcessingObserver: Nullable<Observer<ImageProcessingConfiguration>>;
-
-    /**
-     * Attaches a new image processing configuration to the Standard Material.
-     * @param configuration
-     */
-    protected _attachImageProcessingConfiguration(configuration: Nullable<ImageProcessingConfiguration>): void {
-        if (configuration === this._imageProcessingConfiguration) {
-            return;
-        }
-
-        // Detaches observer.
-        if (this._imageProcessingConfiguration && this._imageProcessingObserver) {
-            this._imageProcessingConfiguration.onUpdateParameters.remove(this._imageProcessingObserver);
-        }
-
-        // Pick the scene configuration if needed.
-        if (!configuration) {
-            this._imageProcessingConfiguration = this.getScene().imageProcessingConfiguration;
-        } else {
-            this._imageProcessingConfiguration = configuration;
-        }
-
-        // Attaches observer.
-        if (this._imageProcessingConfiguration) {
-            this._imageProcessingObserver = this._imageProcessingConfiguration.onUpdateParameters.add(() => {
-                this._markAllSubMeshesAsImageProcessingDirty();
-            });
-        }
-    }
-
     /**
      * Get a block by its name
      * @param name defines the name of the block to retrieve

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

@@ -5,6 +5,7 @@ export * from "./pbrBRDFConfiguration";
 export * from "./pbrClearCoatConfiguration";
 export * from "./pbrIridescenceConfiguration";
 export * from "./pbrMaterial";
+export * from "./openPbrMaterial";
 export * from "./pbrMetallicRoughnessMaterial";
 export * from "./pbrSpecularGlossinessMaterial";
 export * from "./pbrSheenConfiguration";
@@ -15,3 +16,7 @@ export * from "../../ShadersWGSL/pbr.vertex";
 export * from "../../ShadersWGSL/pbr.fragment";
 export * from "../../Shaders/pbr.vertex";
 export * from "../../Shaders/pbr.fragment";
+export * from "../../ShadersWGSL/openpbr.vertex";
+export * from "../../ShadersWGSL/openpbr.fragment";
+export * from "../../Shaders/openpbr.vertex";
+export * from "../../Shaders/openpbr.fragment";