fixing dbh credits
This commit is contained in:
2
android/.gitignore
vendored
2
android/.gitignore
vendored
@@ -2,3 +2,5 @@ target
|
|||||||
\#*#
|
\#*#
|
||||||
checkouts
|
checkouts
|
||||||
.nrepl-port
|
.nrepl-port
|
||||||
|
sdk
|
||||||
|
*.jks
|
||||||
|
|||||||
BIN
desktop/asset-work/credits/POPPixelLogo_02_00.png
Normal file
BIN
desktop/asset-work/credits/POPPixelLogo_02_00.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 40 KiB |
BIN
desktop/asset-work/credits/dbh.png
Normal file
BIN
desktop/asset-work/credits/dbh.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
BIN
desktop/asset-work/credits/pos.png
Normal file
BIN
desktop/asset-work/credits/pos.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -2,7 +2,7 @@
|
|||||||
(def packs (into ["do"]
|
(def packs (into ["do"]
|
||||||
(mapcat (fn [directory]
|
(mapcat (fn [directory]
|
||||||
["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str 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"
|
#_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title"
|
||||||
"castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard"
|
"castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard"
|
||||||
"cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ])))
|
"cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ])))
|
||||||
|
|||||||
27
desktop/resources/packed/credits.atlas
Normal file
27
desktop/resources/packed/credits.atlas
Normal 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
|
||||||
BIN
desktop/resources/packed/credits.png
Normal file
BIN
desktop/resources/packed/credits.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
@@ -33,7 +33,7 @@
|
|||||||
["CEO"
|
["CEO"
|
||||||
"Cesar Bittar"]
|
"Cesar Bittar"]
|
||||||
["General Manager"
|
["General Manager"
|
||||||
"Scott Steinburg"]]
|
"Scott Steinberg"]]
|
||||||
[:pos ["QA"
|
[:pos ["QA"
|
||||||
"Dane Tippman"
|
"Dane Tippman"
|
||||||
"Henri Hänninen"
|
"Henri Hänninen"
|
||||||
@@ -153,25 +153,27 @@
|
|||||||
:on-show
|
:on-show
|
||||||
(fn [screen entities options]
|
(fn [screen entities options]
|
||||||
(utils/setup-viewport screen 1280 960)
|
(utils/setup-viewport screen 1280 960)
|
||||||
|
|
||||||
(graphics! :set-cursor (utils/cursor "cursor.png" :main))
|
(graphics! :set-cursor (utils/cursor "cursor.png" :main))
|
||||||
(let [[screen atlas] (utils/acquire-atlas screen "packed/global.atlas")
|
(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 (bitmap-font "ego/font.fnt" )]
|
||||||
{:font font
|
{:font font
|
||||||
:bg (assoc (utils/atlas->texture atlas "black")
|
:bg (assoc (utils/atlas->texture atlas "black")
|
||||||
:scale-x 80
|
:scale-x 80
|
||||||
:scale-y 80
|
:scale-y 80
|
||||||
:opacity 1.0
|
:opacity 1.0
|
||||||
:origin-x 0
|
:origin-x 0
|
||||||
:origin-y 0)
|
:origin-y 0)
|
||||||
:fade (assoc (utils/atlas->texture atlas "black")
|
:fade (assoc (utils/atlas->texture atlas "black")
|
||||||
:scale-x 80
|
:scale-x 80
|
||||||
:scale-y 80
|
:scale-y 80
|
||||||
:opacity 0.0
|
:opacity 0.0
|
||||||
:origin-x 0
|
:origin-x 0
|
||||||
:origin-y 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)
|
: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 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)
|
: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)
|
:remaining-messages (cond (= @saved-took? :died)
|
||||||
(conj credit-messages [nil
|
(conj credit-messages [nil
|
||||||
|
|
||||||
@@ -209,5 +211,7 @@
|
|||||||
(set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)))
|
(set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)))
|
||||||
|
|
||||||
:on-resize (fn [{:keys [^FitViewport viewport]} entities {:keys [width height]}]
|
: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)))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user