feat(flowField): BlackHole->FlowField forceMag

Lokua · Nov 19, 2024 · 75c13cd · 75c13cd
1 parent 7fd0952
commit 75c13cd
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 15 deletions.
diff --git a/src/sketches/flowField/BlackHole.mjs b/src/sketches/flowField/BlackHole.mjs
@@ -1,3 +1,4 @@
+import { interpolators } from '../../lib/scaling.mjs'
 import { inheritStaticProperties, callAtInterval } from '../../util.mjs'
 import EntityTypes from './EntityTypes.mjs'
 import Attractor from './Attractor.mjs'
@@ -14,6 +15,7 @@ export default class BlackHole extends Attractor {
     super({ radius, ...rest })
     this.addInteraction(EntityTypes.FLOW_PARTICLE, this.pullParticle)
     this.addInteraction(EntityTypes.POLLINATOR, this.pullPollinator)
+    this.addInteraction(EntityTypes.FLOW_FIELD, this.muteFlowFieldMagnitude)
   }
 
   display() {
@@ -65,4 +67,34 @@ export default class BlackHole extends Attractor {
       },
     })
   }
+
+  muteFlowFieldMagnitude(flowField) {
+    flowField.updateQuirkFromSource({
+      quirk: Quirks.BLACK_HOLED,
+      mode: QuirkModes.ADD_UPDATE_NO_REMOVE,
+      shouldHaveQuirk: this.active,
+      source: this,
+      context: {
+        progress: 0,
+        forceMagnitude: 0.01,
+      },
+      update: (context) => {
+        if (!this.active && context.forceMagnitude < flowField.forceMagnitude) {
+          context.progress = Math.min(context.progress + 0.005, 1)
+          context.forceMagnitude = this.p.map(
+            interpolators.exponential(context.progress, 5),
+            0,
+            1,
+            context.forceMagnitude,
+            flowField.forceMagnitude,
+          )
+        } else if (
+          flowField.hasQuirk(Quirks.BLACK_HOLED) &&
+          context.forceMagnitude === flowField.forceMagnitude
+        ) {
+          flowField.removeQuirk(Quirks.BLACK_HOLED)
+        }
+      },
+    })
+  }
 }
diff --git a/src/sketches/flowField/Entity.mjs b/src/sketches/flowField/Entity.mjs
@@ -89,10 +89,10 @@ export default class Entity {
       this.hasQuirk(quirk) &&
       (shouldHaveQuirk || mode === QuirkModes.ADD_UPDATE_NO_REMOVE)
     ) {
-      this.quirks.get(quirk)?.update?.(this, {
-        source,
-        ...context,
-      })
+      const storedQuirk = this.quirks.get(quirk)
+      if (storedQuirk?.update) {
+        storedQuirk.update.call(this, storedQuirk.context)
+      }
     }
   }
 

diff --git a/src/sketches/flowField/EntityTypes.mjs b/src/sketches/flowField/EntityTypes.mjs
@@ -3,6 +3,7 @@
  */
 const EntityTypes = {
   DEFAULT: 'DEFAULT',
+  FLOW_FIELD: 'FLOW_FIELD',
   PARTICLE: 'PARTICLE',
   FLOW_PARTICLE: 'FLOW_PARTICLE',
   ATTRACTOR: 'ATTRACTOR',

diff --git a/src/sketches/flowField/FlowField.mjs b/src/sketches/flowField/FlowField.mjs
@@ -1,6 +1,12 @@
 import chroma from 'chroma-js'
+import { callAtInterval } from '../../util.mjs'
+import Entity from './Entity.mjs'
+import EntityTypes from './EntityTypes.mjs'
+import Quirks from './Quirks.mjs'
+
+export default class FlowField extends Entity {
+  static entityType = EntityTypes.FLOW_FIELD
 
-export default class FlowField {
   static Modes = {
     ALGORITHMIC: 'ALGORITHMIC',
     GRID: 'GRID',
@@ -23,6 +29,7 @@ export default class FlowField {
     mode = FlowField.Modes.ALGORITHMIC,
     visualize = false,
   }) {
+    super()
     this.p = p
     this.w = w
     this.h = h
@@ -148,7 +155,12 @@ export default class FlowField {
       this.p.sin(this.p.radians(this.angleOffset))
 
     outputVector.set(this.p.cos(angle), this.p.sin(angle))
-    outputVector.setMag(this.forceMagnitude)
+
+    outputVector.setMag(
+      this.hasQuirk(Quirks.BLACK_HOLED)
+        ? this.quirks.get(Quirks.BLACK_HOLED).context.forceMagnitude
+        : this.forceMagnitude,
+    )
 
     return outputVector
   }

diff --git a/src/sketches/flowField/FlowSystem.mjs b/src/sketches/flowField/FlowSystem.mjs
@@ -127,6 +127,7 @@ export default class FlowSystem {
       visualize: this.state.showField,
       angleOffset: this.state.angleOffset,
     })
+    this.blackHole.interactWith(this.flowField)
     this.flowField.update()
   }
 

diff --git a/src/sketches/flowField/createControlPanel.mjs b/src/sketches/flowField/createControlPanel.mjs
@@ -1,4 +1,5 @@
 import { createControlPanel } from '../../lib/ControlPanel/index.mjs'
+import FlowField from './FlowField.mjs'
 import Particle from './FlowParticle.mjs'
 
 export default (p, metadata) =>
@@ -101,13 +102,8 @@ export default (p, metadata) =>
       {
         type: 'Select',
         name: 'forceMode',
-        value: 'grid',
-        options: [
-          'grid',
-          'algorithmic',
-          'combinedAdditive',
-          'combinedAveraged',
-        ],
+        value: FlowField.Modes.ALGORITHMIC,
+        options: Object.keys(FlowField.Modes),
       },
       {
         type: 'Checkbox',

diff --git a/src/sketches/flowField/index.mjs b/src/sketches/flowField/index.mjs
@@ -19,7 +19,12 @@ export default function (p) {
   let system
 
   const colorScale = chroma.scale(['navy', 'turquoise', 'purple', 'yellow'])
-  const attractorColorScale = chroma.scale(['white', 'azure', 'silver'])
+  const attractorColorScale = chroma.scale([
+    'azure',
+    'mintcream',
+    chroma('palegreen').desaturate(3),
+    'mistyrose',
+  ])
   const ah = new AnimationHelper({ p, frameRate: metadata.frameRate, bpm: 130 })
   const controlPanel = createControlPanel(p, metadata)
 
@@ -54,7 +59,7 @@ export default function (p) {
     system.updateState({
       ...state,
       particleCount: state.count,
-      zOffset: ah.getTotalBeatsElapsed() * state.zOffsetMultiplier,
+      zOffset: ah.accumulateValue(state.zOffsetMultiplier, 0.125),
     })
     system.update()
     system.display()