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

fading in and out is better.

Browse Source
This commit is contained in:
Remington Covert
2015-02-07 12:50:55 -08:00
parent eb574f0f13
commit 50bb4ac179
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
desktop/src-common/advent/screens/title.clj
View File

@@ -16,16 +16,7 @@
[com.badlogic.gdx Application Audio Files Game Gdx Graphics Input [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input
InputMultiplexer InputProcessor Net Preferences Screen])) InputMultiplexer InputProcessor Net Preferences Screen]))
(defn tween [id screen path start end time finish]
(let [start-time (or (:total-time screen) 0.0)]
(fn [e total-time]
(let [delta-time (- total-time start-time)
pct-done (min (/ delta-time time) 1.0)
e (assoc-in e path (+ start (* pct-done (- end start))))]
(if (= 1.0 pct-done)
(update-in (finish e) [:tweens] dissoc id)
e)
))))
(defscreen title-screen (defscreen title-screen
:on-show :on-show
@@ -44,15 +35,14 @@
:volume 1.0 :volume 1.0
:start-showing? false :start-showing? false
:start-playing start-playing :start-playing start-playing
:tweens {:fade-in (tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 #(do (utils/play-sound (:music %)) %))} :tweens {:fade-in (utils/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0
:finish #(do (utils/play-sound (:music %)) %)
:power 10.0)}
})) }))
:on-render :on-render
(fn [screen [entities]] (fn [screen [entities]]
(let [entities (reduce (fn [e f] (let [entities (utils/apply-tweens screen entities (:tweens entities))]
(f e (:total-time screen)))
entities
(vals (:tweens entities)))]
(music! (:music entities) :set-volume (:volume entities)) (music! (:music entities) :set-volume (:volume entities))
(render! screen [(:overlay entities) (:start-playing entities) (:fade entities)]) (render! screen [(:overlay entities) (:start-playing entities) (:fade entities)])
entities)) entities))
@@ -66,13 +56,14 @@
:on-touch-up (fn [screen [entities]] :on-touch-up (fn [screen [entities]]
(-> entities (-> entities
(assoc-in [:tweens :fade-out] (assoc-in [:tweens :fade-out]
(tween :fade-out screen [:fade :opacity] 0.0 1.0 2.0 (utils/tween :fade-out screen [:fade :opacity] 0.0 1.0 2.0
(fn [entities] :finish (fn [entities]
(utils/stop-sound (:music entities)) (utils/stop-sound (:music entities))
(set-screen! @(resolve 'advent.core/advent) scene/scene dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen) (set-screen! @(resolve 'advent.core/advent) scene/scene dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen)
entities))) entities)
:power 3.0))
(assoc-in [:tweens :fade-out-music] (assoc-in [:tweens :fade-out-music]
(tween :fade-out-music screen [:volume] 1.0 0.0 1.8 identity)))) (utils/tween :fade-out-music screen [:volume] 1.0 0.0 1.8))))
:on-resize (fn [screen entities] :on-resize (fn [screen entities]
(size! screen 1280 960))) (size! screen 1280 960)))

20
desktop/src-common/advent/utils.clj
View File

@@ -125,3 +125,23 @@
(defn make-music [r] (defn make-music [r]
(doto (music r) (music! :set-looping true))) (doto (music r) (music! :set-looping true)))
(defn tween [id screen path start end duration & {:keys [finish power]}]
(let [power (or power 1.0)
finish (or finish identity)
start-time (or (:total-time screen) 0.0)
delta (- end start)]
(fn [e total-time]
(let [delta-time (- total-time start-time)
pct-done (min (/ delta-time duration) 1.0)
pct-done (Math/pow pct-done power)
e (assoc-in e path (+ start (* pct-done delta)))]
(if (= 1.0 pct-done)
(update-in (finish e) [:tweens] dissoc id)
e)
))))
(defn apply-tweens [screen entities tweens]
(reduce (fn [e f]
(f e (:total-time screen)))
entities
(vals tweens)))