@babylonjs/core 6.41.0 → 6.41.2

package/Particles/particleSystem.d.ts

@@ -4,7 +4,8 @@ import { Observable } from "../Misc/observable";
 import { Vector3, Matrix } from "../Maths/math.vector";
 import { VertexBuffer } from "../Buffers/buffer";
 import type { Effect } from "../Materials/effect";
-import type { IDisposable, Scene } from "../scene";
+import type { IDisposable } from "../scene";
+import { Scene } from "../scene";
 import type { IParticleSystem } from "./IParticleSystem";
 import { BaseParticleSystem } from "./baseParticleSystem";
 import { Particle } from "./particle";
@@ -452,7 +453,7 @@ export declare class ParticleSystem extends BaseParticleSystem implements IDispo
     /**
      * @internal
      */
-    static _GetEffectCreationOptions(isAnimationSheetEnabled?: boolean, useLogarithmicDepth?: boolean): string[];
+    static _GetEffectCreationOptions(isAnimationSheetEnabled?: boolean, useLogarithmicDepth?: boolean, applyFog?: boolean): string[];
     /**
      * Fill the defines array according to the current settings of the particle system
      * @param defines Array to be updated

package/Particles/particleSystem.js

@@ -6,6 +6,7 @@ import { VertexBuffer, Buffer } from "../Buffers/buffer.js";
 import { ImageProcessingConfiguration } from "../Materials/imageProcessingConfiguration.js";
 import { RawTexture } from "../Materials/Textures/rawTexture.js";
 import { EngineStore } from "../Engines/engineStore.js";
+import { Scene } from "../scene.js";
 import { BoxParticleEmitter, HemisphericParticleEmitter, SphereParticleEmitter, SphereDirectedParticleEmitter, CylinderParticleEmitter, ConeParticleEmitter, PointParticleEmitter, MeshParticleEmitter, CylinderDirectedParticleEmitter, CustomParticleEmitter, } from "../Particles/EmitterTypes/index.js";
 import { BaseParticleSystem } from "./baseParticleSystem.js";
 import { Particle } from "./particle.js";
@@ -84,12 +85,10 @@ export class ParticleSystem extends BaseParticleSystem {
      * @returns The effect
      */
     getCustomEffect(blendMode = 0) {
-        var _a, _b;
-        return (_b = (_a = this._customWrappers[blendMode]) === null || _a === void 0 ? void 0 : _a.effect) !== null && _b !== void 0 ? _b : this._customWrappers[0].effect;
+        return this._customWrappers[blendMode]?.effect ?? this._customWrappers[0].effect;
     }
     _getCustomDrawWrapper(blendMode = 0) {
-        var _a;
-        return (_a = this._customWrappers[blendMode]) !== null && _a !== void 0 ? _a : this._customWrappers[0];
+        return this._customWrappers[blendMode] ?? this._customWrappers[0];
     }
     /**
      * Sets the custom effect used to render the particles
@@ -275,12 +274,11 @@ export class ParticleSystem extends BaseParticleSystem {
         let noiseTextureData = null;
         // Update
         this.updateFunction = (particles) => {
-            var _a;
             let noiseTextureSize = null;
             if (this.noiseTexture) {
                 // We need to get texture data back to CPU
                 noiseTextureSize = this.noiseTexture.getSize();
-                (_a = this.noiseTexture.getContent()) === null || _a === void 0 ? void 0 : _a.then((data) => {
+                this.noiseTexture.getContent()?.then((data) => {
                     noiseTextureData = data;
                 });
             }
@@ -827,7 +825,7 @@ export class ParticleSystem extends BaseParticleSystem {
         for (const drawWrappers of this._drawWrappers) {
             if (drawWrappers) {
                 for (const drawWrapper of drawWrappers) {
-                    drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.dispose();
+                    drawWrapper?.dispose();
                 }
             }
         }
@@ -978,7 +976,6 @@ export class ParticleSystem extends BaseParticleSystem {
      * @param delay defines the delay in milliseconds before starting the system (this.startDelay by default)
      */
     start(delay = this.startDelay) {
-        var _a;
         if (!this.targetStopDuration && this._hasTargetStopDurationDependantGradient()) {
             // eslint-disable-next-line no-throw-literal
             throw "Particle system started with a targetStopDuration dependant gradient (eg. startSizeGradients) but no targetStopDuration set";
@@ -1020,7 +1017,7 @@ export class ParticleSystem extends BaseParticleSystem {
             }
         }
         if (this.preWarmCycles) {
-            if (((_a = this.emitter) === null || _a === void 0 ? void 0 : _a.getClassName().indexOf("Mesh")) !== -1) {
+            if (this.emitter?.getClassName().indexOf("Mesh") !== -1) {
                 this.emitter.computeWorldMatrix(true);
             }
             const noiseTextureAsProcedural = this.noiseTexture;
@@ -1377,7 +1374,7 @@ export class ParticleSystem extends BaseParticleSystem {
     /**
      * @internal
      */
-    static _GetEffectCreationOptions(isAnimationSheetEnabled = false, useLogarithmicDepth = false) {
+    static _GetEffectCreationOptions(isAnimationSheetEnabled = false, useLogarithmicDepth = false, applyFog = false) {
         const effectCreationOption = ["invView", "view", "projection", "textureMask", "translationPivot", "eyePosition"];
         addClipPlaneUniforms(effectCreationOption);
         if (isAnimationSheetEnabled) {
@@ -1386,6 +1383,10 @@ export class ParticleSystem extends BaseParticleSystem {
         if (useLogarithmicDepth) {
             effectCreationOption.push("logarithmicDepthConstant");
         }
+        if (applyFog) {
+            effectCreationOption.push("vFogInfos");
+            effectCreationOption.push("vFogColor");
+        }
         return effectCreationOption;
     }
     /**
@@ -1396,6 +1397,9 @@ export class ParticleSystem extends BaseParticleSystem {
     fillDefines(defines, blendMode) {
         if (this._scene) {
             prepareStringDefinesForClipPlanes(this, this._scene, defines);
+            if (this.applyFog && this._scene.fogEnabled && this._scene.fogMode !== Scene.FOGMODE_NONE) {
+                defines.push("#define FOG");
+            }
         }
         if (this._isAnimationSheetEnabled) {
             defines.push("#define ANIMATESHEET");
@@ -1442,7 +1446,7 @@ export class ParticleSystem extends BaseParticleSystem {
      */
     fillUniformsAttributesAndSamplerNames(uniforms, attributes, samplers) {
         attributes.push(...ParticleSystem._GetAttributeNamesOrOptions(this._isAnimationSheetEnabled, this._isBillboardBased && this.billboardMode !== ParticleSystem.BILLBOARDMODE_STRETCHED && this.billboardMode !== ParticleSystem.BILLBOARDMODE_STRETCHED_LOCAL, this._useRampGradients));
-        uniforms.push(...ParticleSystem._GetEffectCreationOptions(this._isAnimationSheetEnabled, this.useLogarithmicDepth));
+        uniforms.push(...ParticleSystem._GetEffectCreationOptions(this._isAnimationSheetEnabled, this.useLogarithmicDepth, this.applyFog));
         samplers.push("diffuseSampler", "rampSampler");
         if (this._imageProcessingConfiguration) {
             ImageProcessingConfiguration.PrepareUniforms(uniforms, this._imageProcessingConfigurationDefines);
@@ -1454,7 +1458,7 @@ export class ParticleSystem extends BaseParticleSystem {
      */
     _getWrapper(blendMode) {
         const customWrapper = this._getCustomDrawWrapper(blendMode);
-        if (customWrapper === null || customWrapper === void 0 ? void 0 : customWrapper.effect) {
+        if (customWrapper?.effect) {
             return customWrapper;
         }
         const defines = [];
@@ -1488,7 +1492,6 @@ export class ParticleSystem extends BaseParticleSystem {
      * @param preWarmOnly will prevent the system from updating the vertex buffer (default is false)
      */
     animate(preWarmOnly = false) {
-        var _a;
         if (!this._started) {
             return;
         }
@@ -1502,7 +1505,7 @@ export class ParticleSystem extends BaseParticleSystem {
             }
             this._currentRenderId = this._scene.getFrameId();
         }
-        this._scaledUpdateSpeed = this.updateSpeed * (preWarmOnly ? this.preWarmStepOffset : ((_a = this._scene) === null || _a === void 0 ? void 0 : _a.getAnimationRatio()) || 1);
+        this._scaledUpdateSpeed = this.updateSpeed * (preWarmOnly ? this.preWarmStepOffset : this._scene?.getAnimationRatio() || 1);
         // Determine the number of particles we need to create
         let newParticles;
         if (this.manualEmitCount > -1) {
@@ -1581,12 +1584,11 @@ export class ParticleSystem extends BaseParticleSystem {
      * Rebuilds the particle system.
      */
     rebuild() {
-        var _a;
         if (this._engine.getCaps().vertexArrayObject) {
             this._vertexArrayObject = null;
         }
         this._createIndexBuffer();
-        (_a = this._spriteBuffer) === null || _a === void 0 ? void 0 : _a._rebuild();
+        this._spriteBuffer?._rebuild();
         this._createVertexBuffers();
         this.resetDrawCache();
     }
@@ -1614,16 +1616,15 @@ export class ParticleSystem extends BaseParticleSystem {
         return true;
     }
     _render(blendMode) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         const drawWrapper = this._getWrapper(blendMode);
         const effect = drawWrapper.effect;
         const engine = this._engine;
         // Render
         engine.enableEffect(drawWrapper);
-        const viewMatrix = (_a = this.defaultViewMatrix) !== null && _a !== void 0 ? _a : this._scene.getViewMatrix();
+        const viewMatrix = this.defaultViewMatrix ?? this._scene.getViewMatrix();
         effect.setTexture("diffuseSampler", this.particleTexture);
         effect.setMatrix("view", viewMatrix);
-        effect.setMatrix("projection", (_b = this.defaultProjectionMatrix) !== null && _b !== void 0 ? _b : this._scene.getProjectionMatrix());
+        effect.setMatrix("projection", this.defaultProjectionMatrix ?? this._scene.getProjectionMatrix());
         if (this._isAnimationSheetEnabled && this.particleTexture) {
             const baseSize = this.particleTexture.getBaseSize();
             effect.setFloat3("particlesInfos", this.spriteCellWidth / baseSize.width, this.spriteCellHeight / baseSize.height, this.spriteCellWidth / baseSize.width);
@@ -1644,29 +1645,32 @@ export class ParticleSystem extends BaseParticleSystem {
         const defines = effect.defines;
         if (this._scene) {
             bindClipPlane(effect, this, this._scene);
+            if (this.applyFog) {
+                MaterialHelper.BindFogParameters(this._scene, undefined, effect);
+            }
         }
         if (defines.indexOf("#define BILLBOARDMODE_ALL") >= 0) {
             viewMatrix.invertToRef(TmpVectors.Matrix[0]);
             effect.setMatrix("invView", TmpVectors.Matrix[0]);
         }
         if (this._vertexArrayObject !== undefined) {
-            if ((_c = this._scene) === null || _c === void 0 ? void 0 : _c.forceWireframe) {
+            if (this._scene?.forceWireframe) {
                 engine.bindBuffers(this._vertexBuffers, this._linesIndexBufferUseInstancing, effect);
             }
             else {
                 if (!this._vertexArrayObject) {
                     this._vertexArrayObject = this._engine.recordVertexArrayObject(this._vertexBuffers, null, effect);
                 }
-                this._engine.bindVertexArrayObject(this._vertexArrayObject, ((_d = this._scene) === null || _d === void 0 ? void 0 : _d.forceWireframe) ? this._linesIndexBufferUseInstancing : this._indexBuffer);
+                this._engine.bindVertexArrayObject(this._vertexArrayObject, this._scene?.forceWireframe ? this._linesIndexBufferUseInstancing : this._indexBuffer);
             }
         }
         else {
             if (!this._indexBuffer) {
                 // Use instancing mode
-                engine.bindBuffers(this._vertexBuffers, ((_e = this._scene) === null || _e === void 0 ? void 0 : _e.forceWireframe) ? this._linesIndexBufferUseInstancing : null, effect);
+                engine.bindBuffers(this._vertexBuffers, this._scene?.forceWireframe ? this._linesIndexBufferUseInstancing : null, effect);
             }
             else {
-                engine.bindBuffers(this._vertexBuffers, ((_f = this._scene) === null || _f === void 0 ? void 0 : _f.forceWireframe) ? this._linesIndexBuffer : this._indexBuffer, effect);
+                engine.bindBuffers(this._vertexBuffers, this._scene?.forceWireframe ? this._linesIndexBuffer : this._indexBuffer, effect);
             }
         }
         // Log. depth
@@ -1696,7 +1700,7 @@ export class ParticleSystem extends BaseParticleSystem {
             this._onBeforeDrawParticlesObservable.notifyObservers(effect);
         }
         if (this._useInstancing) {
-            if ((_g = this._scene) === null || _g === void 0 ? void 0 : _g.forceWireframe) {
+            if (this._scene?.forceWireframe) {
                 engine.drawElementsType(6, 0, 10, this._particles.length);
             }
             else {
@@ -1704,7 +1708,7 @@ export class ParticleSystem extends BaseParticleSystem {
             }
         }
         else {
-            if ((_h = this._scene) === null || _h === void 0 ? void 0 : _h.forceWireframe) {
+            if (this._scene?.forceWireframe) {
                 engine.drawElementsType(1, 0, this._particles.length * 10);
             }
             else {
@@ -1824,7 +1828,7 @@ export class ParticleSystem extends BaseParticleSystem {
      * @returns the cloned particle system
      */
     clone(name, newEmitter, cloneTexture = false) {
-        const custom = Object.assign({}, this._customWrappers);
+        const custom = { ...this._customWrappers };
         let program = null;
         const engine = this._engine;
         if (engine.createEffectForParticles) {
@@ -2169,7 +2173,6 @@ export class ParticleSystem extends BaseParticleSystem {
      * @internal
      */
     static _Parse(parsedParticleSystem, particleSystem, sceneOrEngine, rootUrl) {
-        var _a, _b, _c;
         let scene;
         if (sceneOrEngine instanceof ThinEngine) {
             scene = null;
@@ -2378,13 +2381,13 @@ export class ParticleSystem extends BaseParticleSystem {
         // Animation sheet
         particleSystem.startSpriteCellID = parsedParticleSystem.startSpriteCellID;
         particleSystem.endSpriteCellID = parsedParticleSystem.endSpriteCellID;
-        particleSystem.spriteCellLoop = (_a = parsedParticleSystem.spriteCellLoop) !== null && _a !== void 0 ? _a : true;
+        particleSystem.spriteCellLoop = parsedParticleSystem.spriteCellLoop ?? true;
         particleSystem.spriteCellWidth = parsedParticleSystem.spriteCellWidth;
         particleSystem.spriteCellHeight = parsedParticleSystem.spriteCellHeight;
         particleSystem.spriteCellChangeSpeed = parsedParticleSystem.spriteCellChangeSpeed;
         particleSystem.spriteRandomStartCell = parsedParticleSystem.spriteRandomStartCell;
-        particleSystem.disposeOnStop = (_b = parsedParticleSystem.disposeOnStop) !== null && _b !== void 0 ? _b : false;
-        particleSystem.manualEmitCount = (_c = parsedParticleSystem.manualEmitCount) !== null && _c !== void 0 ? _c : -1;
+        particleSystem.disposeOnStop = parsedParticleSystem.disposeOnStop ?? false;
+        particleSystem.manualEmitCount = parsedParticleSystem.manualEmitCount ?? -1;
     }
     /**
      * Parses a JSON object to create a particle system.