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

screens can load their resources

Browse Source
This commit is contained in:
Bryce Covert
2017-05-27 17:11:16 -07:00
parent 5332683347
commit b863e1de12
9 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -858,6 +858,8 @@
(if anim-loop?
(get-looped-animation-point anim last-animated-time)
last-animated-time))]
(if (and (= current-frame-index (:current-frame-index entity) (:previous-frame-index entity))
(not (:force-rerender entity)))
entity
@@ -1206,23 +1208,24 @@
_ (update! screen :shader shader)
log-assets (fn [r] r)
rooms {:inside-house (rooms.inside-house/make screen)
:inside-stash (rooms.inside-stash/make screen)
:outside-house (rooms.outside-house/make screen)
:behind-house (rooms.behind-house/make screen)
:cat-tree (rooms.cat-tree/make screen)
:inside-castle (rooms.inside-castle/make screen)
:space (rooms.space/make screen)
:held (rooms.held/make screen)
:inside-cafeteria (rooms.inside-cafeteria/make screen)
:inside-antique (rooms.inside-antique/make screen)
:inside-jail (rooms.inside-jail/make screen)
:dream (rooms.dream/make screen)
:ending (rooms.ending/make screen)
:castle-gate (rooms.castle-gate/make screen)
:outside-jail (rooms.outside-jail/make screen)
:outside-castle (rooms.outside-castle/make screen)}
rooms (add-georgia-to-all-rooms screen rooms)
rooms {:inside-house rooms.inside-house/make
:inside-stash rooms.inside-stash/make
:outside-house rooms.outside-house/make
:behind-house rooms.behind-house/make
:cat-tree rooms.cat-tree/make
:inside-castle rooms.inside-castle/make
:space rooms.space/make
:held rooms.held/make
:inside-cafeteria rooms.inside-cafeteria/make
:inside-antique rooms.inside-antique/make
:inside-jail rooms.inside-jail/make
:dream rooms.dream/make
:ending rooms.ending/make
:castle-gate rooms.castle-gate/make
:outside-jail rooms.outside-jail/make
:outside-castle rooms.outside-castle/make }
;; TODO RE ADD
#_#_rooms (add-georgia-to-all-rooms screen rooms)
entities {:rooms rooms
:step-particles (assoc (particle-effect "particles/step") :x 100 :y 100 :baseline 241)
:cam {:zoom utils/min-zoom
@@ -1298,7 +1301,7 @@
:all-items (assoc items/items :object nil)
:started? {:value false
:object nil}
:room (as-> (get rooms (:last-room state)) room
:room (as-> ((get rooms (:last-room state)) screen) room
(assoc-in room [:entities :ego] (get-ego screen global-atlas (if has-start-pos?
start-pos
(:start-pos room))