Skip to content

Commit

Permalink
add some speed adjustments to the frequency modulation
Browse files Browse the repository at this point in the history
  • Loading branch information
dgtized committed Aug 2, 2024
1 parent 6dce2a3 commit 9b3002d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/shimmers/sketches/pendulum_sway.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
(v/polar (* 0.04 r dampen2) (* 3 t)))))

;; experiment with frequency modulation
(defn gamma [r t {:keys [lambda1 lambda2 dx dy]}]
(defn gamma [r t {:keys [lambda1 lambda2 dx dy gamma-rate]}]
(let [dampen1 (math/exp (* (- lambda1) t))
dampen2 (math/exp (* (- lambda2) t))
fx (+ dx (* 0.001 (math/sin (* 0.5 t))))
fy (+ dy (* 0.001 (math/cos (* 0.5 t))))]
fx (+ dx (* 0.001 (math/sin (* gamma-rate t))))
fy (+ dy (* 0.001 (math/cos (* gamma-rate t))))]
(tm/+ (gv/vec2 (* r dampen1 (math/cos (+ (* 6 dampen2) (* fx t))))
(* r dampen1 (math/sin (+ (* 6 dampen2) (* fy t)))))
(v/polar (* 0.04 r dampen2) (* 4 t)))))
Expand All @@ -63,7 +63,8 @@
:dx (+ (dr/random-int 1 6) (dr/random -0.01 0.01))
:dy (+ (dr/random-int 1 6) (dr/random -0.01 0.01))
:lambda1 0.004
:lambda2 0.003})
:lambda2 0.003
:gamma-rate (dr/weighted {0.25 1 0.5 2 0.75 1 1.25 1})})

(defn scene [{:keys [scene-id params]}]
(csvg/svg-timed
Expand Down

0 comments on commit 9b3002d

Please sign in to comment.