Beginning to get IOS, Android, and Desktop all working at once. Re-enabling steam.
This commit is contained in:
@@ -134,6 +134,7 @@
|
||||
(tween/tween :fade-out-music screen [:volume] 1.0 0.0 1.0)))))
|
||||
|
||||
(defn button-style []
|
||||
|
||||
(let [^TextButton$TextButtonStyle style (skin! (skin "ui/ui.json") :get TextButton$TextButtonStyle)
|
||||
tx (-> style .font .getRegion .getTexture)]
|
||||
(-> style .font .getData (.setScale utils/button-font-scale))
|
||||
@@ -149,7 +150,11 @@
|
||||
([msg & rest]
|
||||
(let [button (merge (text-button msg (button-style))
|
||||
(apply hash-map rest))]
|
||||
|
||||
(utils/platformify
|
||||
nil
|
||||
nil
|
||||
(doto (text-button! button :get-label)
|
||||
(.setFontScale 0.5)))
|
||||
(doto button save-object))))
|
||||
|
||||
|
||||
@@ -164,10 +169,15 @@
|
||||
([msg checked & rest]
|
||||
(let [s (skin! (skin "ui/ui.json") :get CheckBox$CheckBoxStyle)]
|
||||
(-> s .font .getData (.setScale utils/title-label-scale))
|
||||
(doto (merge (check-box msg s)
|
||||
(apply hash-map rest))
|
||||
(set-checkbox-state checked)
|
||||
save-object))))
|
||||
(let [checkbox-entity (merge (check-box msg s)
|
||||
(apply hash-map rest))]
|
||||
(utils/platformify
|
||||
nil
|
||||
nil
|
||||
(doto (check-box! checkbox-entity :get-label)
|
||||
(.setFontScale 0.25)))
|
||||
(set-checkbox-state checkbox-entity checked)
|
||||
(save-object checkbox-entity)))))
|
||||
|
||||
(defn make-label
|
||||
([msg]
|
||||
@@ -456,7 +466,10 @@
|
||||
|
||||
:on-render
|
||||
(fn [{:keys [^FitViewport viewport] :as screen} entities options]
|
||||
#_(steam/update)
|
||||
(utils/platformify
|
||||
nil
|
||||
nil
|
||||
(steam/update))
|
||||
(.apply viewport)
|
||||
(clear!)
|
||||
(let [entities (utils/apply-tweens screen entities (:tweens entities))
|
||||
|
||||
Reference in New Issue
Block a user