feat(PBR): add for support for combined RM/ORM texture

fixes #2961

Author: daker

Sources/IO/Geometry/GLTFImporter/Reader.js

@@ -252,25 +252,18 @@ async function createPropertyFromGLTFMaterial(model, material, actor) {
       }
     }
 
+    // Handle metallic-roughness texture (metallicRoughnessTexture)
     if (pbr.metallicRoughnessTexture) {
       const extensions = pbr.metallicRoughnessTexture.extensions;
       const tex = pbr.metallicRoughnessTexture.texture;
       const sampler = tex.sampler;
-      const metallicImage = await loadImage(tex.source, 'b');
-      const metallicTex = createVTKTextureFromGLTFTexture(
-        metallicImage,
+      const rmImage = await loadImage(tex.source);
+      const rmTex = createVTKTextureFromGLTFTexture(
+        rmImage,
         sampler,
         extensions
       );
-      property.setMetallicTexture(metallicTex);
-
-      const roughnessImage = await loadImage(tex.source, 'g');
-      const roughnessTex = createVTKTextureFromGLTFTexture(
-        roughnessImage,
-        sampler,
-        extensions
-      );
-      property.setRoughnessTexture(roughnessTex);
+      property.setRMTexture(rmTex);
     }
 
     // Handle ambient occlusion texture (occlusionTexture)

Sources/Rendering/Core/Property/index.d.ts

@@ -1,5 +1,5 @@
 import { vtkObject } from '../../../interfaces';
-import { RGBColor } from '../../../types';
+import { Nullable, RGBColor } from '../../../types';
 import { Interpolation, Representation, Shading } from './Constants';
 import { vtkTexture } from '../../Core/Texture';
 
@@ -14,6 +14,8 @@ export interface IPropertyInitialValues {
   normalTexture?: vtkTexture;
   ambientOcclusionTexture?: vtkTexture;
   emissionTexture?: vtkTexture;
+  RMTexture?: vtkTexture;
+  ORMTexture?: vtkTexture;
   edgeColor?: RGBColor;
   ambient?: number;
   diffuse?: number;
@@ -216,32 +218,42 @@ export interface vtkProperty extends vtkObject {
   /**
    * Get the diffuse texture.
    */
-  getDiffuseTexture(): vtkTexture;
+  getDiffuseTexture(): Nullable<vtkTexture>;
 
   /**
    * Get the metallic texture.
    */
-  getMetallicTexture(): vtkTexture;
+  getMetallicTexture(): Nullable<vtkTexture>;
+
+  /**
+   * Get the roughness & metallic texture.
+   */
+  getRMTexture(): Nullable<vtkTexture>;
+
+  /**
+   * Get the occlusion, roughness & metallic texture.
+   */
+  getORMTexture(): Nullable<vtkTexture>;
 
   /**
    * Get the roughness texture.
    */
-  getRoughnessTexture(): vtkTexture;
+  getRoughnessTexture(): Nullable<vtkTexture>;
 
   /**
    * Get the normal texture.
    */
-  getNormalTexture(): vtkTexture;
+  getNormalTexture(): Nullable<vtkTexture>;
 
   /**
    * Get the ambient occlusion texture.
    */
-  getAmbientOcclusionTexture(): vtkTexture;
+  getAmbientOcclusionTexture(): Nullable<vtkTexture>;
 
   /**
    * Get the emission texture.
    */
-  getEmissionTexture(): vtkTexture;
+  getEmissionTexture(): Nullable<vtkTexture>;
 
   /**
    * Set the ambient lighting coefficient.
@@ -500,6 +512,18 @@ export interface vtkProperty extends vtkObject {
    */
   setRoughnessTexture(roughnessTexture: vtkTexture): boolean;
 
+  /**
+   * Set the roughness & metallic texture.
+   * @param {vtkTexture} RMTexture
+   */
+  setRMTexture(RMTexture: vtkTexture): boolean;
+
+  /**
+   * Set the occlusion, roughness & metallic texture.
+   * @param {vtkTexture} ORMTexture
+   */
+  setORMTexture(ORMTexture: vtkTexture): boolean;
+
   /**
    * Set the normal texture.
    * @param {vtkTexture} normalTexture

Sources/Rendering/Core/Property/index.js

@@ -127,6 +127,9 @@ const DEFAULT_VALUES = {
 
   shading: false,
   materialName: null,
+
+  ORMTexture: null,
+  RMTexture: null,
 };
 
 // ----------------------------------------------------------------------------
@@ -162,6 +165,8 @@ export function extend(publicAPI, model, initialValues = {}) {
     'normalTexture',
     'ambientOcclusionTexture',
     'emissionTexture',
+    'ORMTexture',
+    'RMTexture',
   ]);
   macro.setGetArray(
     publicAPI,

Sources/Rendering/WebGPU/CellArrayMapper/index.js

@@ -819,6 +819,7 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
     code = fDesc.getCode();
 
     const actor = model.WebGPUActor.getRenderable();
+    const property = actor.getProperty();
 
     const checkDims = (texture) => {
       if (!texture) return false;
@@ -827,15 +828,16 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
     };
 
     const usedTextures = [];
+    const diffuseTexture = property.getDiffuseTexture?.();
 
     if (
-      actor.getProperty().getDiffuseTexture?.()?.getImageLoaded() ||
+      diffuseTexture?.getImageLoaded() ||
       actor.getTextures()[0] ||
       model.colorTexture
     ) {
       if (
         // Chained or statements here are questionable
-        checkDims(actor.getProperty().getDiffuseTexture?.()) ||
+        checkDims(diffuseTexture) ||
         checkDims(actor.getTextures()[0]) ||
         checkDims(model.colorTexture)
       ) {
@@ -844,38 +846,65 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
         );
       }
     }
-    if (actor.getProperty().getRoughnessTexture?.()?.getImageLoaded()) {
-      if (checkDims(actor.getProperty().getRoughnessTexture())) {
+
+    const ormTexture = property.getORMTexture?.();
+    const rmTexture = property.getRMTexture?.();
+    const roughnessTexture = property.getRoughnessTexture?.();
+    const metallicTexture = property.getMetallicTexture?.();
+    const ambientOcclusionTexture = property.getAmbientOcclusionTexture?.();
+    const emissionTexture = property.getEmissionTexture?.();
+    const normalTexture = property.getNormalTexture?.();
+
+    // ORM texture support: if present, sample R/G/B for AO/Roughness/Metallic
+    if (ormTexture?.getImageLoaded()) {
+      if (checkDims(ormTexture)) {
         usedTextures.push(
-          '_roughnessMap = textureSample(RoughnessTexture, RoughnessTextureSampler, input.tcoordVS);'
+          '_ambientOcclusionMap = textureSample(ORMTexture, ORMTextureSampler, input.tcoordVS).rrra;',
+          '_roughnessMap = textureSample(ORMTexture, ORMTextureSampler, input.tcoordVS).ggga;',
+          '_metallicMap = textureSample(ORMTexture, ORMTextureSampler, input.tcoordVS).bbba;'
         );
       }
-    }
-    if (actor.getProperty().getMetallicTexture?.()?.getImageLoaded()) {
-      if (checkDims(actor.getProperty().getMetallicTexture())) {
+    } else if (rmTexture?.getImageLoaded()) {
+      if (checkDims(rmTexture)) {
         usedTextures.push(
-          '_metallicMap = textureSample(MetallicTexture, MetallicTextureSampler, input.tcoordVS);'
+          '_roughnessMap = textureSample(RMTexture, RMTextureSampler, input.tcoordVS).ggga;',
+          '_metallicMap = textureSample(RMTexture, RMTextureSampler, input.tcoordVS).bbba;'
         );
       }
-    }
-    if (actor.getProperty().getNormalTexture?.()?.getImageLoaded()) {
-      if (checkDims(actor.getProperty().getNormalTexture())) {
-        usedTextures.push(
-          '_normalMap = textureSample(NormalTexture, NormalTextureSampler, input.tcoordVS);'
-        );
+    } else {
+      if (roughnessTexture?.getImageLoaded()) {
+        if (checkDims(roughnessTexture)) {
+          usedTextures.push(
+            '_roughnessMap = textureSample(RoughnessTexture, RoughnessTextureSampler, input.tcoordVS);'
+          );
+        }
+      }
+      if (metallicTexture?.getImageLoaded()) {
+        if (checkDims(metallicTexture)) {
+          usedTextures.push(
+            '_metallicMap = textureSample(MetallicTexture, MetallicTextureSampler, input.tcoordVS);'
+          );
+        }
+      }
+      if (ambientOcclusionTexture?.getImageLoaded()) {
+        if (checkDims(ambientOcclusionTexture)) {
+          usedTextures.push(
+            '_ambientOcclusionMap = textureSample(AmbientOcclusionTexture, AmbientOcclusionTextureSampler, input.tcoordVS);'
+          );
+        }
       }
     }
-    if (actor.getProperty().getAmbientOcclusionTexture?.()?.getImageLoaded()) {
-      if (checkDims(actor.getProperty().getAmbientOcclusionTexture())) {
+    if (emissionTexture?.getImageLoaded()) {
+      if (checkDims(emissionTexture)) {
         usedTextures.push(
-          '_ambientOcclusionMap = textureSample(AmbientOcclusionTexture, AmbientOcclusionTextureSampler, input.tcoordVS);'
+          '_emissionMap = textureSample(EmissionTexture, EmissionTextureSampler, input.tcoordVS);'
         );
       }
     }
-    if (actor.getProperty().getEmissionTexture?.()?.getImageLoaded()) {
-      if (checkDims(actor.getProperty().getEmissionTexture())) {
+    if (normalTexture?.getImageLoaded()) {
+      if (checkDims(normalTexture)) {
         usedTextures.push(
-          '_emissionMap = textureSample(EmissionTexture, EmissionTextureSampler, input.tcoordVS);'
+          '_normalMap = textureSample(NormalTexture, NormalTextureSampler, input.tcoordVS);'
         );
       }
     }
@@ -1146,6 +1175,14 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       const pair = ['Diffuse', model.colorTexture];
       textures.push(pair);
     }
+    if (actor.getProperty().getORMTexture?.()) {
+      const pair = ['ORM', actor.getProperty().getORMTexture()];
+      textures.push(pair);
+    }
+    if (actor.getProperty().getRMTexture?.()) {
+      const pair = ['RM', actor.getProperty().getRMTexture()];
+      textures.push(pair);
+    }
     if (actor.getProperty().getRoughnessTexture?.()) {
       const pair = ['Roughness', actor.getProperty().getRoughnessTexture()];
       textures.push(pair);