OpenPBRMaterial export to glTF for diffuse roughness

Author: Mike Bond

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

@@ -6,10 +6,6 @@ import type { Observer } from "../Misc/observable";
 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";
-
 type ImageProcessingMixinConstructor<T = {}> = new (...args: any[]) => T;
 
 /**

packages/dev/inspector/src/components/actionTabs/tabs/propertyGridTabComponent.tsx

@@ -398,7 +398,9 @@ export class PropertyGridTabComponent extends PaneComponent {
                         onPropertyChangedObservable={this.props.onPropertyChangedObservable}
                     />
                 );
-            } else if (className === "OpenPBRMaterial") {
+            }
+
+            if (className === "OpenPBRMaterial") {
                 const material = entity as OpenPBRMaterial;
                 return (
                     <OpenPBRMaterialPropertyGridComponent

packages/dev/serializers/src/glTF/2.0/Extensions/EXT_materials_diffuse_roughness.ts

@@ -4,6 +4,8 @@ import { GLTFExporter } from "../glTFExporter";
 import type { Material } from "core/Materials/material";
 import { PBRBaseMaterial } from "core/Materials/PBR/pbrBaseMaterial";
 import type { BaseTexture } from "core/Materials/Textures/baseTexture";
+import { OpenPBRMaterial } from "core/Materials/PBR/openPbrMaterial";
+import type { Nullable } from "core/types";
 
 const NAME = "EXT_materials_diffuse_roughness";
 
@@ -45,6 +47,13 @@ export class EXT_materials_diffuse_roughness implements IGLTFExporterExtensionV2
                 }
                 return additionalTextures;
             }
+        } else if (babylonMaterial instanceof OpenPBRMaterial) {
+            if (babylonMaterial.baseDiffuseRoughness) {
+                if (babylonMaterial.baseDiffuseRoughnessTexture) {
+                    additionalTextures.push(babylonMaterial.baseDiffuseRoughnessTexture);
+                }
+                return additionalTextures;
+            }
         }
 
         return [];
@@ -53,29 +62,37 @@ export class EXT_materials_diffuse_roughness implements IGLTFExporterExtensionV2
     // eslint-disable-next-line no-restricted-syntax
     public postExportMaterialAsync?(context: string, node: IMaterial, babylonMaterial: Material): Promise<IMaterial> {
         return new Promise((resolve) => {
+            let diffuseRoughnessFactor: Nullable<number> = null;
+            let diffuseRoughnessTexture: Nullable<BaseTexture> = null;
             if (babylonMaterial instanceof PBRBaseMaterial) {
-                if (!babylonMaterial._baseDiffuseRoughness) {
-                    resolve(node);
-                    return;
-                }
-
-                this._wasUsed = true;
+                diffuseRoughnessFactor = babylonMaterial._baseDiffuseRoughness;
+                diffuseRoughnessTexture = babylonMaterial._baseDiffuseRoughnessTexture;
+            } else if (babylonMaterial instanceof OpenPBRMaterial) {
+                diffuseRoughnessFactor = babylonMaterial.baseDiffuseRoughness;
+                diffuseRoughnessTexture = babylonMaterial.baseDiffuseRoughnessTexture;
+            }
+            if (!diffuseRoughnessFactor) {
+                resolve(node);
+                return;
+            }
 
-                node.extensions = node.extensions || {};
+            this._wasUsed = true;
 
-                const diffuseRoughnessTextureInfo = this._exporter._materialExporter.getTextureInfo(babylonMaterial._baseDiffuseRoughnessTexture);
+            node.extensions = node.extensions || {};
 
-                const diffuseRoughnessInfo: IEXTMaterialsDiffuseRoughness = {
-                    diffuseRoughnessFactor: babylonMaterial._baseDiffuseRoughness,
-                    diffuseRoughnessTexture: diffuseRoughnessTextureInfo ?? undefined,
-                };
+            const diffuseRoughnessTextureInfo = this._exporter._materialExporter.getTextureInfo(diffuseRoughnessTexture);
 
-                if (diffuseRoughnessInfo.diffuseRoughnessTexture !== null) {
-                    this._exporter._materialNeedsUVsSet.add(babylonMaterial);
-                }
+            const diffuseRoughnessInfo: IEXTMaterialsDiffuseRoughness = {
+                diffuseRoughnessFactor: diffuseRoughnessFactor,
+                diffuseRoughnessTexture: diffuseRoughnessTextureInfo ?? undefined,
+            };
 
-                node.extensions[NAME] = diffuseRoughnessInfo;
+            if (diffuseRoughnessInfo.diffuseRoughnessTexture !== null) {
+                this._exporter._materialNeedsUVsSet.add(babylonMaterial);
             }
+
+            node.extensions[NAME] = diffuseRoughnessInfo;
+
             resolve(node);
         });
     }