Allow single entities to be returned

This commit is contained in:
oakes
2013-12-31 14:20:31 -05:00
parent 161e8b0333
commit 49ea7602e8

View File

@@ -16,6 +16,10 @@
(load "core_global") (load "core_global")
(load "core_render") (load "core_render")
(defn transform
[l]
(->> l list flatten (remove nil?)))
(defn defscreen* (defn defscreen*
[{:keys [on-show on-render on-dispose on-hide on-pause on-resize on-resume [{:keys [on-show on-render on-dispose on-hide on-pause on-resize on-resume
state renderer camera] state renderer camera]
@@ -36,8 +40,7 @@
:total-time 0 :total-time 0
:delta-time 0) :delta-time 0)
on-show on-show
vec transform
flatten
(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)
@@ -45,9 +48,7 @@
: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?) transform
vec
flatten
(reset! entities) (reset! entities)
(draw! screen-map)))) (draw! screen-map))))
(hide [] (on-hide @screen)) (hide [] (on-hide @screen))