@onerjs/core 9.0.0 → 9.0.2

package/Particles/thinParticleSystem.pure.js

@@ -1,5 +1,6 @@
 /** This file must only contain pure code and pure imports */
 import { ColorGradient, Color3Gradient, GradientHelper } from "../Misc/gradients.js";
+import { Logger } from "../Misc/logger.js";
 import { Observable } from "../Misc/observable.pure.js";
 import { Vector3, Matrix, TmpVectors } from "../Maths/math.vector.pure.js";
 import { VertexBuffer, Buffer } from "../Buffers/buffer.pure.js";
@@ -270,6 +271,13 @@ export class ThinParticleSystem extends BaseParticleSystem {
             return;
         }
         this._noiseTexture = value ?? null;
+        // Invalidate the cached readback: a buffer and its dimensions must always come from the same texture.
+        this._noiseTextureSize = null;
+        this._noiseTextureData = null;
+        // A pending readback belongs to the previous assignment: discard its completion and free the gate.
+        this._noiseTextureFetchToken++;
+        this._noiseTextureFetchInFlight = null;
+        this._noiseTextureFetchInternalTexture = null;
         if (!value) {
             if (this._noiseCreation) {
                 _RemoveFromQueue(this._noiseCreation);
@@ -339,6 +347,10 @@ export class ThinParticleSystem extends BaseParticleSystem {
         this._noiseTextureSize = null;
         /** @internal */
         this._noiseTextureData = null;
+        this._noiseTextureFetchInFlight = null;
+        this._noiseTextureFetchInternalTexture = null;
+        this._noiseTextureFetchToken = 0;
+        this._noiseTextureReadbackFailureLogged = false;
         this._particles = new Array();
         this._stockParticles = new Array();
         this._newPartsExcess = 0;
@@ -532,13 +544,55 @@ export class ThinParticleSystem extends BaseParticleSystem {
         this.particleEmitterType = new BoxParticleEmitter();
         // Update
         this.updateFunction = (particles) => {
-            if (this.noiseTexture) {
-                // We need to get texture data back to CPU
-                this._noiseTextureSize = this.noiseTexture.getSize();
-                // eslint-disable-next-line @typescript-eslint/no-floating-promises, github/no-then
-                this.noiseTexture.getContent()?.then((data) => {
-                    this._noiseTextureData = data;
-                });
+            const noiseTexture = this.noiseTexture;
+            const noiseInternalTexture = noiseTexture?.getInternalTexture() ?? null;
+            if (noiseTexture && (this._noiseTextureFetchInFlight !== noiseTexture || this._noiseTextureFetchInternalTexture !== noiseInternalTexture)) {
+                // One readback per render target in flight to avoid piling up a promise per frame.
+                const noiseContent = noiseTexture.getContent();
+                if (noiseContent) {
+                    const textureSize = noiseTexture.getSize();
+                    // getSize() returns a shared object: snapshot it so a later resize cannot mutate the published pair.
+                    const noiseSize = { width: textureSize.width, height: textureSize.height };
+                    // Gate completions on a per-request token: texture identity cannot tell two readbacks apart.
+                    const fetchToken = ++this._noiseTextureFetchToken;
+                    this._noiseTextureFetchInFlight = noiseTexture;
+                    this._noiseTextureFetchInternalTexture = noiseInternalTexture;
+                    // eslint-disable-next-line github/no-then
+                    noiseContent.then((data) => {
+                        if (this._noiseTextureFetchToken !== fetchToken) {
+                            // Superseded by a newer readback.
+                            return;
+                        }
+                        this._noiseTextureFetchInFlight = null;
+                        this._noiseTextureFetchInternalTexture = null;
+                        if (this.noiseTexture !== noiseTexture || noiseTexture.getInternalTexture() !== noiseInternalTexture) {
+                            // Reassigned or resized while pending: discard the stale buffer.
+                            return;
+                        }
+                        this._noiseTextureReadbackFailureLogged = false;
+                        const buffer = data;
+                        if (buffer.length !== noiseSize.width * noiseSize.height * 4) {
+                            // Buffer for another size (texture resized while pending): retry on the next update.
+                            return;
+                        }
+                        this._noiseTextureSize = noiseSize;
+                        this._noiseTextureData = buffer;
+                    }, () => {
+                        if (this._noiseTextureFetchToken !== fetchToken) {
+                            return;
+                        }
+                        this._noiseTextureFetchInFlight = null;
+                        this._noiseTextureFetchInternalTexture = null;
+                        if (this.noiseTexture !== noiseTexture || noiseTexture.getInternalTexture() !== noiseInternalTexture) {
+                            return;
+                        }
+                        // Retry on the next update, reporting the failure once per streak.
+                        if (!this._noiseTextureReadbackFailureLogged) {
+                            this._noiseTextureReadbackFailureLogged = true;
+                            Logger.Warn(`Noise texture readback failed for "${noiseTexture.name}"; it will be retried on the next update`);
+                        }
+                    });
+                }
             }
             const sameParticleArray = particles === this._particles;
             for (let index = 0; index < particles.length; index++) {
@@ -570,7 +624,9 @@ export class ThinParticleSystem extends BaseParticleSystem {
                     // Recycle by swapping with last particle
                     this._emitFromParticle(particle);
                     if (particle._properties.attachedSubEmitters) {
-                        for (const subEmitter of particle._properties.attachedSubEmitters) {
+                        const attachedSubEmitters = particle._properties.attachedSubEmitters;
+                        for (let subEmitterIndex = 0; subEmitterIndex < attachedSubEmitters.length; subEmitterIndex++) {
+                            const subEmitter = attachedSubEmitters[subEmitterIndex];
                             subEmitter.particleSystem.disposeOnStop = true;
                             subEmitter.particleSystem.stop();
                         }
@@ -1427,7 +1483,12 @@ export class ThinParticleSystem extends BaseParticleSystem {
         }
         else {
             const emitterPosition = this.emitter;
-            this._emitterWorldMatrix = Matrix.Translation(emitterPosition.x, emitterPosition.y, emitterPosition.z);
+            // Owned matrix: _emitterWorldMatrix may alias a live mesh world matrix after an emitter switch.
+            if (!this._emitterTranslationMatrix) {
+                this._emitterTranslationMatrix = new Matrix();
+            }
+            Matrix.TranslationToRef(emitterPosition.x, emitterPosition.y, emitterPosition.z, this._emitterTranslationMatrix);
+            this._emitterWorldMatrix = this._emitterTranslationMatrix;
         }
         this._emitterWorldMatrix.invertToRef(this._emitterInverseWorldMatrix);
         this.updateFunction(this._particles);