@onerjs/core 8.30.3 → 8.30.5

package/Materials/PBR/openpbrMaterial.d.ts

@@ -80,9 +80,11 @@ export declare class OpenPBRMaterialDefines extends OpenPBRMaterialDefines_base
     SPECULAR_WEIGHT_IN_ALPHA: boolean;
     SPECULAR_WEIGHT_FROM_SPECULAR_COLOR_TEXTURE: boolean;
     SPECULAR_ROUGHNESS_ANISOTROPY_FROM_TANGENT_TEXTURE: boolean;
+    COAT_ROUGHNESS_FROM_GREEN_CHANNEL: boolean;
     COAT_ROUGHNESS_ANISOTROPY_FROM_TANGENT_TEXTURE: boolean;
     USE_GLTF_STYLE_ANISOTROPY: boolean;
     THIN_FILM_THICKNESS_FROM_THIN_FILM_TEXTURE: boolean;
+    FUZZ_ROUGHNESS_FROM_TEXTURE_ALPHA: boolean;
     ENVIRONMENTBRDF: boolean;
     ENVIRONMENTBRDF_RGBD: boolean;
     FUZZENVIRONMENTBRDF: boolean;
@@ -787,12 +789,24 @@ export declare class OpenPBRMaterial extends OpenPBRMaterialBase {
      * @internal
      */
     _useCoatRoughnessAnisotropyFromTangentTexture: boolean;
+    /**
+     * Specifies whether the coat roughness is taken from the green channel of the coat texture.
+     * This is for compatibility with glTF's KHR_materials_clearcoat and KHR_materials_coat extensions.
+     * @internal
+     */
+    _useCoatRoughnessFromGreenChannel: boolean;
     /**
      * Assume the anisotropy data is stored in the format specified by
      * KHR_materials_anisotropy.
      * @internal
      */
     _useGltfStyleAnisotropy: boolean;
+    /**
+     * Specifies that the fuzz roughness is stored in the alpha channel of the texture.
+     * This is for compatibility with glTF where the fuzz roughness is often stored in
+     * the alpha channel of the fuzz color texture.
+     */
+    _useFuzzRoughnessFromTextureAlpha: boolean;
     /**
      * This parameters will enable/disable Horizon occlusion to prevent normal maps to look shiny when the normal
      * makes the reflect vector face the model (under horizon).

package/Materials/PBR/openpbrMaterial.js

@@ -176,9 +176,11 @@ export class OpenPBRMaterialDefines extends ImageProcessingDefinesMixin(OpenPBRM
         this.SPECULAR_WEIGHT_IN_ALPHA = false;
         this.SPECULAR_WEIGHT_FROM_SPECULAR_COLOR_TEXTURE = false;
         this.SPECULAR_ROUGHNESS_ANISOTROPY_FROM_TANGENT_TEXTURE = false;
+        this.COAT_ROUGHNESS_FROM_GREEN_CHANNEL = false;
         this.COAT_ROUGHNESS_ANISOTROPY_FROM_TANGENT_TEXTURE = false;
         this.USE_GLTF_STYLE_ANISOTROPY = false;
         this.THIN_FILM_THICKNESS_FROM_THIN_FILM_TEXTURE = false;
+        this.FUZZ_ROUGHNESS_FROM_TEXTURE_ALPHA = false;
         this.ENVIRONMENTBRDF = false;
         this.ENVIRONMENTBRDF_RGBD = false;
         this.FUZZENVIRONMENTBRDF = false;
@@ -698,12 +700,24 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
          * @internal
          */
         this._useCoatRoughnessAnisotropyFromTangentTexture = false;
+        /**
+         * Specifies whether the coat roughness is taken from the green channel of the coat texture.
+         * This is for compatibility with glTF's KHR_materials_clearcoat and KHR_materials_coat extensions.
+         * @internal
+         */
+        this._useCoatRoughnessFromGreenChannel = false;
         /**
          * Assume the anisotropy data is stored in the format specified by
          * KHR_materials_anisotropy.
          * @internal
          */
         this._useGltfStyleAnisotropy = false;
+        /**
+         * Specifies that the fuzz roughness is stored in the alpha channel of the texture.
+         * This is for compatibility with glTF where the fuzz roughness is often stored in
+         * the alpha channel of the fuzz color texture.
+         */
+        this._useFuzzRoughnessFromTextureAlpha = false;
         /**
          * This parameters will enable/disable Horizon occlusion to prevent normal maps to look shiny when the normal
          * makes the reflect vector face the model (under horizon).
@@ -1794,7 +1808,9 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                 defines.SPECULAR_WEIGHT_FROM_SPECULAR_COLOR_TEXTURE = this._useSpecularWeightFromSpecularColorTexture;
                 defines.SPECULAR_ROUGHNESS_ANISOTROPY_FROM_TANGENT_TEXTURE = this._useSpecularRoughnessAnisotropyFromTangentTexture;
                 defines.COAT_ROUGHNESS_ANISOTROPY_FROM_TANGENT_TEXTURE = this._useCoatRoughnessAnisotropyFromTangentTexture;
+                defines.COAT_ROUGHNESS_FROM_GREEN_CHANNEL = this._useCoatRoughnessFromGreenChannel;
                 defines.ROUGHNESSSTOREINMETALMAPGREEN = this._useRoughnessFromMetallicTextureGreen;
+                defines.FUZZ_ROUGHNESS_FROM_TEXTURE_ALPHA = this._useFuzzRoughnessFromTextureAlpha;
                 defines.METALLNESSSTOREINMETALMAPBLUE = this._useMetallicFromMetallicTextureBlue;
                 defines.THIN_FILM_THICKNESS_FROM_THIN_FILM_TEXTURE = this._useThinFilmThicknessFromTextureGreen;
                 if (this.geometryNormalTexture) {