more cleanup; guard unavailable effect

Author: bobnik

src/common/geometry.js

@@ -113,6 +113,12 @@ export const angle = (point) => {
   return Math.atan2(point.y, point.x)
 }
 
+// Convert cartesian to polar coordinates
+export const toPolar = (x, y) => ({
+  r: Math.sqrt(x * x + y * y),
+  theta: Math.atan2(y, x),
+})
+
 // returns whether a point is on the segment defined by start and end
 export const onSegment = (start, end, point) => {
   return (

src/features/effects/Warp.js

@@ -3,7 +3,7 @@
 import Victor from "victor"
 import Effect from "./Effect"
 import { effectOptions } from "./EffectLayer"
-import { subsample, circle } from "@/common/geometry"
+import { subsample, circle, toPolar } from "@/common/geometry"
 import { evaluate } from "mathjs"
 
 const options = {
@@ -161,21 +161,10 @@ export default class Warp extends Effect {
     return vertices.map((vertex) => {
       const originalx = vertex.x - effect.x
       const originaly = vertex.y - effect.y
-      const theta = Math.atan2(originaly, originalx)
-      const x =
-        originalx +
-        scale *
-          Math.cos(theta) *
-          Math.cos(
-            Math.sqrt(originalx * originalx + originaly * originaly) / periodx,
-          )
-      const y =
-        originaly +
-        scale *
-          Math.sin(theta) *
-          Math.cos(
-            Math.sqrt(originalx * originalx + originaly * originaly) / periody,
-          )
+      const { r, theta } = toPolar(originalx, originaly)
+      const x = originalx + scale * Math.cos(theta) * Math.cos(r / periodx)
+      const y = originaly + scale * Math.sin(theta) * Math.cos(r / periody)
+
       return new Victor(x + effect.x, y + effect.y)
     })
   }

src/features/effects/effectFactory.js

@@ -29,7 +29,10 @@ export const getEffect = (type, ...args) => {
 }
 
 export const getDefaultEffectType = () => {
-  return localStorage.getItem("defaultEffect") || "mask"
+  const effect = localStorage.getItem("defaultEffect")
+
+  // validate that the effect type exists (it may not if switching branches)
+  return effect && effectFactory[effect] ? effect : "mask"
 }
 
 export const getDefaultEffect = () => {

src/features/shapes/chladni/helpers.js

@@ -1,3 +1,5 @@
+export const getTrig = (boundary) => (boundary === "free" ? Math.cos : Math.sin)
+
 // Default values for superposition modes
 export const defaultTerms = ({ term1, term2 }) => [term1, term2]
 export const defaultScale = { rectangular: 1, circular: 2.5 }
@@ -18,12 +20,3 @@ export function getEffectiveValue(
 
   return typeof v === "function" ? v(value) / divisor : v * (value / divisor)
 }
-
-// Convert cartesian to polar, returning null if outside unit circle
-export function toPolar(x, y) {
-  const r = Math.sqrt(x * x + y * y)
-
-  if (r > 1) return null
-
-  return { r, theta: Math.atan2(y, x) }
-}

src/features/shapes/chladni/methods.js

@@ -1,17 +1,18 @@
 import BESSEL from "bessel"
 import { BESSEL_ZEROS, SUPERPOSITION, EXCITATION } from "./config"
+import { toPolar } from "@/common/geometry"
 import {
   defaultTerms,
   defaultScale,
   getEffectiveValue,
-  toPolar,
+  getTrig,
 } from "./helpers"
 
 // Rectangular plate interference pattern
 // Domain: [0, 1] or [-1, 1]
 export function interferenceRectangular(x, y, opts) {
   const { m, n, superposition, amplitude, boundary } = opts
-  const trig = boundary === "free" ? Math.cos : Math.sin
+  const trig = getTrig(boundary)
   const mode = SUPERPOSITION[superposition]
   const term1 = trig(n * Math.PI * x) * trig(m * Math.PI * y)
   const term2 = trig(m * Math.PI * x) * trig(n * Math.PI * y)
@@ -34,12 +35,10 @@ export function interferenceRectangular(x, y, opts) {
 // Domain: x,y in [-1, 1], circular boundary at r=1
 export function interferenceCircular(x, y, opts) {
   const { m, n, radial, superposition, amplitude, boundary } = opts
-  const polar = toPolar(x, y)
+  const { r, theta } = toPolar(x, y)
 
-  if (!polar) return 1000
-
-  const { r, theta } = polar
-  const trig = boundary === "free" ? Math.cos : Math.sin
+  if (r > 1) return 1000
+  const trig = getTrig(boundary)
   const mode = SUPERPOSITION[superposition]
 
   // Default terms: two different angular modes, same radial zero
@@ -66,7 +65,7 @@ export function interferenceCircular(x, y, opts) {
 // frequency scales all harmonics (zoom), modes controls complexity
 export function harmonicRectangular(x, y, opts) {
   const { modes, decay, frequency, boundary } = opts
-  const trig = boundary === "free" ? Math.cos : Math.sin
+  const trig = getTrig(boundary)
   const scaledFreq = frequency * 1.5 - 1
   const decayExp = (decay + 1) / 8
 
@@ -94,11 +93,9 @@ export function harmonicRectangular(x, y, opts) {
 // modes controls angular complexity, radial controls radial complexity
 export function harmonicCircular(x, y, opts) {
   let { modes, radial, decay, frequency } = opts
-  const polar = toPolar(x, y)
-
-  if (!polar) return 1000
+  const { r, theta } = toPolar(x, y)
 
-  const { r, theta } = polar
+  if (r > 1) return 1000
   const scaledFreq = frequency * 1.5
   const decayExp = (decay + 1) / 16
   let sum = 0
@@ -211,11 +208,9 @@ export function excitationRectangular(x, y, opts) {
 // Loops over angular modes (m) and radial modes (n)
 export function excitationCircular(x, y, opts) {
   const { excitation, spread, position, modes, radial, frequency } = opts
-  const polar = toPolar(x, y)
-
-  if (!polar) return 1000
+  const { r, theta } = toPolar(x, y)
 
-  const { r, theta } = polar
+  if (r > 1) return 1000
   const spreadFactor = spread / 5
   const freq = frequency * 2 - 1
   let sum = 0