From 273548e9d1b5d105f56d85c623c0dbd5c6ac3ea5 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Thu, 21 May 2015 18:14:57 -0700
Subject: [PATCH] improving the ui, maybe.

---
 desktop/resources/ui/slider-bar.png         | Bin 1268 -> 1284 bytes
 desktop/resources/ui/ui.atlas               |  17 +++++---
 desktop/resources/ui/ui.json                |   1 +
 desktop/resources/ui/ui.png                 | Bin 313 -> 478 bytes
 desktop/settings.edn                        |   2 +-
 desktop/src-common/advent/screens/title.clj |  43 +++++++++++++++-----
 6 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/desktop/resources/ui/slider-bar.png b/desktop/resources/ui/slider-bar.png
index a31eed342dd3a6e7a524844e16e18e1c59d78b50..3b41f6b2b365e8a16e5ed1e9c3e2d6a29b0a9ab8 100644
GIT binary patch
delta 199
zcmV;&0672j34{ue7YaNG1^@s6W_FrZu^}@Af161}K~z`??boplfFKYBP%y4S=?YGy
zD^Re4ZpSd%a=+m6qXh}y$_sqMJ+IIZM!%wWz*_6m?nx<iGfTVqk9$4vyW;qUD>hk5
zF>~jw=bX)4j^DCQi0_oIWyqUhLWU^9*D~bIFd;(};cFT4W|)v6itx1zc{5B*Xc+e`
zF?PTD(a5W3H1tgFGZ^FJ3g*uV^Aj4XWgG&&egVj!4`kY{W556a002ovPDHLkV1juM
BTJHb=

delta 183
zcmV;o07(CY3iJt(7YZl{1^@s6{xRCyu^}@Ae~U>(K~zW$V`LxzZr{HBA6bd2swyKg
zADzvFE<h=N)Idr@kbz<Fhan5PC!3m@P|_VC`MSC~lyo`xy*%nd^f)D*KN^OlhZ(w#
z(J(|05z_giVMuzIq3fV}7&6-FGUBa6&|N@?Pjwd#egjeJRBYihC6@sujB_S4;MFtu
lA-z26LTvF&ni$o?5CEH~4?s;)k*@#%002ovPDHLkV1oLpOk@B6

diff --git a/desktop/resources/ui/ui.atlas b/desktop/resources/ui/ui.atlas
index 6f4af589..89331bba 100644
--- a/desktop/resources/ui/ui.atlas
+++ b/desktop/resources/ui/ui.atlas
@@ -1,12 +1,12 @@
 
 ui.png
-size: 32,128
+size: 128,64
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 slider
   rotate: false
-  xy: 2, 2
+  xy: 46, 42
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -14,8 +14,15 @@ slider
   index: -1
 slider-bar
   rotate: false
-  xy: 2, 24
-  size: 20, 40
-  orig: 20, 40
+  xy: 2, 2
+  size: 20, 60
+  orig: 20, 60
+  offset: 0, 0
+  index: -1
+slider-bar-hover
+  rotate: false
+  xy: 24, 2
+  size: 20, 60
+  orig: 20, 60
   offset: 0, 0
   index: -1
diff --git a/desktop/resources/ui/ui.json b/desktop/resources/ui/ui.json
index 0721c40a..83f4bb5a 100644
--- a/desktop/resources/ui/ui.json
+++ b/desktop/resources/ui/ui.json
@@ -2,4 +2,5 @@
 
 com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
 	default-horizontal: { background: slider, knob: slider-bar }
+	default-horizontal-hover: { background: slider, knob: slider-bar-hover }
 }}
