fixing dbh credits

This commit is contained in:
Bryce Covert
2017-09-21 09:02:07 -07:00
parent bc18d85ad1
commit 95afad3756
8 changed files with 48 additions and 15 deletions

2
android/.gitignore vendored
View File

@@ -2,3 +2,5 @@ target
\#*#
checkouts
.nrepl-port
sdk
*.jks

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -2,7 +2,7 @@
(def packs (into ["do"]
(mapcat (fn [directory]
["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")])
["global" "ending-castle"]
["global" "credits"]
#_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title"
"castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard"
"cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ])))

View File

@@ -0,0 +1,27 @@
credits.png
size: 1024,256
format: RGBA8888
filter: Nearest,Nearest
repeat: none
POPPixelLogo_02
rotate: false
xy: 2, 2
size: 320, 240
orig: 320, 240
offset: 0, 0
index: 0
dbh
rotate: false
xy: 324, 2
size: 320, 240
orig: 320, 240
offset: 0, 0
index: -1
pos
rotate: false
xy: 646, 113
size: 290, 129
orig: 290, 129
offset: 0, 0
index: -1

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

@@ -33,7 +33,7 @@
["CEO"
"Cesar Bittar"]
["General Manager"
"Scott Steinburg"]]
"Scott Steinberg"]]
[:pos ["QA"
"Dane Tippman"
"Henri Hänninen"
@@ -153,25 +153,27 @@
:on-show
(fn [screen entities options]
(utils/setup-viewport screen 1280 960)
(graphics! :set-cursor (utils/cursor "cursor.png" :main))
(let [[screen atlas] (utils/acquire-atlas screen "packed/global.atlas")
[screen credits-atlas] (utils/acquire-atlas screen "packed/credits.atlas")
font (bitmap-font "ego/font.fnt" )]
{:font font
:bg (assoc (utils/atlas->texture atlas "black")
:scale-x 80
:scale-y 80
:opacity 1.0
:origin-x 0
:origin-y 0)
:scale-x 80
:scale-y 80
:opacity 1.0
:origin-x 0
:origin-y 0)
:fade (assoc (utils/atlas->texture atlas "black")
:scale-x 80
:scale-y 80
:opacity 0.0
:origin-x 0
:origin-y 0)
:scale-x 80
:scale-y 80
:opacity 0.0
:origin-x 0
:origin-y 0)
:pos (assoc (utils/atlas->texture atlas "black") :x 640 :y 700 :scale-x 1 :scale-y 1 :origin-x 145 :origin-y 0 :z 1 :opacity 0.0)
:dbh (assoc (utils/atlas->texture atlas "black") :x 640 :y 500 :scale-x 0.5 :scale-y 0.5 :origin-x 640 :origin-y 0 :z 1 :opacity 0.0)
:pos (assoc (utils/atlas->texture credits-atlas "pos.png") :x 640 :y 700 :scale-x 1 :scale-y 1 :origin-x 145 :origin-y 0 :z 1 :opacity 0.0)
:dbh (assoc (utils/atlas->texture credits-atlas "dbh.png") :x 640 :y 500 :scale-x 2 :scale-y 2 :origin-x 160 :origin-y 0 :z 1 :opacity 0.0)
:remaining-messages (cond (= @saved-took? :died)
(conj credit-messages [nil
@@ -209,5 +211,7 @@
(set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)))
:on-resize (fn [{:keys [^FitViewport viewport]} entities {:keys [width height]}]
(.update viewport width height)))
(.update viewport width height))
:on-hide (fn [screen entities options]
(utils/release-resources screen)))