diff --git a/desktop/resources/title.psd b/desktop/resources/title.psd index 4d7be0f7..052be723 100644 Binary files a/desktop/resources/title.psd and b/desktop/resources/title.psd differ diff --git a/desktop/resources/cloud1.png b/desktop/resources/title/cloud1.png similarity index 100% rename from desktop/resources/cloud1.png rename to desktop/resources/title/cloud1.png diff --git a/desktop/resources/cloud2.png b/desktop/resources/title/cloud2.png similarity index 100% rename from desktop/resources/cloud2.png rename to desktop/resources/title/cloud2.png diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 165c7f83..bd60adfe 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -86,7 +86,9 @@ (label! quit :set-alignment Align/center) (label! fullscreen :set-alignment Align/center) - {:overlay (assoc (texture "title.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + {:background (assoc (texture "title/background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + :cloud-background (assoc (texture "title/clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + :logo (assoc (texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) :fade (assoc (texture "black.png") :scale-x 80 :scale-y 80 @@ -103,7 +105,7 @@ :path (catmull-rom-spline (map #(apply vector-2* %) [[-800 450] [1280 450] [2000 100] [0 100] [-800 300] [1280 300] [2000 450]]) true) :x 450 :y 650) - :clouds (assoc (particle-effect "titleclouds" :reset :start) :x 640 :y 480 ) + :particle-clouds (assoc (particle-effect "title/particle-clouds" :reset :start) :x 640 :y 480 ) :ego-jet (assoc (particle-effect "ego/jet" :reset :start) :x 450 :y 650 ) :toolbox (center (assoc (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) :y 58 :width 500 :height 282)) @@ -149,7 +151,7 @@ entities (fly-ego screen entities)] (music! (:music entities) :set-volume (utils/current-music-volume (:volume entities))) - (render! screen [(:overlay entities) (:clouds entities) (:ego-jet entities) (:flying-ego entities) (:toolbox entities) (:start-playing entities) (:quit entities) (:fullscreen entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:fade entities) ]) + (render! screen [(:background entities) (:particle-clouds entities) (:cloud-background entities) (:ego-jet entities) (:flying-ego entities) (:logo entities) (:toolbox entities) (:start-playing entities) (:quit entities) (:fullscreen entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:fade entities) ]) entities)) :show-screen (fn [entities]