diff --git a/desktop/resources/ui/ui.png b/desktop/resources/ui/ui.png
index 815bcc24341c8d16f91937ac279003b36bd8f6e4..2e4797216d58c02de121c186f6580ff792996f02 100644
GIT binary patch
literal 478
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|?M8>EaktaqI1^jb4WXMA#nu
z;CaN{v3d4|lYM%8eqDNx!enFS$S#?^`@G`aUk0^pPWK<2668Lc8$5f4OY8gg`jcmE
zPyb!udux$^;L0;OX18xG^VG~;%b-xt<8bPhSc47FA_fMg1_lKNkM)xM$Cvu4P4;5g
zIPL!a*N>mn*sW&~$j-IRJH^lFvi$N(sfHcfUf#2MFD%x56v)2z>^EB`pTb%*_6h5+
zGX%_<y!>sy6r%%!00RpHRtjtv4&p&MV^5p=Trr^Z4|Rs1)2uLc{}da(|Gpdr;wv3~
zyf-LczrC07$i13-o7U^|gIG`JtUk!d5X;nYFJ{gaHi7C@eDyb<FMoZDA<5s4y&;cb
z$+X)y@5D0j@O}4&8@lhm(2Vcz)@a<5>)vu}$F|e=^q&0^x}n@~@#k~JwXz{G-CLKn
z-!EBr{J^}=r5@7!TDQK(=r@5}WY5M3ahO9tgW0zCJO7CQBTx4k^KqYp)5;bEdw?W8
MUHx3vIVCg!0O9km5dZ)H

literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^3P9Yz!3HF=(z2x(7#JBmT^vIyZoR#>pSQ_DqWxhp
zo4UcZGPSUvTM-eFHw3J8N|?3NE|~Jj9yT~Lvp?cMA&WoX;rZWv>v-8enYe|D=!8zs
zUgOX3wvvI3uOfDvAG1N-fiy#X-UDA4YPgrNKe%2nsiE$lcHO=8TBnU(KUrhCVC5n1
ztsDPTJ!fS2Q0^dee5tBu5cdS*&vow^B4;fVZHU=?_qFhXZezx0mOxj6!GQwCgIQrw
z6+CrpCpJHOZpoao{O~PFh4VM;PO~ns<v;L&VXO7~DOGo-==rUy{hX8Su;qMw9ODU7
x%WU3^SD%Zt9j;X}Fnr-mxch_A1r;oQ&+Be9WoN$0&u1W;JYD@<);T3K0RRLLc;f&7

diff --git a/desktop/settings.edn b/desktop/settings.edn
index 77771130..2a45f7a5 100644
--- a/desktop/settings.edn
+++ b/desktop/settings.edn
@@ -1 +1 @@
-{:sound-volume 100.0, :music-volume 53.0}
\ No newline at end of file
+{:sound-volume 41.0, :music-volume 100.0}
\ No newline at end of file
diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj
index 3475aff0..48732ecd 100644
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -15,6 +15,7 @@
   (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter]
            [com.badlogic.gdx.graphics.g2d TextureRegion]
            [com.badlogic.gdx.utils.viewport FitViewport]
+           [com.badlogic.gdx.scenes.scene2d.ui Slider$SliderStyle]
            [com.badlogic.gdx.scenes.scene2d.utils Align]
            [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input
             InputMultiplexer InputProcessor Net Preferences Screen]))
@@ -29,6 +30,12 @@
   (label! e :set-style (style :label font (get-color e mouse-pos)))
   e)
 
+(defn style-slider [s mouse-pos]
+  (if (utils/intersects? s mouse-pos)
+    (slider! s :set-style (:hover s))
+    (slider! s :set-style (:default s)))
+  s)
+
 (defn center [e]
   (assoc e :x (- (/ 1280 2) (/ (.getWidth (:object e)) 2))))
 
@@ -39,9 +46,9 @@
     (utils/setup-viewport screen 1280 960)
     (utils/load-settings!)
     (let [font (utils/get-font "ego/font.fnt")
-          start-playing (assoc (label "Embark on thy adventure" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 100 :height 32 :origin-x 0 :origin-y 0)
+          start-playing (assoc (label "Begin quest" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 300 :height 64 :origin-x 0 :origin-y 0)
           start-playing (center start-playing) 
-          quit (assoc (label "Quit thy adventure" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 65 :height 32 :origin-x 0 :origin-y 0)
+          quit (assoc (label "End quest" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 65 :height 32 :origin-x 0 :origin-y 0)
           quit (center quit) 
           music (utils/make-music "intro.ogg")
           ui-skin (skin "ui/ui.json")]
@@ -55,17 +62,30 @@
                     :opacity 1.0
                     :origin-x 0
                     :origin-y 0)
-       :music-volume-slider (assoc (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings))
-                                   :x ( - (/  1280 2)
-                                          150)
-                                   :width 300
-                                   :y 200)
+
+       :music-label (-> (label "Music" (style :label font (color 1.0 1.0 1.0 1.0)))
+                        (assoc  :x 0 :y 240 :height 32 :origin-x 0 :origin-y 0)
+                        center)
+       :music-volume-slider (-> (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings))
+                                (assoc :x (- (/  1280 2) 150)
+                                       :width 300
+                                       :y 195
+                                       :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle)
+                                       :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle)))
+
+       :sound-label (->
+                     (label "FX" (style :label font (color 1.0 1.0 1.0 1.0)))
+                     (assoc  :x 0 :y 150 :height 32 :origin-x 0 :origin-y 0)
+                     center)
+       
+       
        :sound-volume-slider (assoc (slider {:min 0 :max 100 :step 1 } ui-skin :set-value (:sound-volume @utils/settings))
                                    :width 300
                                    :x ( - (/  1280 2)
                                           150)
-                                   :y 150)
-       
+                                   :y 105
+                                   :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle)
+                                   :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle))
        :font font
        :music music
        :volume 1.0
@@ -81,7 +101,8 @@
     (clear!)
     (let [entities (utils/apply-tweens screen entities (:tweens entities))]
       (music! (:music entities) :set-volume (utils/current-music-volume (:volume entities)))
-      (render! screen [(:overlay entities) (:start-playing entities) (:quit entities) (:music-volume-slider entities) (:sound-volume-slider entities) (:fade entities) ])
+      ()
+      (render! screen [(:overlay entities) (:start-playing entities) (:quit entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:fade entities) ])
       entities))
 
   :show-screen (fn [entities]
@@ -91,6 +112,8 @@
                     (let [[x y] (utils/unproject screen)]
                       (style-label (:start-playing entities) (get-in entities [:font]) [x y])
                       (style-label (:quit entities) (get-in entities [:font]) [x y])
+                      (style-slider (:music-volume-slider entities) [x y])
+                      (style-slider (:sound-volume-slider entities) [x y]) 
                       entities))
   :on-ui-changed
   (fn [screen [entities]]