I don't think start-showing is needed anymore.
This commit is contained in:
@@ -18,7 +18,6 @@
|
|||||||
(defn close [screen entities]
|
(defn close [screen entities]
|
||||||
(screen! @(resolve 'advent.screens.scene/scene) :on-reactivate)
|
(screen! @(resolve 'advent.screens.scene/scene) :on-reactivate)
|
||||||
(-> entities
|
(-> entities
|
||||||
(assoc :start-showing? false)
|
|
||||||
(assoc-in [:tweens :fade-out] (tween/tween :fade-out screen [:opacity] 1.0 0.0 0.2 :ease tween/ease-out-cubic
|
(assoc-in [:tweens :fade-out] (tween/tween :fade-out screen [:opacity] 1.0 0.0 0.2 :ease tween/ease-out-cubic
|
||||||
:finish #(assoc % :shown? false)))))
|
:finish #(assoc % :shown? false)))))
|
||||||
|
|
||||||
@@ -40,7 +39,6 @@
|
|||||||
:all-items (texture! (texture (pixmap "cursor.png")) :split 16 16)
|
:all-items (texture! (texture (pixmap "cursor.png")) :split 16 16)
|
||||||
:items []
|
:items []
|
||||||
:shown? false
|
:shown? false
|
||||||
:start-showing? false
|
|
||||||
:highlighted-item nil
|
:highlighted-item nil
|
||||||
:opacity 0.0
|
:opacity 0.0
|
||||||
:tweens {}
|
:tweens {}
|
||||||
@@ -48,11 +46,7 @@
|
|||||||
|
|
||||||
:on-render
|
:on-render
|
||||||
(fn [screen [entities]]
|
(fn [screen [entities]]
|
||||||
(let [entities (if (:start-showing? entities)
|
(let [
|
||||||
(-> entities
|
|
||||||
(assoc :start-showing? false)
|
|
||||||
(assoc :shown? true))
|
|
||||||
entities)
|
|
||||||
entities (utils/apply-tweens screen entities (:tweens entities))
|
entities (utils/apply-tweens screen entities (:tweens entities))
|
||||||
opacity (get-in entities [:opacity])
|
opacity (get-in entities [:opacity])
|
||||||
entities (-> entities
|
entities (-> entities
|
||||||
@@ -77,7 +71,7 @@
|
|||||||
entities
|
entities
|
||||||
|
|
||||||
(-> entities
|
(-> entities
|
||||||
(assoc :start-showing? true
|
(assoc :shown? true
|
||||||
:opacity 0.0
|
:opacity 0.0
|
||||||
:items (for [[item index] (map vector items (range))
|
:items (for [[item index] (map vector items (range))
|
||||||
:let [row (int (/ index 8))
|
:let [row (int (/ index 8))
|
||||||
|
|||||||
Reference in New Issue
Block a user