added new title screen.

2015-10-27 18:19:39 -07:00
parent 328a522468
commit e5212a0b8d
18 changed files with 1203 additions and 1162 deletions
--- a/desktop/asset-work/title.psd
+++ b/desktop/asset-work/title.psd
--- a/desktop/asset-work/title/banner-back.png
+++ b/desktop/asset-work/title/banner-back.png
--- a/desktop/asset-work/title/banner-back.pxa/0.pxi
+++ b/desktop/asset-work/title/banner-back.pxa/0.pxi
--- a/desktop/asset-work/title/banner-back.pxa/1.pxi
+++ b/desktop/asset-work/title/banner-back.pxa/1.pxi
--- a/desktop/asset-work/title/banner-back.pxa/2.pxi
+++ b/desktop/asset-work/title/banner-back.pxa/2.pxi
--- a/desktop/asset-work/title/banner-back.pxa/3.pxi
+++ b/desktop/asset-work/title/banner-back.pxa/3.pxi
--- a/desktop/asset-work/title/banner-back.pxa/CelData.plist
+++ b/desktop/asset-work/title/banner-back.pxa/CelData.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>
--- a/desktop/asset-work/title/banner.png
+++ b/desktop/asset-work/title/banner.png
--- a/desktop/asset-work/title/logo.png
+++ b/desktop/asset-work/title/logo.png
--- a/desktop/resources/packed/pack.atlas
+++ b/desktop/resources/packed/pack.atlas
--- a/desktop/resources/packed/pack2.png
+++ b/desktop/resources/packed/pack2.png
--- a/desktop/resources/packed/pack3.png
+++ b/desktop/resources/packed/pack3.png
--- a/desktop/resources/packed/pack4.png
+++ b/desktop/resources/packed/pack4.png
--- a/desktop/resources/packed/pack5.png
+++ b/desktop/resources/packed/pack5.png
--- a/desktop/resources/packed/pack6.png
+++ b/desktop/resources/packed/pack6.png
--- a/desktop/resources/packed/pack7.png
+++ b/desktop/resources/packed/pack7.png
--- a/desktop/resources/packed/pack8.png
+++ b/desktop/resources/packed/pack8.png
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -205,12 +205,16 @@
     (utils/load-settings!))
    (let [font (utils/get-font "ego/font.fnt")
          music (utils/make-music "music/intro.ogg")
-          balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))]
+          balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))
+          banner-back (utils/make-anim "title/banner-back.png" [180 42] 0.2 [0 1 2 1 0  1 2 1])]
      
      (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0)
      
      (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)
                      :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) 
+                      :banner-back (assoc (animation->texture (assoc screen :total-time 0.0) banner-back) :x 580 :y 400 :scale-x 4 :scale-y 4
+                                      :anim banner-back
+                                      :z 3)
                      :logo  (assoc (utils/get-texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 6) 
                      :fade (assoc (utils/get-texture "black.png")
                              :scale-x 80
@@ -268,6 +272,7 @@
          entities (fly-ego screen entities)
          entities (fly-balloon screen entities)
          entities (update-in entities [:balloon] merge (animation->texture screen (:anim (:balloon entities))))
+          entities (update-in entities [:banner-back] merge (animation->texture screen (:anim (:banner-back entities))))
          entities (style-ui entities)]
      (when (:fullscreen entities)
        (label! (:fullscreen entities) :set-text (if (.isFullscreen Gdx/graphics)