totally reworking music transitions.

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

@@ -60,9 +60,14 @@
 
 (defn left-click [screen entities]
   (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
-    (println "clicked " [x y])
-    (if ((:mouse-in? (:inventory entities)) x y)
+    (cond
+      ((:mouse-in? (:inventory entities)) x y)
       (click-inventory screen entities)
+      (utils/intersects? (:close entities) [x y])
+      (assoc-in entities [:tweens :fade-out] (utils/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 :finish #(do (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen))
+                                                                                                                     %)))
+      
+      :else
       (let [interaction (first (filter #((:mouse-in? %) entities x y)
                                        (get-in entities [:room :interactions])))
             interacting-entity (first (sort-by (comp - :baseline) (filter #(and (:mouse-in? %)
@@ -358,7 +363,6 @@
         (sound! (snd e) :play (* (/ (get-in entities [:ego :scale-x]) 1.5) 0.75))))))
 
 
-
 (defscreen scene
   :on-timer
   (fn [screen [entities]]
@@ -406,6 +410,10 @@
                                 :started? false}
                       :volume {:object nil
                                :value 0.0}
+                      :music-override {:object nil
+                                       :value nil}
+                      :close (assoc (texture "close.png") :x 304 :y 224 :width 16 :height 16 :baseline 9000)
+                      
                       :cursor {:id "cursor"
                                :current :main
                                :last :main
@@ -419,6 +427,7 @@
                       :inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000
                                         :mouse-in? (zone/box 278 0 320 42))
                       :fps (assoc (label "0" (color :white) ) :x 5 :baseline 0)}]
+        (music! (utils/get-current-music entities) :set-volume (get-in entities [:volume :value]))
 
         (utils/play-sound (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))]))
 
@@ -455,6 +464,8 @@
           
           all-entities (concat (vals entities) layers (vals (get-in entities [:room :entities])))]
       (play-key-sounds (get-in entities [:room :entities]))
+      (when-let [current-music (utils/get-current-music entities)]
+        (music! current-music :set-volume (get-in entities [:volume :value]) ))
       
       (label! (:fps entities) :set-text (str (game :fps))) 
       (render! screen (sort-by :baseline all-entities))