probably bugs, but faster.

This commit is contained in:
Bryce Covert
2016-08-05 17:07:21 -07:00
parent 8dd00098ad
commit 5296ff3c74
8 changed files with 108 additions and 107 deletions

View File

@@ -41,7 +41,7 @@
(defscreen safe-screen
:on-show
(fn [screen entities]
(fn [screen entities options]
(utils/setup-viewport screen 320 240)
(let [inputed-key (utils/get-texture "inside-house/inputed-key.png")]
@@ -60,14 +60,14 @@
:on-render
(fn [{:keys [^FitViewport viewport] :as screen} entities]
(fn [{:keys [^FitViewport viewport] :as screen} entities options]
(.apply viewport)
(when (:shown? entities)
(render! screen [(:fade entities) (:safe entities)])
(render! screen (take (count (:button-choices entities)) (:entered-keys entities))))
entities)
:show-screen (fn [{:keys [success failure]} entities]
:show-screen (fn [_ entities {:keys [success failure]}]
(sound! (utils/load-sound "inside-house/open-safe.ogg") :play (utils/current-sound-volume 0.3))
(assoc entities
:shown? true
@@ -75,12 +75,12 @@
:success success
:failure failure))
:on-mouse-moved (fn [screen entities]
:on-mouse-moved (fn [screen entities options]
entities)
:on-touch-up (fn [screen entities]
:on-touch-up (fn [screen entities options]
(when (:shown? entities)
(let [[x y] (utils/unproject screen)]
(let [[x y] (utils/unproject screen options)]
(if-let [button (get-button [x y])]
(do (sound! (:sound button) :play (utils/current-sound-volume 0.3))
(let [new-state (update-in entities [:button-choices] #(conj % (:id button)))]
@@ -107,6 +107,6 @@
(sound! (utils/load-sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume 0.3))
(close entities)))))))
:on-resize (fn [{:keys [width height ^FitViewport viewport]} entities]
:on-resize (fn [{:keys [^FitViewport viewport]} entities {:keys [width height]}]
(.update viewport width height)))