notid/play-clj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force entities list to be a vector, and rename function

Browse Source
This commit is contained in:
oakes
2013-12-31 13:33:13 -05:00
parent 8d01b4da17
commit 39e80a1be3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/play_clj/core.clj
View File

@@ -36,6 +36,7 @@
:total-time 0 :total-time 0
:delta-time 0) :delta-time 0)
on-show on-show
vec
(reset! entities))) (reset! entities)))
(render [delta-time] (render [delta-time]
(let [total-time (+ (:total-time @screen) delta-time) (let [total-time (+ (:total-time @screen) delta-time)
@@ -43,6 +44,8 @@
:total-time total-time :total-time total-time
:delta-time delta-time)] :delta-time delta-time)]
(->> (on-render screen-map @entities) (->> (on-render screen-map @entities)
(remove nil?)
vec
(reset! entities) (reset! entities)
(draw! screen-map)))) (draw! screen-map))))
(hide [] (on-hide @screen)) (hide [] (on-hide @screen))

4
common/src/play_clj/core_2d.clj
View File

@@ -45,8 +45,8 @@
(utils/static-field :graphics :g2d :Animation (utils/static-field :graphics :g2d :Animation
~(or (first args) :normal)))) ~(or (first args) :normal))))
(defn get-animation-frame (defn get-key-frame
([screen ^Animation animation] ([screen ^Animation animation]
(get-animation-frame screen animation true)) (get-key-frame screen animation true))
([screen ^Animation animation is-looping?] ([screen ^Animation animation is-looping?]
(.getKeyFrame animation (:total-time screen) is-looping?))) (.getKeyFrame animation (:total-time screen) is-looping?)))