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

more trimming of stuff.

Browse Source
This commit is contained in:
Bryce Covert
2016-08-05 08:47:09 -07:00
parent 4a2421f7b4
commit 8dd00098ad
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1253,7 +1253,7 @@ void main ()
entities))
entities (grab-layers entities)
layers (get-in entities [:room :current-layers])
all-entities (concat (vals entities) layers (vals (get-in entities [:room :entities])))]
all-entities (concat layers (vals (get-in entities [:room :entities])))]
(screen! fade-screen :update-fade {:opacity (get-in entities [:fade :opacity])})
(doseq [m (vals (get-in entities [:musics]))]
(when m
@@ -1274,18 +1274,6 @@ void main ()
entities (update-from-room screen entities)
entities (update-from-hotspots screen entities)
entities (update-in entities [:room :entities] (fn [entities]
(into entities
(for [[id entity] entities]
(if (:anim entity)
[id (animate entity screen)]
[id entity])))))
entities (update-in entities [:room :entities] (fn [entities]
(into entities
(for [[id entity] entities]
(if (:update-fn entity)
[id ((:update-fn entity) screen entities entity)]
[id entity])))))
entities (if (and (@utils/settings :camera-man? true)
(not (get-in entities [:cam :paused?]))
@@ -1310,14 +1298,22 @@ void main ()
entities (grab-layers entities)
get-rendered (partial get-rendered entities)
update-room (comp
#(if (:anim %)
(animate % screen)
%)
#(if (:update-fn %)
((:update-fn %) screen entities %)
%)
(partial get-rendered entities))
entities (loop [entities entities
[[k e] & rest] (seq (get-in entities [:room :entities]))]
(if k
(recur (update-in entities [:room :entities k] get-rendered) rest)
(recur (update-in entities [:room :entities k] update-room)
rest)
entities))
layers (get-in entities [:room :current-layers])
all-entities (concat (vals entities) layers (vals (get-in entities [:room :entities])))]
all-entities (concat layers (vals (get-in entities [:room :entities])))]
(clear!)
(screen! talking-screen :on-update-camera { :scene-viewport (:viewport screen) :scene-camera (:camera screen)})
(screen! fade-screen :update-fade { :opacity (get-in entities [:fade :opacity])})
@@ -1332,7 +1328,7 @@ void main ()
(doseq [m (vals (get-in entities [:musics]))]
(when m
(music! m :set-volume (utils/current-music-volume (get-in entities [:volume :value])))))
(doseq [e (doall (sort-by :baseline all-entities))]
(doseq [e (sort-by :baseline all-entities)]
(if (:parallax e)
(render-parallax screen e)
(render! screen [e])))