diff --git a/desktop/project.clj b/desktop/project.clj index 7eafaad6..8c249e03 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -19,6 +19,7 @@ :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :omit-source true :aliases {"pack" ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" "asset-work/" "resources/packed/"] + "pack-font" ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" "resources/font-pack/" "resources/font-pack/packed/"] "script" ["run" "-m" "advent.analyze/dump-speech"]} :profiles { :dev { diff --git a/desktop/resources/ego/font.fnt b/desktop/resources/ego/font.fnt index 00e530f0..13afe05f 100644 --- a/desktop/resources/ego/font.fnt +++ b/desktop/resources/ego/font.fnt @@ -1,6 +1,6 @@ info face="OpenDyslexic Bold" size=98 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=0 aa=0 padding=16,16,16,16 spacing=-30,-8 common lineHeight=122 base=74 scaleW=1024 scaleH=1024 pages=1 packed=0 -page id=0 file="font.png" +page id=0 file="../font-pack/packed/pack.png" chars count=99 char id=10 x=0 y=0 width=0 height=0 xoffset=0 yoffset=0 xadvance=0 page=0 chnl=0 char id=32 x=0 y=0 width=0 height=0 xoffset=-16 yoffset=107 xadvance=40 page=0 chnl=0 diff --git a/desktop/resources/ego/font.png b/desktop/resources/ego/font.png index 4c8c898e..f96b100a 100644 Binary files a/desktop/resources/ego/font.png and b/desktop/resources/ego/font.png differ diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index 4f630e89..5b53f84e 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -63,7 +63,7 @@ scale (/ scale 2) scale (or (min (max scale 0.2) 0.25) 0.25) tx (.getTexture tr) - _ (texture! tx :set-filter Texture$TextureFilter/Nearest Texture$TextureFilter/Nearest) + _ (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear) style (style :label font color) #_#__ (set! (.background style) bg) [source-x source-y] [x y] @@ -129,7 +129,7 @@ tx (.getTexture tr) p (NinePatchEntity. (skin! (skin "ui/ui.json") :get-patch "ui-bg")) _ (nine-patch! p :set-padding 25 25 5 15) - _ (texture! tx :set-filter Texture$TextureFilter/Nearest Texture$TextureFilter/Nearest)] + _ (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)] {:state {:object nil :callback nil :choices [] diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index a7c1075f..7339bd3f 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -64,8 +64,8 @@ (fn [screen entities] (utils/setup-viewport screen 1280 960) - (let [highlighted-text (assoc (label "Hello" (style :label (utils/get-font "ego/font.fnt") (color :white))) :x 0 :y 850 :width 1280 )] - (label! highlighted-text :set-alignment Align/center) + (let [highlighted-text (assoc (label "Hello" (style :label (utils/get-font "ego/font.fnt") (color :white)) :set-font-scale 0.25) :x 0 :y 850 :width 1280 )] + (label! highlighted-text :set-alignment Align/bottom) {:overlay (assoc (utils/get-texture "inventory-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) :fade (assoc (utils/get-texture "black.png") :scale-x 80