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

Fix how listeners are initialized

Browse Source
This commit is contained in:
oakes
2014-05-25 15:28:14 -04:00
parent 63c316de64
commit 817d36e82e
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/play_clj/core.clj
View File

@@ -72,13 +72,10 @@
#(normalize (func screen-map old-entities))
(meta func))
(wrapper screen)
(reset-changed! entities old-entities)))))]
; add the input listeners to the screen atom
(when-not (:input-listeners @screen)
(->> (input-listeners options execute-fn!)
(swap! screen assoc :input-listeners)))
(reset-changed! entities old-entities)))))
total-time (atom 0)]
; update screen when either the screen or entities are changed
(add-watch screen :changed (fn [_ _ _ new-screen]
(add-watch screen :changed (fn [_ _ old-screen new-screen]
(update-screen! new-screen)))
(add-watch entities :changed (fn [_ _ _ new-entities]
(update-screen! @screen new-entities)))
@@ -92,14 +89,14 @@
:update-fn! #(apply swap! screen %1 %2)
:execute-fn! execute-fn!
:on-timer on-timer
:input-listeners (input-listeners options execute-fn!)
:ui-listeners (ui-listeners options execute-fn!))
(execute-fn! on-show)
(when-not (:contact-listener @screen)
(->> (contact-listener @screen options execute-fn!)
(swap! screen assoc :contact-listener))))
(->> (contact-listener @screen options execute-fn!)
(swap! screen assoc :contact-listener)))
:render (fn [d]
(swap! screen #(assoc % :total-time (+ (:total-time %) d)))
(execute-fn! on-render :delta-time d))
(swap! total-time + d)
(execute-fn! on-render :delta-time d :total-time @total-time))
:hide #(execute-fn! on-hide)
:pause #(execute-fn! on-pause)
:resize #(execute-fn! on-resize :width %1 :height %2)
@@ -450,7 +447,7 @@ via the screen map.
(doseq [screen screen-objects]
(apply (get screen k) args)))]
(.setScreen game-object (reify Screen
(show [this] (add-inputs!) (run-fn! :show))
(show [this] (run-fn! :show) (add-inputs!))
(render [this d] (run-fn! :render d))
(hide [this] (run-fn! :hide))
(pause [this] (run-fn! :pause))

4
src/play_clj/core_basics.clj
View File

@@ -130,12 +130,12 @@
(defn ^:private add-input!
[^InputProcessor p]
(let [^InputMultiplexer multi (input! :get-input-processor)]
(when-let [^InputMultiplexer multi (input! :get-input-processor)]
(.addProcessor multi p)))
(defn ^:private remove-input!
[^InputProcessor p]
(let [^InputMultiplexer multi (input! :get-input-processor)]
(when-let [^InputMultiplexer multi (input! :get-input-processor)]
(.removeProcessor multi p)))
(defn sound*