fix speedModifier is not reset after behavior update

Alchemist0823 · Nov 10, 2023 · dcb9136 · dcb9136
1 parent a523ed6
commit dcb9136
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
   "scripts": {
     "type-check": "tsc --noEmit",
     "type-check:watch": "npm run type-check -- --watch",
+    "dev": "rollup -c -w",
     "build:types": "tsc --emitDeclarationOnly",
     "build:js": "rollup -c",
     "build:production": "npm run build:types && cross-env NODE_ENV=production npm run build:js && cpx ./dist/three.quarks.esm.js ./examples/js/",

diff --git a/src/Particle.ts b/src/Particle.ts
@@ -16,6 +16,7 @@ export interface IParticle {
 }
 
 export interface Particle extends IParticle {
+    speedModifier: number;
     emissionState?: EmissionState;
     parentMatrix?: Matrix4;
     startSpeed: number;
@@ -65,6 +66,7 @@ export class SpriteParticle implements Particle {
     age = 0;
     life = 1;
     size = 1;
+    speedModifier = 1;
 
     // extra
     angularVelocity?: number | Quaternion;
@@ -100,6 +102,7 @@ export class TrailParticle implements Particle {
     life = 1;
     size = 1;
     length = 100;
+    speedModifier = 1;
 
     // GPU
     color: Vector4 = new Vector4();

diff --git a/src/ParticleSystem.ts b/src/ParticleSystem.ts
@@ -556,6 +556,7 @@ export class ParticleSystem implements IParticleSystem {
                 }
             }
             const particle = this.particles[this.particleNum - 1];
+            particle.speedModifier = 1;
             this.startColor.genColor(particle.startColor, this.emissionState.time, {});
             particle.color.copy(particle.startColor);
             particle.startSpeed = this.startSpeed.genValue(emissionState.time / this.duration);
@@ -596,7 +597,6 @@ export class ParticleSystem implements IParticleSystem {
                 trail.length = (this.rendererEmitterSettings as TrailSettings).startLength.genValue(
                     emissionState.time / this.duration
                 );
-                trail.reset();
             }
 
             this.emitterShape.initialize(particle);
@@ -724,8 +724,10 @@ export class ParticleSystem implements IParticleSystem {
                     this.particles[i].position.applyMatrix4(this.emitter.matrixWorld);
                 }
             } else {
-                const speedModifier = (this.particles[i] as any).speedModifier ?? 1;
-                this.particles[i].position.addScaledVector(this.particles[i].velocity, delta * speedModifier);
+                this.particles[i].position.addScaledVector(
+                    this.particles[i].velocity,
+                    delta * this.particles[i].speedModifier
+                );
             }
             this.particles[i].age += delta;
         }

diff --git a/src/QuarksLoader.ts b/src/QuarksLoader.ts
@@ -80,13 +80,13 @@ export class QuarksLoader extends ObjectLoader {
     }
 
     // @ts-ignore
-    parseObject<T extends Object3D<Object3DEventMap>>(
+    parseObject(
         data: any,
         geometries: any,
         materials: Material[],
         textures: Texture[],
         animations: AnimationClip[]
-    ): T {
+    ): Object3D {
         let object;
 
         function getGeometry(name: any) {

diff --git a/test/functions/Gradient.test.ts b/test/functions/Gradient.test.ts
@@ -7,14 +7,14 @@ describe('Gradient', () => {
     test('.genColor', () => {
         const gradient = new Gradient(
             [
-                [new Vector3(0, 0, 0), 0],
+                [new Vector3(0, 0, 0), 0.1],
                 [new Vector3(1, 1, 1), 0.2],
                 [new Vector3(1, 1, 1), 0.8],
-                [new Vector3(0, 0, 0), 1],
+                [new Vector3(0, 0, 0), 0.9],
             ],
             [
-                [0, 0],
-                [1, 1],
+                [0, 0.1],
+                [1, 0.9],
             ]
         );
         const color = new Vector4();
@@ -37,22 +37,22 @@ describe('Gradient', () => {
         expect(color.x).toEqual(1);
         expect(color.y).toEqual(1);
         expect(color.z).toEqual(1);
-        expect(color.w).toEqual(0.8);
+        expect(color.w).toEqual(0.875);
         gradient.genColor(color, 0.2);
         expect(color.x).toEqual(1);
         expect(color.y).toEqual(1);
         expect(color.z).toEqual(1);
-        expect(color.w).toEqual(0.2);
-        gradient.genColor(color, 0.1);
+        expect(color.w).toEqual(0.125);
+        gradient.genColor(color, 0.15);
         expect(color.x).toBeCloseTo(0.5);
         expect(color.y).toBeCloseTo(0.5);
         expect(color.z).toBeCloseTo(0.5);
-        expect(color.w).toEqual(0.1);
-        gradient.genColor(color, 0.9);
+        expect(color.w).toBeCloseTo(0.0625);
+        gradient.genColor(color, 0.85);
         expect(color.x).toBeCloseTo(0.5);
         expect(color.y).toBeCloseTo(0.5);
         expect(color.z).toBeCloseTo(0.5);
-        expect(color.w).toEqual(0.9);
+        expect(color.w).toBeCloseTo(0.9375);
     });
 
     test('.toJSON', () => {