fading covers all.

desktop/src-common/advent/screens/scene.clj

@@ -15,6 +15,7 @@
             [advent.utils :as utils]
             [advent.tween :as tween]
             [advent.screens.rooms :as rooms]
+            [advent.screens.fade :refer [fade-screen]]
             [advent.screens.items :as items]
             [advent.screens.rooms.dream :as rooms.dream]
             [advent.screens.rooms.castle-gate :as rooms.castle-gate]
@@ -596,13 +597,8 @@
 
                         :sounds {:blink (sound "blink-other.ogg")
                                  :object nil}
-                        :fade (assoc (texture "black.png")
-                                     :scale-x 20
-                                     :scale-y 20
-                                     :baseline 9500
-                                     :opacity 0.0
-                                     :origin-x 0
-                                     :origin-y 0)
+                        :fade {:object nil
+                               :opacity 0.0} 
                         :white-fade (assoc (texture "white.png")
                                            :scale-x 20
                                            :scale-y 20
@@ -697,6 +693,7 @@
           
           all-entities (concat (vals entities) layers (vals (get-in entities [:room :entities])))]
       (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]))
       (when true #_(not (get-in entities [:cam :paused?]))
         (set! (. camera zoom) (:zoom (:cam entities)))
         (set! (.. camera position x) (:x (:cam entities) 160.0))