should be a fullscreen that pleases everyone.

This commit is contained in:
Bryce Covert
2016-02-22 09:18:45 -08:00
parent 35ecbb8ca2
commit a252571f59
4 changed files with 66 additions and 22 deletions

View File

@@ -96,10 +96,6 @@
:the-end (assoc (utils/get-texture "the-end.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0)
:tweens {:fade-in
(tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 5.0 :ease tween/ease-out-cubic)}}))
:on-pause (fn [_ _]
(utils/set-fullscreen! false)
nil)
:on-render
(fn [{:keys [^FitViewport viewport] :as screen} [entities]]

View File

@@ -1169,9 +1169,6 @@ void main ()
(doseq [[k [start time fn]] (get-in entities [:room :timers])]
(add-timer! screen k start time)))
:on-pause (fn [_ _]
(utils/set-fullscreen! false)
nil)
:on-key-up
(fn [screen entities]

View File

@@ -371,10 +371,7 @@
:ease tween/ease-in-quadratic)}}
]
(merge entities (:main-menu entities)))))
:on-pause (fn [_ _]
(utils/set-fullscreen! false)
nil)
:on-render
(fn [{:keys [^FitViewport viewport] :as screen} [entities]]
@@ -387,7 +384,7 @@
entities (update-in entities [:banner-back] merge (animation->texture screen (:anim (:banner-back entities))))]
(when (:fullscreen-button (:settings-menu entities))
(text-button! (:fullscreen-button (:settings-menu entities))
:set-text (if (.isFullscreen Gdx/graphics)
:set-text (if (utils/is-fullscreen?)
"Windowed"
"Fullscreen")))