fairly accurate text positioning.

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

@@ -12,18 +12,13 @@
 (defn ensure-on-screen [talk]
   (let [margin-width (* 0.05 (game :width))
         minimum-x margin-width
-        maximum-x (- (game :width)
-                     margin-width)
+        maximum-x (- (game :width) margin-width)
         label-width (label! talk :get-width)
-        label-right (+ (:x talk) label-width)
-        ]
-    (cond (> label-right maximum-x)
-          (assoc talk :x (- maximum-x label-width))
-          (< (:x talk) minimum-x)
-          (assoc talk :x minimum-x)
-          :else
-          talk
-          )))
+        label-right (+ (:x talk) label-width)]
+    (cond (> label-right maximum-x) (assoc talk :x (- maximum-x label-width))
+          (< (:x talk) minimum-x) (assoc talk :x minimum-x)
+          :else talk)))
+
 (defscreen talking-screen
   :on-show
   (fn [screen entities]
@@ -35,9 +30,10 @@
     entities)
 
   :on-talk
-  (fn [{:keys [create-talk target-id text x y]} [entities]]
+  (fn [{:keys [create-talk target-id text x y scale]} [entities]]
     (let [font (bitmap-font "ego/font.fnt" ) 
           tr (bitmap-font! font :get-region)
+          scale (or (max scale 0.75) 1)
           width (/  (game :width) 1.5)
           tx (.getTexture tr)
           _ (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)
@@ -45,14 +41,14 @@
           talk (ensure-on-screen talk)]
       (label! talk :set-wrap true)
       (label! talk :set-width width)
+      (label! talk :set-font-scale scale)
       (label! talk :set-alignment Align/center)
       (assoc entities target-id talk)))
 
   :stop-talk
   (fn [{:keys [target-id] } [entities]]
     (dissoc entities target-id))
-  
 
   
   :on-resize (fn [screen entities]
-               (height! screen (game :height))))
+               (size! screen 1280 960)))