notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freeing resources for justice.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-26 07:46:29 -07:00
parent 807ee8564c
commit d8a145bb67
4 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/src-common/advent/core.clj
View File

@@ -50,5 +50,4 @@
(try (screen-fn) (try (screen-fn)
(catch Exception e (catch Exception e
(.log Gdx/app "ERROR" (with-out-str (.printStackTrace e))) (.log Gdx/app "ERROR" (with-out-str (.printStackTrace e)))
(log/error e (with-out-str (.printStackTrace e)))
(set-screen! advent title/title-screen))))) (set-screen! advent title/title-screen)))))

9
desktop/src-common/advent/screens/splash.clj
View File

@@ -92,9 +92,8 @@
(defscreen splash-screen (defscreen splash-screen
:on-show :on-show
(fn [screen entities options] (fn [screen entities options]
(let [splash-atlas (texture-atlas "packed/splash.atlas") (let [[screen splash-atlas] (utils/acquire-atlas screen "packed/splash.atlas")
global-atlas (texture-atlas "packed/global.atlas") [screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")]
screen (update! screen :resources ["packed/splash.atlas" "packed/global.atlas"])]
(utils/setup-viewport screen 1280 960) (utils/setup-viewport screen 1280 960)
(log/info "Starting splash screen.") (log/info "Starting splash screen.")
(graphics! :set-cursor (utils/cursor "cursor.png" :hourglass)) (graphics! :set-cursor (utils/cursor "cursor.png" :hourglass))
@@ -121,9 +120,7 @@
entities))) entities)))
:on-hide (fn [screen entities options] :on-hide (fn [screen entities options]
(doseq [atlas (:resources screen)] (utils/release-resources screen))
(asset-manager! *asset-manager* :unload atlas)
(log/info "cleared assets" (into [] (.getAssetNames *asset-manager*)) (.getDiagnostics *asset-manager*))))
:on-render :on-render
(fn [{:keys [^FitViewport viewport] :as screen} entities options] (fn [{:keys [^FitViewport viewport] :as screen} entities options]

24
desktop/src-common/advent/screens/title.clj
View File

@@ -367,7 +367,11 @@
(defscreen title-screen (defscreen title-screen
:on-show :on-show
(fn [screen entities options] (fn [screen entities options]
(let [screen (utils/setup-viewport screen 1280 960)] (let [
[screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")
[screen title-atlas] (utils/acquire-atlas screen "packed/title.atlas")
_ (println (:resources screen))
screen (utils/setup-viewport screen 1280 960)]
(log/info "Starting title screen.") (log/info "Starting title screen.")
(let [font (utils/get-font "ego/font.fnt") (let [font (utils/get-font "ego/font.fnt")
@@ -377,21 +381,21 @@
(graphics! :set-cursor (utils/cursor "cursor.png" :hourglass)) (graphics! :set-cursor (utils/cursor "cursor.png" :hourglass))
(let [entities {:background (assoc (utils/get-texture "title/background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 0) (let [entities {:background (assoc (utils/atlas->texture title-atlas "background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 0)
:cloud-background (assoc (utils/get-texture "title/clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 2) :cloud-background (assoc (utils/atlas->texture title-atlas "clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 2)
:banner-back (assoc (animation->texture (assoc screen :total-time 0.0) banner-back) :origin-x 85 :origin-y 150 :x 640 :y 960 :scale-x (/ 4 utils/ui-scale) :scale-y (/ 4 utils/ui-scale) :banner-back (assoc (animation->texture (assoc screen :total-time 0.0) banner-back) :origin-x 85 :origin-y 150 :x 640 :y 960 :scale-x (/ 4 utils/ui-scale) :scale-y (/ 4 utils/ui-scale)
:anim banner-back :anim banner-back
:z 3) :z 3)
:quill (doto (assoc (image-button (BaseDrawable.)) :x 1150 :y 4 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 10 :key :quill) :quill (doto (assoc (image-button (BaseDrawable.)) :x 1150 :y 4 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 10 :key :quill)
(image-button! :add (doto (Group. ) (image-button! :add (doto (Group. )
(.addActor (:object (doto (image (utils/get-texture "title/quill.png")) (.addActor (:object (doto (image (utils/atlas->texture title-atlas "quill.png"))
(image! :set-scale 4)))))) (image! :set-scale 4))))))
save-object save-object
(#(utils/add-actor-to-stage screen %))) (#(utils/add-actor-to-stage screen %)))
:logo (assoc (utils/get-texture "title/logo.png" ) :x 640 :y 960 :scale-x (/ 4 utils/ui-scale) :scale-y (/ 4 utils/ui-scale) :origin-x 160 :origin-y 240 :z 6) :logo (assoc (utils/atlas->texture title-atlas "logo.png" ) :x 640 :y 960 :scale-x (/ 4 utils/ui-scale) :scale-y (/ 4 utils/ui-scale) :origin-x 160 :origin-y 240 :z 6)
:fade (assoc (utils/get-texture "black.png") :fade (assoc (utils/atlas->texture global-atlas "black.png")
:scale-x 80 :scale-x 80
:scale-y 80 :scale-y 80
:opacity 1.0 :opacity 1.0
@@ -420,10 +424,6 @@
:particle-clouds (assoc (particle-effect "particles/particle-clouds" :reset :start) :x 640 :y 480 :z 1) :particle-clouds (assoc (particle-effect "particles/particle-clouds" :reset :start) :x 640 :y 480 :z 1)
:ego-jet (assoc (particle-effect "particles/jet" :reset :start) :x 450 :y 650 :z 4) :ego-jet (assoc (particle-effect "particles/jet" :reset :start) :x 450 :y 650 :z 4)
#_#_:toolbox (-> (assoc (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9})
:y 58 :width 500 :height 297
:z 7)
center)
:main-menu (->> (main-menu screen) :main-menu (->> (main-menu screen)
(utils/add-actor-to-stage screen)) (utils/add-actor-to-stage screen))
:saves-list (utils/snapshot-screenshots) :saves-list (utils/snapshot-screenshots)
@@ -602,4 +602,6 @@
:on-resize (fn [{:keys [^FitViewport viewport] :as screen} entities {:keys [width height]}] :on-resize (fn [{:keys [^FitViewport viewport] :as screen} entities {:keys [width height]}]
(.update viewport width height false) (.update viewport width height false)
nil)) nil)
:on-hide (fn [screen entities options]
(utils/release-resources screen)))

13
desktop/src-common/advent/utils.clj
View File

@@ -742,3 +742,16 @@
nil) nil)
(do ~form (do ~form
(recur r#)))))))) (recur r#))))))))
(defn acquire-atlas [{:keys [resources] :as screen :or {resources []}} file]
(let [atlas (texture-atlas file)]
(update! screen :resources
(conj resources file))
[(assoc screen :resources (conj resources file))
atlas]))
(defn release-resources [screen]
(doseq [resource (:resources screen)]
(asset-manager! *asset-manager* :unload resource))
(app! :log "info"(str "Released resources " (.getDiagnostics *asset-manager*))))