Don't save duplicate entities vectors in timeline

This commit is contained in:
oakes
2014-09-19 14:46:25 -04:00
parent ab3ad38890
commit 63f7aaa70a
2 changed files with 6 additions and 7 deletions

View File

@@ -69,8 +69,7 @@
update-in update-in
[:timeline] [:timeline]
#(conj (or %1 []) %2) #(conj (or %1 []) %2)
[(:total-time screen) entities]))) [(:total-time screen) entities]))))
entities)
(defn defscreen* (defn defscreen*
[screen entities [screen entities
@@ -85,8 +84,7 @@
(meta func)) (meta func))
(wrapper screen) (wrapper screen)
(reset-changed! entities old-entities) (reset-changed! entities old-entities)
(update-screen! @screen))) (update-screen! @screen)))))
@entities))
execute-fn-on-gl! (fn [& args] execute-fn-on-gl! (fn [& args]
(on-gl (apply execute-fn! args))) (on-gl (apply execute-fn! args)))
update-fn! (fn [func & args] update-fn! (fn [func & args]
@@ -119,8 +117,8 @@
update-screen!)) update-screen!))
:render (fn [d] :render (fn [d]
(swap! screen update-in [:total-time] #(+ (or %1 0) %2) d) (swap! screen update-in [:total-time] #(+ (or %1 0) %2) d)
(->> (execute-fn! on-render :delta-time d) (some->> (execute-fn! on-render :delta-time d)
(add-to-timeline! screen))) (add-to-timeline! screen)))
:hide #(execute-fn! on-hide) :hide #(execute-fn! on-hide)
:pause #(execute-fn! on-pause) :pause #(execute-fn! on-pause)
:resize (fn [w h] :resize (fn [w h]

View File

@@ -216,4 +216,5 @@ in the `screen`."
([{:keys [renderer world] :as screen} entities] ([{:keys [renderer world] :as screen} entities]
(when (isa? (type renderer) Stage) (when (isa? (type renderer) Stage)
(update-stage! screen entities)) (update-stage! screen entities))
(update-physics! screen entities))) (update-physics! screen entities)
entities))