Merge pull request #29 from ThomasAbbink/e

E

Author: ThomasAbbink

package-lock.json

@@ -6,7 +6,7 @@
     "@vitejs/plugin-react-swc": "^3.7.0",
     "h264-mp4-encoder": "^1.0.12",
     "lygia": "^1.1.3",
-    "p5": "^1.4.1",
+    "p5": "^2.1.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router": "^6.3.0",

package.json

@@ -1,6 +1,5 @@
 import { getCanvasSize } from '../../../utility/canvas'
 import area from './area'
-import { Vector } from 'p5'
 
 export const pollockAreas = (p5) => {
   const areas = []
@@ -30,7 +29,7 @@ export const pollockAreas = (p5) => {
   }
 
   const addRandomArea = () => {
-    const v = Vector.random2D()
+    const v = p5.Vector.random2D()
     v.setMag(p5.random(50, width / 2))
     addArea(v)
   }

public/assets/g2.png

@@ -1,4 +1,3 @@
-import { Vector } from 'p5'
 import { distanceSquared } from '../../../utility/vectors'
 
 /**
@@ -12,13 +11,13 @@ const line = (p5) => {
   const position = p5.createVector(0, 0)
   let velocity = p5.createVector(0, 0)
   let acceleration = p5.createVector(0, 0)
-  let target = Vector.random2D()
+  let target = p5.Vector.random2D()
   let isMovingToCustomTarget = false
 
   const moveRandomly = () => {
     isMovingToCustomTarget = false
     if (target.x === 0 && target.y === 0) {
-      target = Vector.random2D()
+      target = p5.Vector.random2D()
     }
     target.rotate(p5.random(p5.PI / 3, p5.PI / 2))
     target.setMag(10000)
@@ -61,7 +60,7 @@ const line = (p5) => {
       moveRandomly()
     }
 
-    acceleration = Vector.sub(target, position)
+    acceleration = p5.Vector.sub(target, position)
     velocity.add(acceleration)
     velocity.limit(2)
     position.add(velocity)