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

Merge branch 'fix-input-issue'

Browse Source
This commit is contained in:
Remington Covert
2015-03-07 08:04:02 -08:00
parent de5b1944c0 4120eed58a
commit 3b9972e958
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/play_clj/core.clj
View File

@@ -515,11 +515,15 @@ keywords and functions in pairs."
(let [run-fn! (fn [k & args] (let [run-fn! (fn [k & args]
(doseq [screen screen-objects] (doseq [screen screen-objects]
(apply (get screen k) args)))] (apply (get screen k) args)))]
(when-let [old-screen (.getScreen game-object)]
(.dispose old-screen))
(on-gl
(.setScreen game-object (.setScreen game-object
(reify Screen (reify Screen
(show [this] (show [this]
(input! :set-input-processor (InputMultiplexer.)) (input! :set-input-processor (InputMultiplexer.))
(run-fn! :show) (run-fn! :show)
(doseq [{:keys [screen]} screen-objects] (doseq [{:keys [screen]} screen-objects]
(doseq [[_ listener] (:input-listeners @screen)] (doseq [[_ listener] (:input-listeners @screen)]
(add-input! listener)))) (add-input! listener))))
@@ -528,7 +532,7 @@ keywords and functions in pairs."
(pause [this] (run-fn! :pause)) (pause [this] (run-fn! :pause))
(resize [this w h] (run-fn! :resize w h)) (resize [this w h] (run-fn! :resize w h))
(resume [this] (run-fn! :resume)) (resume [this] (run-fn! :resume))
(dispose [this]))))) (dispose [this]))))))
(defn set-screen-wrapper! (defn set-screen-wrapper!
"Sets a function that wraps around all screen functions, allowing you to "Sets a function that wraps around all screen functions, allowing you to