diff --git a/src/aphorisms/fifteen.clj b/src/aphorisms/fifteen.clj index 7140a53..e0bb0da 100644 --- a/src/aphorisms/fifteen.clj +++ b/src/aphorisms/fifteen.clj @@ -28,7 +28,7 @@ (q/background 350) {:world (make-world)}) -(def radius 10) +(def radius 30) (defn register-mouse [state ev] (assoc state :mouse (v/vec2 ev))) diff --git a/src/aphorisms/fourteen.clj b/src/aphorisms/fourteen.clj index de64c2d..53815ce 100644 --- a/src/aphorisms/fourteen.clj +++ b/src/aphorisms/fourteen.clj @@ -36,7 +36,7 @@ ;; (q/ellipse (+ x x-off) y 1 1) ;; draw the oddly moving ridge - (q/stroke 320 50 80) + (q/stroke 320 50 20) (q/arc (- (+ x x-off) (* 0.5 size-l)) y size-l size-l end-l 0) (q/arc (+ (+ x x-off) (* 0.5 size-r)) y size-r size-r (- m/PI) end-r) @@ -56,6 +56,5 @@ :setup setup :update update-state :draw draw-state - :renderer :p2d :features [:keep-on-top :no-bind-output] :middleware [qm/pause-on-error qm/fun-mode]) diff --git a/src/aphorisms/seventeen.clj b/src/aphorisms/seventeen.clj index 287a227..e97ea14 100644 --- a/src/aphorisms/seventeen.clj +++ b/src/aphorisms/seventeen.clj @@ -37,21 +37,22 @@ bg-color [180 5 90]] (q/background 180 5 90) (q/with-translation [250 250] - (doseq [[idx radius] (map-indexed vector (range 20 150 10))] - (q/no-fill) - (q/no-stroke) - (let [paint (if (zero? idx) q/fill q/stroke) - {[x y] :p r :r} (as-> (circle (+ (q/millis) (* idx 100)) radius) shape - (g/translate shape (m/*! (m/-! shape))))] - (apply paint (mix-hsb fg-color bg-color (/ (inc idx) 10))) - (q/ellipse x y r r)))))) + (doseq [[idx radius] (reverse (map-indexed vector (range 20 150 10)))] + (let [n-idx (/ idx 12) + paint (if (zero? idx) q/fill q/stroke) + {p :p r :r} (circle (+ (q/millis) (* idx 100)) radius) + p (g/translate p (m/- (m/* (m/- p (:pointer state)) (* (- 1 n-idx) 0.05))))] + (q/no-fill) + (q/no-stroke) + (apply paint (mix-hsb fg-color bg-color (/ (inc idx) 12))) + (q/ellipse (:x p) (:y p) r r)))))) (let [center (v/vec2 250 250) mouse (v/vec2 100 100)] (g/translate center (m/*! (m/- mouse center) 0.1))) (defn mouse-moved [state ev] - (assoc state (v/vec2 ev))) + (assoc state :pointer (v/vec2 ev))) #_:clj-kondo/ignore (q/defsketch seventeen