working on getting everything working again.

This commit is contained in:
Bryce Covert
2016-08-09 22:03:50 -07:00
parent 1e4546a906
commit 130d9e1b1f
4 changed files with 84 additions and 76 deletions

View File

@@ -1121,7 +1121,7 @@ void main ()
(log/info "Initializing scene.")
(let [screen (assoc screen :total-time 0)]
(let [[^OrthographicCamera cam] (utils/setup-viewport screen 320 240)]
(let [{cam :camera} (utils/setup-viewport screen 320 240)]
(set! (. cam zoom) 0.95)
(let [shader (ShaderProgram. ^String v-shader ^String pix-shader)
_ (log/info "shader log:" (.getLog shader))
@@ -1793,7 +1793,7 @@ void main ()
:on-render
(fn [{:keys [^FitViewport viewport] :as screen} entities options]
(.apply viewport)
#_(let [entities (utils/apply-tweens screen entities (:tweens entities))
(let [entities (utils/apply-tweens screen entities (:tweens entities))
entities (update-in entities [:inventory] animate screen )
hud-interactable? (hud-interactable?)
entities (if hud-interactable?