diff --git a/android/.gitignore b/android/.gitignore index 33cfd6c4..ad0a7a50 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -2,3 +2,5 @@ target \#*# checkouts .nrepl-port +sdk +*.jks diff --git a/desktop/asset-work/credits/POPPixelLogo_02_00.png b/desktop/asset-work/credits/POPPixelLogo_02_00.png new file mode 100644 index 00000000..d782bec7 Binary files /dev/null and b/desktop/asset-work/credits/POPPixelLogo_02_00.png differ diff --git a/desktop/asset-work/credits/dbh.png b/desktop/asset-work/credits/dbh.png new file mode 100644 index 00000000..2051950b Binary files /dev/null and b/desktop/asset-work/credits/dbh.png differ diff --git a/desktop/asset-work/credits/pos.png b/desktop/asset-work/credits/pos.png new file mode 100644 index 00000000..6fd93443 Binary files /dev/null and b/desktop/asset-work/credits/pos.png differ diff --git a/desktop/project.clj b/desktop/project.clj index cc1ead49..645f2f0d 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -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" ]))) diff --git a/desktop/resources/packed/credits.atlas b/desktop/resources/packed/credits.atlas new file mode 100644 index 00000000..baf82d08 --- /dev/null +++ b/desktop/resources/packed/credits.atlas @@ -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 diff --git a/desktop/resources/packed/credits.png b/desktop/resources/packed/credits.png new file mode 100644 index 00000000..59b2b262 Binary files /dev/null and b/desktop/resources/packed/credits.png differ diff --git a/desktop/src-common/advent/screens/credits.clj b/desktop/src-common/advent/screens/credits.clj index 0c7a5d28..5d4cc1ea 100644 --- a/desktop/src-common/advent/screens/credits.clj +++ b/desktop/src-common/advent/screens/credits.clj @@ -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)))