@onerjs/core 8.51.4 → 8.51.5

package/Materials/PBR/openpbrMaterial.js

@@ -197,6 +197,7 @@ export class OpenPBRMaterialDefines extends ImageProcessingDefinesMixin(OpenPBRM
         this.USE_GLTF_STYLE_ANISOTROPY = false;
         this.THIN_FILM_THICKNESS_FROM_THIN_FILM_TEXTURE = false;
         this.FUZZ_ROUGHNESS_FROM_TEXTURE_ALPHA = false;
+        this.SUBSURFACE_WEIGHT_FROM_TEXTURE_ALPHA = false;
         this.GEOMETRY_THICKNESS_FROM_GREEN_CHANNEL = false;
         this.ENVIRONMENTBRDF = false;
         this.ENVIRONMENTBRDF_RGBD = false;
@@ -343,6 +344,7 @@ export class OpenPBRMaterialDefines extends ImageProcessingDefinesMixin(OpenPBRM
         this.SPECULARAA = false;
         this.UNLIT = false;
         this.DECAL_AFTER_DETAIL = false;
+        this.TEXTURE_REPETITION_MODE = 0;
         this.DEBUGMODE = 0;
         this.USE_VERTEX_PULLING = false;
         this.VERTEX_PULLING_USE_INDEX_BUFFER = false;
@@ -838,6 +840,12 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
          * the alpha channel of the fuzz color texture.
          */
         this._useFuzzRoughnessFromTextureAlpha = false;
+        /**
+         * Specifies that the subsurface weight is stored in the alpha channel of the texture.
+         * This is for compatibility with glTF where the subsurface weight is stored in
+         * the alpha channel of the diffuseTransmissionTexture.
+         */
+        this._useSubsurfaceWeightFromTextureAlpha = 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).
@@ -1485,6 +1493,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         ubo.addUniform("vDebugMode", 2);
         ubo.addUniform("renderTargetSize", 2);
         ubo.addUniform("cameraInfo", 4);
+        ubo.addUniform("vTextureRepetitionHexTilingParams", 4);
         ubo.addUniform("backgroundRefractionMatrix", 16);
         ubo.addUniform("vBackgroundRefractionInfos", 3);
         PrepareUniformLayoutForIBL(ubo, true, true, true, true, true);
@@ -1547,6 +1556,8 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         else {
             this._uniformBuffer.updateFloat4("cameraInfo", 0, 0, 0, 0);
         }
+        const hexParams = this.textureRepetitionHexTilingParams;
+        this._uniformBuffer.updateFloat4("vTextureRepetitionHexTilingParams", hexParams[0], hexParams[1], hexParams[2], hexParams[3]);
         this._eventInfo.subMesh = subMesh;
         this._callbackPluginEventHardBindForSubMesh(this._eventInfo);
         // Normal Matrix
@@ -1911,6 +1922,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             "morphTargetTextureInfo",
             "morphTargetTextureIndices",
             "cameraInfo",
+            "vTextureRepetitionHexTilingParams",
             "backgroundRefractionMatrix",
             "vBackgroundRefractionInfos",
         ];
@@ -2067,6 +2079,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                 defines.COAT_ROUGHNESS_FROM_GREEN_CHANNEL = this._useCoatRoughnessFromGreenChannel;
                 defines.SPECULAR_ROUGHNESS_FROM_METALNESS_TEXTURE_GREEN = this._useRoughnessFromMetallicTextureGreen;
                 defines.FUZZ_ROUGHNESS_FROM_TEXTURE_ALPHA = this._useFuzzRoughnessFromTextureAlpha;
+                defines.SUBSURFACE_WEIGHT_FROM_TEXTURE_ALPHA = this._useSubsurfaceWeightFromTextureAlpha;
                 defines.BASE_METALNESS_FROM_METALNESS_TEXTURE_BLUE = this._useMetallicFromMetallicTextureBlue;
                 defines.THIN_FILM_THICKNESS_FROM_THIN_FILM_TEXTURE = this._useThinFilmThicknessFromTextureGreen;
                 defines.GEOMETRY_THICKNESS_FROM_GREEN_CHANNEL = this._useGeometryThicknessFromGreenChannel;
@@ -2154,6 +2167,9 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             defines.PREMULTIPLYALPHA = this.alphaMode === 7 || this.alphaMode === 8;
             defines.ALPHABLEND = this.needAlphaBlendingForMesh(mesh);
         }
+        if (defines._areTexturesDirty) {
+            defines.TEXTURE_REPETITION_MODE = engine.version > 1 || engine.isWebGPU ? this.textureRepetitionMode : 0;
+        }
         if (defines._areImageProcessingDirty && this._imageProcessingConfiguration) {
             this._imageProcessingConfiguration.prepareDefines(defines);
         }