@babylonjs/core 6.41.0 → 6.41.2

package/Lights/Shadows/shadowGenerator.js

@@ -466,8 +466,7 @@ export class ShadowGenerator {
         return this._light;
     }
     _getCamera() {
-        var _a;
-        return (_a = this._camera) !== null && _a !== void 0 ? _a : this._scene.activeCamera;
+        return this._camera ?? this._scene.activeCamera;
     }
     /**
      * Gets or sets the size of the texture what stores the shadows
@@ -556,7 +555,7 @@ export class ShadowGenerator {
         this._mapSize = mapSize;
         this._light = light;
         this._scene = light.getScene();
-        this._camera = camera !== null && camera !== void 0 ? camera : null;
+        this._camera = camera ?? null;
         this._useRedTextureType = !!useRedTextureType;
         let shadowGenerators = light._shadowGenerators;
         if (!shadowGenerators) {
@@ -636,9 +635,8 @@ export class ShadowGenerator {
         };
         const engine = this._scene.getEngine();
         this._shadowMap.onBeforeBindObservable.add(() => {
-            var _a;
             this._currentSceneUBO = this._scene.getSceneUniformBuffer();
-            (_a = engine._debugPushGroup) === null || _a === void 0 ? void 0 : _a.call(engine, `shadow map generation for pass id ${engine.currentRenderPassId}`, 1);
+            engine._debugPushGroup?.(`shadow map generation for pass id ${engine.currentRenderPassId}`, 1);
         });
         // Record Face Index before render.
         this._shadowMap.onBeforeRenderObservable.add((faceIndex) => {
@@ -658,7 +656,6 @@ export class ShadowGenerator {
         });
         // Blur if required after render.
         this._shadowMap.onAfterUnbindObservable.add(() => {
-            var _a, _b;
             if (this._sceneUBOs) {
                 this._scene.setSceneUniformBuffer(this._currentSceneUBO);
             }
@@ -667,14 +664,14 @@ export class ShadowGenerator {
                 engine.setColorWrite(true);
             }
             if (!this.useBlurExponentialShadowMap && !this.useBlurCloseExponentialShadowMap) {
-                (_a = engine._debugPopGroup) === null || _a === void 0 ? void 0 : _a.call(engine, 1);
+                engine._debugPopGroup?.(1);
                 return;
             }
             const shadowMap = this.getShadowMapForRendering();
             if (shadowMap) {
                 this._scene.postProcessManager.directRender(this._blurPostProcesses, shadowMap.renderTarget, true);
                 engine.unBindFramebuffer(shadowMap.renderTarget, true);
-                (_b = engine._debugPopGroup) === null || _b === void 0 ? void 0 : _b.call(engine, 1);
+                engine._debugPopGroup?.(1);
             }
         });
         // Clear according to the chosen filter.
@@ -770,7 +767,6 @@ export class ShadowGenerator {
         effect.setMatrix("viewProjection", this.getTransformMatrix());
     }
     _renderSubMeshForShadowMap(subMesh, isTransparent = false) {
-        var _a, _b;
         const renderingMesh = subMesh.getRenderingMesh();
         const effectiveMesh = subMesh.getEffectiveMesh();
         const scene = this._scene;
@@ -782,7 +778,7 @@ export class ShadowGenerator {
         }
         // Culling
         const detNeg = effectiveMesh._getWorldMatrixDeterminant() < 0;
-        let sideOrientation = (_a = renderingMesh.overrideMaterialSideOrientation) !== null && _a !== void 0 ? _a : material.sideOrientation;
+        let sideOrientation = renderingMesh.overrideMaterialSideOrientation ?? material.sideOrientation;
         if (detNeg) {
             sideOrientation =
                 sideOrientation === 0 ? 1 : 0;
@@ -802,7 +798,7 @@ export class ShadowGenerator {
         if (this.isReady(subMesh, hardwareInstancedRendering, isTransparent)) {
             subMesh._renderId = scene.getRenderId();
             const shadowDepthWrapper = material.shadowDepthWrapper;
-            const drawWrapper = (_b = shadowDepthWrapper === null || shadowDepthWrapper === void 0 ? void 0 : shadowDepthWrapper.getEffect(subMesh, this, engine.currentRenderPassId)) !== null && _b !== void 0 ? _b : subMesh._getDrawWrapper();
+            const drawWrapper = shadowDepthWrapper?.getEffect(subMesh, this, engine.currentRenderPassId) ?? subMesh._getDrawWrapper();
             const effect = DrawWrapper.GetEffect(drawWrapper);
             engine.enableEffect(drawWrapper);
             if (!hardwareInstancedRendering) {
@@ -921,7 +917,10 @@ export class ShadowGenerator {
      * @param options Sets of optional options forcing the compilation with different modes
      */
     forceCompilation(onCompiled, options) {
-        const localOptions = Object.assign({ useInstances: false }, options);
+        const localOptions = {
+            useInstances: false,
+            ...options,
+        };
         const shadowMap = this.getShadowMap();
         if (!shadowMap) {
             if (onCompiled) {
@@ -948,11 +947,10 @@ export class ShadowGenerator {
         }
         let currentIndex = 0;
         const checkReady = () => {
-            var _a, _b;
             if (!this._scene || !this._scene.getEngine()) {
                 return;
             }
-            while (this.isReady(subMeshes[currentIndex], localOptions.useInstances, (_b = (_a = subMeshes[currentIndex].getMaterial()) === null || _a === void 0 ? void 0 : _a.needAlphaBlendingForMesh(subMeshes[currentIndex].getMesh())) !== null && _b !== void 0 ? _b : false)) {
+            while (this.isReady(subMeshes[currentIndex], localOptions.useInstances, subMeshes[currentIndex].getMaterial()?.needAlphaBlendingForMesh(subMeshes[currentIndex].getMesh()) ?? false)) {
                 currentIndex++;
                 if (currentIndex >= subMeshes.length) {
                     if (onCompiled) {
@@ -1003,8 +1001,7 @@ export class ShadowGenerator {
      * @returns true if ready otherwise, false
      */
     isReady(subMesh, useInstances, isTransparent) {
-        var _a;
-        const material = subMesh.getMaterial(), shadowDepthWrapper = material === null || material === void 0 ? void 0 : material.shadowDepthWrapper;
+        const material = subMesh.getMaterial(), shadowDepthWrapper = material?.shadowDepthWrapper;
         this._opacityTexture = null;
         if (!material) {
             return false;
@@ -1043,7 +1040,7 @@ export class ShadowGenerator {
                     if (!this._opacityTexture.isReady()) {
                         return false;
                     }
-                    const alphaCutOff = (_a = material.alphaCutOff) !== null && _a !== void 0 ? _a : ShadowGenerator.DEFAULT_ALPHA_CUTOFF;
+                    const alphaCutOff = material.alphaCutOff ?? ShadowGenerator.DEFAULT_ALPHA_CUTOFF;
                     defines.push("#define ALPHATEXTURE");
                     if (needAlphaTesting) {
                         defines.push(`#define ALPHATESTVALUE ${alphaCutOff}${alphaCutOff % 1 === 0 ? "." : ""}`);
@@ -1088,9 +1085,9 @@ export class ShadowGenerator {
             const manager = mesh.morphTargetManager;
             let morphInfluencers = 0;
             if (manager) {
-                if (manager.numInfluencers > 0) {
+                morphInfluencers = manager.numMaxInfluencers || manager.numInfluencers;
+                if (morphInfluencers > 0) {
                     defines.push("#define MORPHTARGETS");
-                    morphInfluencers = manager.numInfluencers;
                     defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);
                     if (manager.isUsingTextureForTargets) {
                         defines.push("#define MORPHTARGETS_TEXTURE");
@@ -1131,6 +1128,7 @@ export class ShadowGenerator {
                     "depthValuesSM",
                     "biasAndScaleSM",
                     "morphTargetInfluences",
+                    "morphTargetCount",
                     "boneTextureWidth",
                     "softTransparentShadowSM",
                     "morphTargetTextureInfo",
@@ -1433,7 +1431,6 @@ export class ShadowGenerator {
      * @returns The serialized JSON object
      */
     serialize() {
-        var _a;
         const serializationObject = {};
         const shadowMap = this.getShadowMap();
         if (!shadowMap) {
@@ -1441,7 +1438,7 @@ export class ShadowGenerator {
         }
         serializationObject.className = this.getClassName();
         serializationObject.lightId = this._light.id;
-        serializationObject.cameraId = (_a = this._camera) === null || _a === void 0 ? void 0 : _a.id;
+        serializationObject.cameraId = this._camera?.id;
         serializationObject.id = this.id;
         serializationObject.mapSize = shadowMap.getRenderSize();
         serializationObject.forceBackFacesOnly = this.forceBackFacesOnly;