@babylonjs/core 6.44.0 → 6.45.0

package/Materials/standardMaterial.js

@@ -12,7 +12,6 @@ import { Material } from "../Materials/material.js";
 import { MaterialPluginEvent } from "./materialPluginEvent.js";
 import { MaterialDefines } from "../Materials/materialDefines.js";
 import { PushMaterial } from "./pushMaterial.js";
-import { MaterialHelper } from "./materialHelper.js";
 import { Texture } from "../Materials/Textures/texture.js";
 import { RegisterClass } from "../Misc/typeStore.js";
 import { MaterialFlags } from "./materialFlags.js";
@@ -22,6 +21,7 @@ import "../Shaders/default.vertex.js";
 import { EffectFallbacks } from "./effectFallbacks.js";
 import { DetailMapConfiguration } from "./material.detailMapConfiguration.js";
 import { addClipPlaneUniforms, bindClipPlane } from "./clipPlaneMaterialHelper.js";
+import { BindBonesParameters, BindFogParameters, BindLights, BindLogDepth, BindMorphTargetParameters, BindTextureMatrix, HandleFallbacksForShadows, PrepareAttributesForBakedVertexAnimation, PrepareAttributesForBones, PrepareAttributesForInstances, PrepareAttributesForMorphTargets, PrepareDefinesForAttributes, PrepareDefinesForFrameBoundValues, PrepareDefinesForLights, PrepareDefinesForMergedUV, PrepareDefinesForMisc, PrepareDefinesForMultiview, PrepareDefinesForOIT, PrepareDefinesForPrePass, PrepareUniformsAndSamplersList, } from "./materialHelper.functions.js";
 const onCreatedEffectParameters = { effect: null, subMesh: null };
 /** @internal */
 export class StandardMaterialDefines extends MaterialDefines {
@@ -548,14 +548,14 @@ export class StandardMaterial extends PushMaterial {
         }
         const engine = scene.getEngine();
         // Lights
-        defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, true, this._maxSimultaneousLights, this._disableLighting);
+        defines._needNormals = PrepareDefinesForLights(scene, mesh, defines, true, this._maxSimultaneousLights, this._disableLighting);
         // Multiview
-        MaterialHelper.PrepareDefinesForMultiview(scene, defines);
+        PrepareDefinesForMultiview(scene, defines);
         // PrePass
         const oit = this.needAlphaBlendingForMesh(mesh) && this.getScene().useOrderIndependentTransparency;
-        MaterialHelper.PrepareDefinesForPrePass(scene, defines, this.canRenderToMRT && !oit);
+        PrepareDefinesForPrePass(scene, defines, this.canRenderToMRT && !oit);
         // Order independant transparency
-        MaterialHelper.PrepareDefinesForOIT(scene, defines, oit);
+        PrepareDefinesForOIT(scene, defines, oit);
         // Textures
         if (defines._areTexturesDirty) {
             this._eventInfo.hasRenderTargetTextures = false;
@@ -578,7 +578,7 @@ export class StandardMaterial extends PushMaterial {
                         return false;
                     }
                     else {
-                        MaterialHelper.PrepareDefinesForMergedUV(this._diffuseTexture, defines, "DIFFUSE");
+                        PrepareDefinesForMergedUV(this._diffuseTexture, defines, "DIFFUSE");
                     }
                 }
                 else {
@@ -589,7 +589,7 @@ export class StandardMaterial extends PushMaterial {
                         return false;
                     }
                     else {
-                        MaterialHelper.PrepareDefinesForMergedUV(this._ambientTexture, defines, "AMBIENT");
+                        PrepareDefinesForMergedUV(this._ambientTexture, defines, "AMBIENT");
                     }
                 }
                 else {
@@ -600,7 +600,7 @@ export class StandardMaterial extends PushMaterial {
                         return false;
                     }
                     else {
-                        MaterialHelper.PrepareDefinesForMergedUV(this._opacityTexture, defines, "OPACITY");
+                        PrepareDefinesForMergedUV(this._opacityTexture, defines, "OPACITY");
                         defines.OPACITYRGB = this._opacityTexture.getAlphaFromRGB;
                     }
                 }
@@ -664,7 +664,7 @@ export class StandardMaterial extends PushMaterial {
                         return false;
                     }
                     else {
-                        MaterialHelper.PrepareDefinesForMergedUV(this._emissiveTexture, defines, "EMISSIVE");
+                        PrepareDefinesForMergedUV(this._emissiveTexture, defines, "EMISSIVE");
                     }
                 }
                 else {
@@ -675,7 +675,7 @@ export class StandardMaterial extends PushMaterial {
                         return false;
                     }
                     else {
-                        MaterialHelper.PrepareDefinesForMergedUV(this._lightmapTexture, defines, "LIGHTMAP");
+                        PrepareDefinesForMergedUV(this._lightmapTexture, defines, "LIGHTMAP");
                         defines.USELIGHTMAPASSHADOWMAP = this._useLightmapAsShadowmap;
                         defines.RGBDLIGHTMAP = this._lightmapTexture.isRGBD;
                     }
@@ -688,7 +688,7 @@ export class StandardMaterial extends PushMaterial {
                         return false;
                     }
                     else {
-                        MaterialHelper.PrepareDefinesForMergedUV(this._specularTexture, defines, "SPECULAR");
+                        PrepareDefinesForMergedUV(this._specularTexture, defines, "SPECULAR");
                         defines.GLOSSINESS = this._useGlossinessFromSpecularMapAlpha;
                     }
                 }
