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

slightly better memory.

Browse Source
This commit is contained in:
Remington Covert
2015-03-08 11:13:16 -07:00
parent 9c9cf4b8b4
commit 63e7dbb951
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,12 @@
[clojure.pprint] [clojure.pprint]
[advent.pathfind]) [advent.pathfind])
(:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter] (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter]
[com.badlogic.gdx.graphics.g2d TextureRegion] )) [com.badlogic.gdx.graphics.g2d TextureRegion]
[com.badlogic.gdx Gdx Application]))
(defonce am (asset-manager))
(set-asset-manager! am)
(defgame advent (defgame advent

2
desktop/src-common/advent/screens/inventory.clj
View File

@@ -33,7 +33,7 @@
:scale-x 80 :scale-x 80
:scale-y 80 :scale-y 80
:opacity 0.7) :opacity 0.7)
:all-items (texture! (texture "cursor.png") :split 16 16) :all-items (texture! (texture (pixmap "cursor.png")) :split 16 16)
:items [] :items []
:shown? false :shown? false
:start-showing? false :start-showing? false

2
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -32,6 +32,6 @@
:script (actions/get-script entities (a/>! [100 100]))}} :script (actions/get-script entities (a/>! [100 100]))}}
:layers [(assoc (texture "dream/background.png") :x 0 :y 0 :baseline 0)] :layers [(assoc (texture "dream/background.png") :x 0 :y 0 :baseline 0)]
:entities {} :entities {}
:collision "space/background.png" :collision "dream/collision.png"
:scale-fn (constantly 1.5) :scale-fn (constantly 1.5)
:start-pos [140 55])) :start-pos [140 55]))

5
desktop/src-common/advent/screens/scene.clj
View File

@@ -691,8 +691,9 @@
(tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 1.0)) (tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 1.0))
(assoc-in [:tweens :fade-out] (assoc-in [:tweens :fade-out]
(tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0
:finish #(do (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)) :finish #(do (.clear @(resolve 'advent.core/am))
%))))) (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen))
%)))))
:on-start-script (fn [{:keys [script]} [entities]] :on-start-script (fn [{:keys [script]} [entities]]
(script entities) (script entities)