SpindleyQ/consoom
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

collision detection, remove cleanup in favour of reverse iteration

Browse source
This commit is contained in:
Jeremy Penner 2023-10-28 00:19:39 -04:00
parent c38c653ece
commit a7bb98983c
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/explosion.fnl
View file

@ -10,7 +10,6 @@
(local draw (defmulti #$1)) (local draw (defmulti #$1))
(local update (defmulti #$1)) (local update (defmulti #$1))
(local children (defmulti #$2)) (local children (defmulti #$2))
(local cleanup (defmulti #$1))
(local scene (defmulti #$1)) (local scene (defmulti #$1))
(fn destroy-all [type ctx] (cache.destroy type) (tset ctx type nil)) (fn destroy-all [type ctx] (cache.destroy type) (tset ctx type nil))
@ -27,7 +26,6 @@
(draw:defmethod :default #nil) (draw:defmethod :default #nil)
(update:defmethod :default #nil) (update:defmethod :default #nil)
(children:defmethod :default (fn [val] (iter.ivalues val))) (children:defmethod :default (fn [val] (iter.ivalues val)))
(cleanup:defmethod :default #nil)
(scene:defmethod :default #nil) (scene:defmethod :default #nil)
(fn descend [t k] (children (. t k) k t)) (fn descend [t k] (children (. t k) k t))
@ -51,7 +49,7 @@
(each [k v (descend t key)] (each [k v (descend t key)]
(coroutine.yield k v))))) (coroutine.yield k v)))))
(children:defmethod :bombs ipairs) (children:defmethod :bombs iter.reverse-ipairs)
(when (= state.level nil) (when (= state.level nil)
(restart)) (restart))
@ -59,15 +57,6 @@
(local screenw (playdate.display.getWidth)) (local screenw (playdate.display.getWidth))
(local screenh (playdate.display.getHeight)) (local screenh (playdate.display.getHeight))
(update:defmethod :bucket (fn [_ bucket]
(let [crank (playdate.getCrankPosition)
ratio (if (> crank 180) (/ (- 360 crank) -130) (/ crank 130))
clamped (if (< ratio -1) -1
(> ratio 1) 1
ratio)
x (* (/ (+ ratio 1) 2) screenw)]
(set bucket.x x))))
(fn make-image [w h f] (fn make-image [w h f]
(let [image (gfx.image.new w h)] (let [image (gfx.image.new w h)]
(gfx.pushContext image) (gfx.pushContext image)
@ -78,19 +67,38 @@
(fn defsprite [type f] (cache.register-initializer :sprite type f)) (fn defsprite [type f] (cache.register-initializer :sprite type f))
(fn sprite [type ?id] (cache.get :sprite type ?id)) (fn sprite [type ?id] (cache.get :sprite type ?id))
(fn with-image [spr image center-x center-y]
(doto spr (: :setImage image) (: :setCenter center-x center-y)))
(fn with-collision [spr groupmask collidemask ?colliderect]
(doto spr (: :setGroupMask groupmask) (: :setCollidesWithGroupsMask collidemask)
(: :setCollideRect (if ?colliderect ?colliderect (values 0 0 (spr:getSize))))))
(let [bucketw 50 bucketh 10 radius 4 (let [bucketw 50 bucketh 10 radius 4
xoffset (/ bucketw 2) xoffset (/ bucketw 2)
buckety 220 buckety 200
image (make-image bucketw bucketh #(gfx.drawRoundRect 0 0 bucketw bucketh radius))] image (make-image bucketw bucketh #(gfx.drawRoundRect 0 0 bucketw bucketh radius))]
(defsprite :bucket #(doto $1 (: :setImage image) (: :setCenter 0.5 0))) (defsprite :bucket #(doto $1 (with-image image 0.5 0) (with-collision 1 2)))
(draw:defmethod :bucket (fn [_ {: x}] (draw:defmethod :bucket (fn [_ {: x}]
(doto (sprite :bucket) (: :moveTo x buckety))))) (doto (sprite :bucket) (: :moveTo x buckety)))))
(update:defmethod :bucket (fn [_ bucket]
(let [crank (playdate.getCrankPosition)
ratio (if (> crank 180) (/ (- 360 crank) -130) (/ crank 130))
clamped (if (< ratio -1) -1
(> ratio 1) 1
ratio)
x (* (/ (+ ratio 1) 2) screenw)]
(set bucket.x x))
(let [collisions (: (sprite :bucket) :overlappingSprites)]
(each [_ spr (ipairs collisions)]
(print "poof")
(set spr.bomb.defused true)))))
(fn drop-bomb [ctx] (fn drop-bomb [ctx]
(table.insert ctx.bombs {:x ctx.bomber.x :y 30})) (table.insert ctx.bombs {:x ctx.bomber.x :y 30}))
(let [image (make-image 20 30 #(gfx.fillRoundRect 0 0 20 30 6))] (let [image (make-image 20 30 #(gfx.fillRoundRect 0 0 20 30 6))]
(defsprite :bomber #(doto $1 (: :setImage image) (: :setCenter 0.5 0))) (defsprite :bomber #(with-image $1 image 0.5 0))
(draw:defmethod :bomber (fn [_ {: x}] (draw:defmethod :bomber (fn [_ {: x}]
(doto (sprite :bomber) (: :moveTo x 5))))) (doto (sprite :bomber) (: :moveTo x 5)))))
@ -102,25 +110,20 @@
(gfx.sprite.setBackgroundDrawingCallback #(gfx.drawLine 0 33 screenw 33)) (gfx.sprite.setBackgroundDrawingCallback #(gfx.drawLine 0 33 screenw 33))
(let [image (make-image 14 14 #(gfx.fillCircleAtPoint 7 7 7))] (let [image (make-image 14 14 #(gfx.fillCircleAtPoint 7 7 7))]
(defsprite :bombs #(doto $1 (: :setImage image) (: :setCenter 0.5 0.5))) (defsprite :bombs #(doto $1 (with-image image 0.5 0.5) (with-collision 2 1) (tset :bomb $3)))
(draw:defmethod :bombs (fn [_ {: x : y &as bomb}] (draw:defmethod :bombs (fn [_ {: x : y &as bomb}]
(doto (sprite :bombs bomb) (: :moveTo x y))))) (doto (sprite :bombs bomb) (: :moveTo x y)))))
(fn bombspeed [ctx] ctx.level) (fn bombspeed [ctx] (+ ctx.level 5))
(update:defmethod :bombs (fn [_ bomb ibomb ctx] (update:defmethod :bombs (fn [_ bomb ibomb ctx]
(when (= ctx.state :bombing) (when (= ctx.state :bombing)
(set bomb.y (+ bomb.y (bombspeed ctx))) (set bomb.y (+ bomb.y (bombspeed ctx)))
(when (> bomb.y screenh) (when (or (> bomb.y screenh) bomb.defused)
(set ctx.state :lost))))) (destroy-item :bombs bomb ctx ibomb)))))
(cleanup:defmethod :bombs (fn [_ ctx]
(destroy-items :bombs ctx (tbl.keys-matching ctx.bombs #(> $1.y screenh)) #$2)))
(fn scene-update [keys ctx] (fn scene-update [keys ctx]
(do-to-children keys update ctx) (do-to-children keys update ctx)
(each [_ key (ipairs keys)]
(cleanup key ctx))
(do-to-children keys draw ctx)) (do-to-children keys draw ctx))
(scene:defmethod :ingame #(scene-update [:bomber :bombs :bucket] $2)) (scene:defmethod :ingame #(scene-update [:bomber :bombs :bucket] $2))