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

it all works, rather smoothly too.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-29 17:32:21 -07:00
parent 03cba14c2a
commit 42067c1080
19 changed files with 206 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
desktop/src-common/advent/screens/scene.clj
View File

@@ -1204,26 +1204,29 @@
_ (update! screen :shader shader)
log-assets (fn [r] r)
wrap (fn [maker]
wrap (fn [maker atlas-file]
(fn [screen]
(-> (maker screen)
(add-georgia screen global-atlas))))
rooms {:inside-house (wrap rooms.inside-house/make)
:inside-stash (wrap rooms.inside-stash/make)
:outside-house (wrap rooms.outside-house/make)
:behind-house (wrap rooms.behind-house/make)
:cat-tree (wrap rooms.cat-tree/make)
:inside-castle (wrap rooms.inside-castle/make)
:space (wrap rooms.space/make)
:held (wrap rooms.held/make)
:inside-cafeteria (wrap rooms.inside-cafeteria/make)
:inside-antique (wrap rooms.inside-antique/make)
:inside-jail (wrap rooms.inside-jail/make)
:dream (wrap rooms.dream/make)
:ending (wrap rooms.ending/make)
:castle-gate (wrap rooms.castle-gate/make)
:outside-jail (wrap rooms.outside-jail/make)
:outside-castle (wrap rooms.outside-castle/make) }
(let [[screen atlas] (utils/acquire-atlas screen atlas-file :room)
[screen global-atlas ] (utils/acquire-atlas screen "packed/global.atlas" :room)]
(-> (maker screen atlas global-atlas)
(add-georgia screen global-atlas)))))
rooms {:inside-house (wrap rooms.inside-house/make "packed/inside-house.atlas")
:inside-stash (wrap rooms.inside-stash/make "packed/inside-stash.atlas")
:outside-house (wrap rooms.outside-house/make "packed/outsidehouse.atlas")
:behind-house (wrap rooms.behind-house/make "packed/behindhouse.atlas")
:cat-tree (wrap rooms.cat-tree/make "packed/cat-tree.atlas")
:inside-castle (wrap rooms.inside-castle/make "packed/inside-castle.atlas")
:space (wrap rooms.space/make "packed/space.atlas")
:held (wrap rooms.held/make "packed/held.atlas")
:inside-cafeteria (wrap rooms.inside-cafeteria/make "packed/inside-cafeteria.atlas")
:inside-antique (wrap rooms.inside-antique/make "packed/inside-antique.atlas")
:inside-jail (wrap rooms.inside-jail/make "packed/inside-jail.atlas")
:dream (wrap rooms.dream/make "packed/dream.atlas")
:ending (wrap rooms.ending/make "packed/ending.atlas")
:castle-gate (wrap rooms.castle-gate/make "packed/castle-gate.atlas")
:outside-jail (wrap rooms.outside-jail/make "packed/outside-jail.atlas")
:outside-castle (wrap rooms.outside-castle/make "packed/outside-castle.atlas") }
entities {:rooms rooms
:step-particles (assoc (particle-effect "particles/step") :x 100 :y 100 :baseline 241)
:cam {:zoom utils/min-zoom
@@ -1479,6 +1482,9 @@
(assoc-in [:tweens :fade-out]
(tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0
:finish #(do
(-> screen
(utils/release-resources :room)
(utils/release-resources :default))
(utils/stop-all-sounds! %)
(set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen))
%))))))