@babylonjs/core 5.26.1 → 5.27.1

package/Meshes/mesh.js

@@ -398,7 +398,8 @@ export class Mesh extends AbstractMesh {
         return this.instances.length > 0;
     }
     get hasThinInstances() {
-        return (this._thinInstanceDataStorage.instancesCount ?? 0) > 0;
+        var _a;
+        return ((_a = this._thinInstanceDataStorage.instancesCount) !== null && _a !== void 0 ? _a : 0) > 0;
     }
     /**
      * Gets or sets the forced number of instances to display.
@@ -714,10 +715,11 @@ export class Mesh extends AbstractMesh {
      * @returns a FloatArray or null if the mesh has no geometry or no vertex buffer for this kind.
      */
     getVerticesData(kind, copyWhenShared, forceCopy) {
+        var _a, _b;
         if (!this._geometry) {
             return null;
         }
-        let data = this._userInstancedBuffersStorage?.vertexBuffers[kind]?.getFloatData(this._geometry.getTotalVertices(), forceCopy || (copyWhenShared && this._geometry.meshes.length !== 1));
+        let data = (_b = (_a = this._userInstancedBuffersStorage) === null || _a === void 0 ? void 0 : _a.vertexBuffers[kind]) === null || _b === void 0 ? void 0 : _b.getFloatData(this._geometry.getTotalVertices(), forceCopy || (copyWhenShared && this._geometry.meshes.length !== 1));
         if (!data) {
             data = this._geometry.getVerticesData(kind, copyWhenShared, forceCopy);
         }
@@ -742,10 +744,11 @@ export class Mesh extends AbstractMesh {
      * @returns a FloatArray or null if the mesh has no vertex buffer for this kind.
      */
     getVertexBuffer(kind) {
+        var _a, _b;
         if (!this._geometry) {
             return null;
         }
-        return this._userInstancedBuffersStorage?.vertexBuffers[kind] ?? this._geometry.getVertexBuffer(kind);
+        return (_b = (_a = this._userInstancedBuffersStorage) === null || _a === void 0 ? void 0 : _a.vertexBuffers[kind]) !== null && _b !== void 0 ? _b : this._geometry.getVertexBuffer(kind);
     }
     /**
      * Tests if a specific vertex buffer is associated with this mesh
@@ -766,13 +769,14 @@ export class Mesh extends AbstractMesh {
      * @returns a boolean
      */
     isVerticesDataPresent(kind) {
+        var _a;
         if (!this._geometry) {
             if (this._delayInfo) {
                 return this._delayInfo.indexOf(kind) !== -1;
             }
             return false;
         }
-        return this._userInstancedBuffersStorage?.vertexBuffers[kind] !== undefined || this._geometry.isVerticesDataPresent(kind);
+        return ((_a = this._userInstancedBuffersStorage) === null || _a === void 0 ? void 0 : _a.vertexBuffers[kind]) !== undefined || this._geometry.isVerticesDataPresent(kind);
     }
     /**
      * Returns a boolean defining if the vertex data for the requested `kind` is updatable.
@@ -792,13 +796,14 @@ export class Mesh extends AbstractMesh {
      * @returns a boolean
      */
     isVertexBufferUpdatable(kind) {
+        var _a, _b;
         if (!this._geometry) {
             if (this._delayInfo) {
                 return this._delayInfo.indexOf(kind) !== -1;
             }
             return false;
         }
-        return this._userInstancedBuffersStorage?.vertexBuffers[kind]?.isUpdatable() || this._geometry.isVertexBufferUpdatable(kind);
+        return ((_b = (_a = this._userInstancedBuffersStorage) === null || _a === void 0 ? void 0 : _a.vertexBuffers[kind]) === null || _b === void 0 ? void 0 : _b.isUpdatable()) || this._geometry.isVertexBufferUpdatable(kind);
     }
     /**
      * Returns a string which contains the list of existing `kinds` of Vertex Data associated with this mesh.
@@ -854,6 +859,7 @@ export class Mesh extends AbstractMesh {
      * @returns true if all associated assets are ready (material, textures, shaders)
      */
     isReady(completeCheck = false, forceInstanceSupport = false) {
+        var _a, _b, _c, _d, _e, _f;
         if (this.delayLoadState === 2) {
             return false;
         }
@@ -899,12 +905,12 @@ export class Mesh extends AbstractMesh {
         const currentRenderPassId = engine.currentRenderPassId;
         for (const light of this.lightSources) {
             const generator = light.getShadowGenerator();
-            if (generator && (!generator.getShadowMap()?.renderList || (generator.getShadowMap()?.renderList && generator.getShadowMap()?.renderList?.indexOf(this) !== -1))) {
+            if (generator && (!((_a = generator.getShadowMap()) === null || _a === void 0 ? void 0 : _a.renderList) || (((_b = generator.getShadowMap()) === null || _b === void 0 ? void 0 : _b.renderList) && ((_d = (_c = generator.getShadowMap()) === null || _c === void 0 ? void 0 : _c.renderList) === null || _d === void 0 ? void 0 : _d.indexOf(this)) !== -1))) {
                 if (generator.getShadowMap()) {
                     engine.currentRenderPassId = generator.getShadowMap().renderPassId;
                 }
                 for (const subMesh of this.subMeshes) {
-                    if (!generator.isReady(subMesh, hardwareInstancedRendering, subMesh.getMaterial()?.needAlphaBlendingForMesh(this) ?? false)) {
+                    if (!generator.isReady(subMesh, hardwareInstancedRendering, (_f = (_e = subMesh.getMaterial()) === null || _e === void 0 ? void 0 : _e.needAlphaBlendingForMesh(this)) !== null && _f !== void 0 ? _f : false)) {
                         engine.currentRenderPassId = currentRenderPassId;
                         return false;
                     }
@@ -1438,6 +1444,7 @@ export class Mesh extends AbstractMesh {
      * @internal
      */
     _renderWithInstances(subMesh, fillMode, batch, effect, engine) {
+        var _a;
         const visibleInstances = batch.visibleInstances[subMesh._id];
         const visibleInstanceCount = visibleInstances ? visibleInstances.length : 0;
         const instanceStorage = this._instanceDataStorage;
@@ -1479,7 +1486,7 @@ export class Mesh extends AbstractMesh {
                 instancesCount++;
             }
             if (visibleInstances) {
-                if (Mesh.INSTANCEDMESH_SORT_TRANSPARENT && this._scene.activeCamera && subMesh.getMaterial()?.needAlphaBlendingForMesh(subMesh.getRenderingMesh())) {
+                if (Mesh.INSTANCEDMESH_SORT_TRANSPARENT && this._scene.activeCamera && ((_a = subMesh.getMaterial()) === null || _a === void 0 ? void 0 : _a.needAlphaBlendingForMesh(subMesh.getRenderingMesh()))) {
                     const cameraPosition = this._scene.activeCamera.globalPosition;
                     for (let instanceIndex = 0; instanceIndex < visibleInstances.length; instanceIndex++) {
                         const instanceMesh = visibleInstances[instanceIndex];
@@ -1577,8 +1584,9 @@ export class Mesh extends AbstractMesh {
      * @internal
      */
     _renderWithThinInstances(subMesh, fillMode, effect, engine) {
+        var _a, _b;
         // Stats
-        const instancesCount = this._thinInstanceDataStorage?.instancesCount ?? 0;
+        const instancesCount = (_b = (_a = this._thinInstanceDataStorage) === null || _a === void 0 ? void 0 : _a.instancesCount) !== null && _b !== void 0 ? _b : 0;
         this.getScene()._activeIndices.addCount(subMesh.indexCount * instancesCount, false);
         // Draw
         if (engine._currentDrawContext) {
@@ -1707,6 +1715,7 @@ export class Mesh extends AbstractMesh {
      * @returns the current mesh
      */
     render(subMesh, enableAlphaMode, effectiveMeshReplacement) {
+        var _a, _b, _c;
         const scene = this.getScene();
         if (this._internalAbstractMeshDataInfo._isActiveIntermediate) {
             this._internalAbstractMeshDataInfo._isActiveIntermediate = false;
@@ -1738,7 +1747,10 @@ export class Mesh extends AbstractMesh {
         if (this._internalMeshDataInfo._onBeforeRenderObservable) {
             this._internalMeshDataInfo._onBeforeRenderObservable.notifyObservers(this);
         }
-        const hardwareInstancedRendering = batch.hardwareInstancedRendering[subMesh._id] || subMesh.getRenderingMesh().hasThinInstances || !!this._userInstancedBuffersStorage;
+        const renderingMesh = subMesh.getRenderingMesh();
+        const hardwareInstancedRendering = batch.hardwareInstancedRendering[subMesh._id] ||
+            renderingMesh.hasThinInstances ||
+            (!!this._userInstancedBuffersStorage && !subMesh.getMesh()._internalAbstractMeshDataInfo._actAsRegularMesh);
         const instanceDataStorage = this._instanceDataStorage;
         const material = subMesh.getMaterial();
         if (!material) {
@@ -1768,8 +1780,8 @@ export class Mesh extends AbstractMesh {
             }
             this._internalMeshDataInfo._effectiveMaterial = material;
         }
-        else if ((material._storeEffectOnSubMeshes && !subMesh.effect?._wasPreviouslyReady) ||
-            (!material._storeEffectOnSubMeshes && !material.getEffect()?._wasPreviouslyReady)) {
+        else if ((material._storeEffectOnSubMeshes && !((_a = subMesh.effect) === null || _a === void 0 ? void 0 : _a._wasPreviouslyReady)) ||
+            (!material._storeEffectOnSubMeshes && !((_b = material.getEffect()) === null || _b === void 0 ? void 0 : _b._wasPreviouslyReady))) {
             if (oldCamera) {
                 oldCamera.maxZ = oldCameraMaxZ;
                 scene.updateTransformMatrix(true);
@@ -1787,7 +1799,7 @@ export class Mesh extends AbstractMesh {
         else {
             drawWrapper = this._internalMeshDataInfo._effectiveMaterial._getDrawWrapper();
         }
-        const effect = drawWrapper?.effect ?? null;
+        const effect = (_c = drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.effect) !== null && _c !== void 0 ? _c : null;
         for (const step of scene._beforeRenderingMeshStage) {
             step.action(this, subMesh, batch, effect);
         }