@@ -701,7 +701,7 @@ export class StandardMaterial extends PushMaterial {
                         return false;
                     }
                     else {
-                        MaterialHelper.PrepareDefinesForMergedUV(this._bumpTexture, defines, "BUMP");
+                        PrepareDefinesForMergedUV(this._bumpTexture, defines, "BUMP");
                         defines.PARALLAX = this._useParallax;
                         defines.PARALLAX_RHS = scene.useRightHandedSystem;
                         defines.PARALLAXOCCLUSION = this._useParallaxOcclusion;
@@ -787,15 +787,15 @@ export class StandardMaterial extends PushMaterial {
             }
         }
         // Misc.
-        MaterialHelper.PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh) || this._forceAlphaTest, defines, this._applyDecalMapAfterDetailMap);
+        PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh) || this._forceAlphaTest, defines, this._applyDecalMapAfterDetailMap);
         // Values that need to be evaluated on every frame
-        MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, this, defines, useInstances, null, subMesh.getRenderingMesh().hasThinInstances);
+        PrepareDefinesForFrameBoundValues(scene, engine, this, defines, useInstances, null, subMesh.getRenderingMesh().hasThinInstances);
         // External config
         this._eventInfo.defines = defines;
         this._eventInfo.mesh = mesh;
         this._callbackPluginEventPrepareDefinesBeforeAttributes(this._eventInfo);
         // Attribs
-        MaterialHelper.PrepareDefinesForAttributes(mesh, defines, true, true, true);
+        PrepareDefinesForAttributes(mesh, defines, true, true, true);
         // External config
         this._callbackPluginEventPrepareDefines(this._eventInfo);
         // Get correct effect
