almost everything is functional again.
This commit is contained in:
@@ -134,12 +134,15 @@
|
||||
(= 0.0 (get-in entities [:fade :opacity])))
|
||||
(let [[[logo & msg] & remaining-messages] (:remaining-messages entities)]
|
||||
(if msg
|
||||
(-> entities
|
||||
(fade-logo-if-necessary screen logo)
|
||||
(assoc :credit-table (msg->table msg entities))
|
||||
(assoc-in [:tweens [:fade :in]] (chain-tweens screen entities))
|
||||
(assoc :remaining-messages remaining-messages)
|
||||
(assoc :last-logo logo))
|
||||
(do
|
||||
(utils/clear-stage screen)
|
||||
(-> entities
|
||||
(fade-logo-if-necessary screen logo)
|
||||
(assoc :credit-table (->> (msg->table msg entities)
|
||||
(utils/add-actor-to-stage screen)))
|
||||
(assoc-in [:tweens [:fade :in]] (chain-tweens screen entities))
|
||||
(assoc :remaining-messages remaining-messages)
|
||||
(assoc :last-logo logo)))
|
||||
(do (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen))
|
||||
entities)))
|
||||
entities))
|
||||
@@ -147,7 +150,7 @@
|
||||
|
||||
(defscreen credits
|
||||
:on-show
|
||||
(fn [screen entities]
|
||||
(fn [screen entities options]
|
||||
(utils/setup-viewport screen 1280 960)
|
||||
(graphics! :set-cursor (utils/cursor "cursor.png" :main))
|
||||
(let [font (bitmap-font "ego/font.fnt" )]
|
||||
@@ -185,24 +188,24 @@
|
||||
:tweens {:fade-in
|
||||
(tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 5.0 :ease tween/ease-out-cubic)}}))
|
||||
:on-key-up
|
||||
(fn [screen entities]
|
||||
(fn [screen entities options]
|
||||
(when (= (key-code :escape) (:key screen))
|
||||
(utils/toggle-fullscreen!))
|
||||
nil)
|
||||
|
||||
:on-render
|
||||
(fn [{:keys [^FitViewport viewport] :as screen} entities]
|
||||
(fn [{:keys [^FitViewport viewport] :as screen} entities options]
|
||||
(.apply viewport)
|
||||
(let [entities (utils/apply-tweens screen entities (:tweens entities))
|
||||
entities (start-message-if-necessary screen entities)]
|
||||
(let [entities (start-message-if-necessary screen entities)
|
||||
entities (utils/apply-tweens screen entities (:tweens entities))]
|
||||
(clear!)
|
||||
(render! screen [(:bg entities) (:credit-table entities) (:fade entities) (:dbh entities) (:pos entities)])
|
||||
entities))
|
||||
|
||||
|
||||
:on-touch-up (fn [screen entities]
|
||||
:on-touch-up (fn [screen entities options]
|
||||
(set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)))
|
||||
|
||||
:on-resize (fn [{:keys [width height ^FitViewport viewport]} entities]
|
||||
:on-resize (fn [{:keys [^FitViewport viewport]} entities {:keys [width height]}]
|
||||
(.update viewport width height)))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user