@newkrok/three-particles 0.8.2 → 1.0.0

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@newkrok/three-particles",
-  "version": "0.8.2",
+  "version": "1.0.0",
   "description": "Particle system for ThreeJS",
-  "main": "src/js/three-particles.js",
+  "main": "src/js/effects/three-particles.js",
   "bin": {
-    "three-particles": "src/js/three-particles.js"
+    "three-particles": "src/js/effects/three-particles.js"
   },
   "repository": {
     "type": "git",
@@ -27,9 +27,9 @@
   "homepage": "https://github.com/NewKrok/three-particles#readme",
   "dependencies": {
     "easing-functions": "1.0.1",
-    "three": "0.140.1",
+    "three": "^0.144.0",
     "three-noise": "1.1.2",
-    "@newkrok/three-utils": "0.1.1"
+    "@newkrok/three-utils": "^0.4.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/js/effects/three-particles/three-particles-utils.js

@@ -72,7 +72,7 @@ export const calculateRandomPositionAndVelocityOnCone = (
 
   const positionLength = position.length();
   const normalizedAngle = Math.abs(
-    (positionLength / radius) * THREE.Math.degToRad(angle)
+    (positionLength / radius) * THREE.MathUtils.degToRad(angle)
   );
   const sinNormalizedAngle = Math.sin(normalizedAngle);
 
@@ -195,8 +195,8 @@ export const calculateRandomPositionAndVelocityOnRectangle = (
 ) => {
   const xOffset = Math.random() * scale.x - scale.x / 2;
   const yOffset = Math.random() * scale.y - scale.y / 2;
-  const rotationX = THREE.Math.degToRad(rotation.x);
-  const rotationY = THREE.Math.degToRad(rotation.y);
+  const rotationX = THREE.MathUtils.degToRad(rotation.x);
+  const rotationY = THREE.MathUtils.degToRad(rotation.y);
   position.x = xOffset * Math.cos(rotationY);
   position.y = yOffset * Math.cos(rotationX);
   position.z = xOffset * Math.sin(rotationY) - yOffset * Math.sin(rotationX);

package/src/js/effects/three-particles.js

@@ -283,10 +283,31 @@ const calculatePositionAndVelocity = (
   }
 };
 
+export const destroyParticleSystem = (particleSystem) => {
+  createdParticleSystems = createdParticleSystems.filter(
+    ({ particleSystem: savedParticleSystem, wrapper }) => {
+      if (
+        savedParticleSystem !== particleSystem &&
+        wrapper !== particleSystem &&
+        particleSystem.instance !== particleSystem
+      ) {
+        return true;
+      }
+
+      savedParticleSystem.geometry.dispose();
+      savedParticleSystem.material.dispose();
+      if (savedParticleSystem.parent)
+        savedParticleSystem.parent.remove(savedParticleSystem);
+      return false;
+    }
+  );
+};
+
 export const createParticleSystem = (
-  config = DEFAULT_PARTICLE_SYSTEM_CONFIG
+  config = DEFAULT_PARTICLE_SYSTEM_CONFIG,
+  externalNow
 ) => {
-  const now = Date.now();
+  const now = externalNow || Date.now();
   const generalData = {
     distanceFromLastEmitByDistance: 0,
     lastWorldPosition: new THREE.Vector3(-99999),
@@ -303,6 +324,7 @@ export const createParticleSystem = (
     lifetimeValues: {},
     creationTimes: [],
     noise: null,
+    isEnabled: true,
   };
 
   const normalizedConfig = patchObject(DEFAULT_PARTICLE_SYSTEM_CONFIG, config);
@@ -497,7 +519,7 @@ export const createParticleSystem = (
   createFloat32AttributesRequest("opacity", 0);
 
   createFloat32AttributesRequest("rotation", () =>
-    THREE.Math.degToRad(
+    THREE.MathUtils.degToRad(
       THREE.MathUtils.randFloat(startRotation.min, startRotation.max)
     )
   );
@@ -576,9 +598,10 @@ export const createParticleSystem = (
     generalData.startValues.startOpacity[particleIndex] =
       THREE.MathUtils.randFloat(startOpacity.min, startOpacity.max);
 
-    geometry.attributes.rotation.array[particleIndex] = THREE.Math.degToRad(
-      THREE.MathUtils.randFloat(startRotation.min, startRotation.max)
-    );
+    geometry.attributes.rotation.array[particleIndex] =
+      THREE.MathUtils.degToRad(
+        THREE.MathUtils.randFloat(startRotation.min, startRotation.max)
+      );
 
     if (normalizedConfig.rotationOverLifetime.isActive)
       generalData.lifetimeValues.rotationOverLifetime[particleIndex] =
@@ -656,9 +679,9 @@ export const createParticleSystem = (
   particleSystem.sortParticles = true;
 
   particleSystem.position.copy(transform.position);
-  particleSystem.rotation.x = THREE.Math.degToRad(transform.rotation.x);
-  particleSystem.rotation.y = THREE.Math.degToRad(transform.rotation.y);
-  particleSystem.rotation.z = THREE.Math.degToRad(transform.rotation.z);
+  particleSystem.rotation.x = THREE.MathUtils.degToRad(transform.rotation.x);
+  particleSystem.rotation.y = THREE.MathUtils.degToRad(transform.rotation.y);
+  particleSystem.rotation.z = THREE.MathUtils.degToRad(transform.rotation.z);
   particleSystem.scale.copy(transform.scale);
 
   const calculatedCreationTime =
@@ -690,25 +713,16 @@ export const createParticleSystem = (
     activateParticle,
   });
 
-  return wrapper || particleSystem;
-};
+  const resumeEmitter = () => (generalData.isEnabled = true);
+  const pauseEmitter = () => (generalData.isEnabled = false);
+  const dispose = () => destroyParticleSystem(particleSystem);
 
-export const destroyParticleSystem = (particleSystem) => {
-  createdParticleSystems = createdParticleSystems.filter(
-    ({ particleSystem: savedParticleSystem, wrapper }) => {
-      if (
-        savedParticleSystem !== particleSystem &&
-        wrapper !== particleSystem
-      ) {
-        return true;
-      }
-
-      savedParticleSystem.geometry.dispose();
-      savedParticleSystem.material.dispose();
-      savedParticleSystem.parent.remove(savedParticleSystem);
-      return false;
-    }
-  );
+  return {
+    instance: wrapper || particleSystem,
+    resumeEmitter,
+    pauseEmitter,
+    dispose,
+  };
 };
 
 export const updateParticleSystems = ({ now, delta, elapsed }) => {
@@ -741,7 +755,7 @@ export const updateParticleSystems = ({ now, delta, elapsed }) => {
       worldQuaternion,
       worldEuler,
       gravityVelocity,
-      hasOrbitalVelocity,
+      isEnabled,
     } = generalData;
 
     if (wrapper) generalData.wrapperQuaternion.copy(wrapper.parent.quaternion);
@@ -842,7 +856,7 @@ export const updateParticleSystems = ({ now, delta, elapsed }) => {
       }
     });
 
-    if (looping || lifetime < duration * 1000) {
+    if (isEnabled && (looping || lifetime < duration * 1000)) {
       const emissionDelta = now - lastEmissionTime;
       const neededParticlesByTime = Math.floor(
         emission.rateOverTime * (emissionDelta / 1000)