@@ -835,7 +835,7 @@ export class StandardMaterial extends PushMaterial {
             if (defines.LOGARITHMICDEPTH) {
                 fallbacks.addFallback(0, "LOGARITHMICDEPTH");
             }
-            MaterialHelper.HandleFallbacksForShadows(defines, fallbacks, this._maxSimultaneousLights);
+            HandleFallbacksForShadows(defines, fallbacks, this._maxSimultaneousLights);
             if (defines.SPECULARTERM) {
                 fallbacks.addFallback(0, "SPECULARTERM");
             }
@@ -873,10 +873,10 @@ export class StandardMaterial extends PushMaterial {
             if (defines.VERTEXCOLOR) {
                 attribs.push(VertexBuffer.ColorKind);
             }
-            MaterialHelper.PrepareAttributesForBones(attribs, mesh, defines, fallbacks);
-            MaterialHelper.PrepareAttributesForInstances(attribs, defines);
-            MaterialHelper.PrepareAttributesForMorphTargets(attribs, mesh, defines);
-            MaterialHelper.PrepareAttributesForBakedVertexAnimation(attribs, mesh, defines);
+            PrepareAttributesForBones(attribs, mesh, defines, fallbacks);
+            PrepareAttributesForInstances(attribs, defines);
+            PrepareAttributesForMorphTargets(attribs, mesh, defines);
+            PrepareAttributesForBakedVertexAnimation(attribs, mesh, defines);
             let shaderName = "default";
             const uniforms = [
                 "world",
@@ -968,7 +968,7 @@ export class StandardMaterial extends PushMaterial {
                 ImageProcessingConfiguration.PrepareUniforms(uniforms, defines);
                 ImageProcessingConfiguration.PrepareSamplers(samplers, defines);
             }
-            MaterialHelper.PrepareUniformsAndSamplersList({
+            PrepareUniformsAndSamplersList({
                 uniformsNames: uniforms,
                 uniformBuffersNames: uniformBuffers,
                 samplers: samplers,
@@ -1108,7 +1108,7 @@ export class StandardMaterial extends PushMaterial {
         }
         const mustRebind = this._mustRebind(scene, effect, subMesh, mesh.visibility);
         // Bones
-        MaterialHelper.BindBonesParameters(mesh, effect);
+        BindBonesParameters(mesh, effect);
         const ubo = this._uniformBuffer;
         if (mustRebind) {
             this.bindViewProjection(effect);
@@ -1139,15 +1139,15 @@ export class StandardMaterial extends PushMaterial {
                 if (scene.texturesEnabled) {
                     if (this._diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {
                         ubo.updateFloat2("vDiffuseInfos", this._diffuseTexture.coordinatesIndex, this._diffuseTexture.level);
-                        MaterialHelper.BindTextureMatrix(this._diffuseTexture, ubo, "diffuse");
+                        BindTextureMatrix(this._diffuseTexture, ubo, "diffuse");
                     }
                     if (this._ambientTexture && StandardMaterial.AmbientTextureEnabled) {
                         ubo.updateFloat2("vAmbientInfos", this._ambientTexture.coordinatesIndex, this._ambientTexture.level);
-                        MaterialHelper.BindTextureMatrix(this._ambientTexture, ubo, "ambient");
+                        BindTextureMatrix(this._ambientTexture, ubo, "ambient");
                     }
                     if (this._opacityTexture && StandardMaterial.OpacityTextureEnabled) {
                         ubo.updateFloat2("vOpacityInfos", this._opacityTexture.coordinatesIndex, this._opacityTexture.level);
-                        MaterialHelper.BindTextureMatrix(this._opacityTexture, ubo, "opacity");
+                        BindTextureMatrix(this._opacityTexture, ubo, "opacity");
                     }
                     if (this._hasAlphaChannel()) {
                         ubo.updateFloat("alphaCutOff", this.alphaCutOff);
@@ -1163,19 +1163,19 @@ export class StandardMaterial extends PushMaterial {
                     }
                     if (this._emissiveTexture && StandardMaterial.EmissiveTextureEnabled) {
                         ubo.updateFloat2("vEmissiveInfos", this._emissiveTexture.coordinatesIndex, this._emissiveTexture.level);
-                        MaterialHelper.BindTextureMatrix(this._emissiveTexture, ubo, "emissive");
+                        BindTextureMatrix(this._emissiveTexture, ubo, "emissive");
                     }
                     if (this._lightmapTexture && StandardMaterial.LightmapTextureEnabled) {
                         ubo.updateFloat2("vLightmapInfos", this._lightmapTexture.coordinatesIndex, this._lightmapTexture.level);
-                        MaterialHelper.BindTextureMatrix(this._lightmapTexture, ubo, "lightmap");
+                        BindTextureMatrix(this._lightmapTexture, ubo, "lightmap");
                     }
                     if (this._specularTexture && StandardMaterial.SpecularTextureEnabled) {
                         ubo.updateFloat2("vSpecularInfos", this._specularTexture.coordinatesIndex, this._specularTexture.level);
-                        MaterialHelper.BindTextureMatrix(this._specularTexture, ubo, "specular");
+                        BindTextureMatrix(this._specularTexture, ubo, "specular");
                     }
                     if (this._bumpTexture && scene.getEngine().getCaps().standardDerivatives && StandardMaterial.BumpTextureEnabled) {
                         ubo.updateFloat3("vBumpInfos", this._bumpTexture.coordinatesIndex, 1.0 / this._bumpTexture.level, this.parallaxScaleBias);
-                        MaterialHelper.BindTextureMatrix(this._bumpTexture, ubo, "bump");
+                        BindTextureMatrix(this._bumpTexture, ubo, "bump");
                         if (scene._mirroredCameraPosition) {
                             ubo.updateFloat2("vTangentSpaceParams", this._invertNormalMapX ? 1.0 : -1.0, this._invertNormalMapY ? 1.0 : -1.0);
                         }
@@ -1268,7 +1268,7 @@ export class StandardMaterial extends PushMaterial {
         if (mustRebind || !this.isFrozen) {
             // Lights
             if (scene.lightsEnabled && !this._disableLighting) {
-                MaterialHelper.BindLights(scene, mesh, effect, defines, this._maxSimultaneousLights);
+                BindLights(scene, mesh, effect, defines, this._maxSimultaneousLights);
             }
             // View
             if ((scene.fogEnabled && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE) ||
@@ -1279,17 +1279,17 @@ export class StandardMaterial extends PushMaterial {
                 this.bindView(effect);
             }
             // Fog
-            MaterialHelper.BindFogParameters(scene, mesh, effect);
+            BindFogParameters(scene, mesh, effect);
             // Morph targets
             if (defines.NUM_MORPH_INFLUENCERS) {
-                MaterialHelper.BindMorphTargetParameters(mesh, effect);
+                BindMorphTargetParameters(mesh, effect);
             }
             if (defines.BAKED_VERTEX_ANIMATION_TEXTURE) {
                 mesh.bakedVertexAnimationManager?.bind(effect, defines.INSTANCES);
             }
             // Log. depth
             if (this.useLogarithmicDepth) {
-                MaterialHelper.BindLogDepth(defines, effect, scene);
+                BindLogDepth(defines, effect, scene);
             }
             // image processing
             if (this._imageProcessingConfiguration && !this._imageProcessingConfiguration.applyByPostProcess) {