From 23d90e1a05da94981f9dc067f1b05c0e1f7a90d9 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Fri, 1 May 2015 18:09:03 -0700
Subject: [PATCH] fading covers all.

---
 desktop/src-common/advent/screens/fade.clj  | 40 +++++++++++++++++++++
 desktop/src-common/advent/screens/scene.clj | 11 +++---
 desktop/src-common/advent/screens/title.clj |  3 +-
 3 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 desktop/src-common/advent/screens/fade.clj

diff --git a/desktop/src-common/advent/screens/fade.clj b/desktop/src-common/advent/screens/fade.clj
new file mode 100644
index 00000000..ed5c0c8d
--- /dev/null
+++ b/desktop/src-common/advent/screens/fade.clj
@@ -0,0 +1,40 @@
+(ns advent.screens.fade
+  (:require [play-clj.core :refer :all]
+            [play-clj.ui :refer :all]
+            [play-clj.utils :refer :all]
+            [play-clj.g2d :refer :all]
+            [clojure.pprint]
+            [advent.pathfind]
+            [advent.zone :as zone]
+            [advent.utils :as utils])
+  (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter]
+           [com.badlogic.gdx.graphics.g2d TextureRegion]
+           [com.badlogic.gdx.scenes.scene2d.utils Align]
+           [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input
+            InputMultiplexer InputProcessor Net Preferences Screen]))
+
+
+(defscreen fade-screen
+  :on-show
+  (fn [screen entities]
+    (utils/setup-viewport screen 320 240)
+    
+    {:fade (assoc (texture "black.png")
+                  :scale-x 80
+                  :scale-y 80 
+                  :opacity 0.0
+                  :origin-x 0
+                  :origin-y 0)})
+
+  
+  :on-render
+  (fn [screen [entities]]
+    (render! screen [(:fade entities)])
+    entities)
+
+  :update-fade (fn [{:keys [opacity]} [entities]]
+                 (assoc-in entities [:fade :opacity] opacity))
+  
+  :on-resize (fn [{:keys [width height viewport]} entities]
+               (.update viewport width height)))
+
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 866cff7a..ab14b258 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/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))
diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj
index 73a53320..3475aff0 100644
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -10,6 +10,7 @@
             [advent.screens.title :as title]
             [advent.screens.inventory :as inventory]
             [advent.screens.safe :as safe]
+            [advent.screens.fade :as fade]
             )
   (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter]
            [com.badlogic.gdx.graphics.g2d TextureRegion]
@@ -110,7 +111,7 @@
                                      (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0
                                                   :finish (fn [entities]
                                                             (utils/stop-sound (:music entities))
-                                                            (set-screen! @(resolve 'advent.core/advent) scene/scene scene/hud dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen)
+                                                            (set-screen! @(resolve 'advent.core/advent) scene/scene scene/hud dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen fade/fade-screen)
                                                             entities)
                                                   :ease tween/ease-in-cubic))
                            (assoc-in [:tweens :fade-out-music]