From 39d90f00c380d2c5eefcd0d0bc529c39837763eb Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 11 Sep 2015 08:55:53 -0700 Subject: [PATCH] adding balloon --- desktop/resources/title/balloon.png | Bin 0 -> 1490 bytes desktop/resources/title/balloon.pxa/0.pxi | Bin 0 -> 264179 bytes desktop/resources/title/balloon.pxa/1.pxi | Bin 0 -> 264179 bytes desktop/resources/title/balloon.pxa/2.pxi | Bin 0 -> 264179 bytes desktop/resources/title/balloon.pxa/3.pxi | Bin 0 -> 264179 bytes .../resources/title/balloon.pxa/CelData.plist | 22 ++++++++++++++++++ .../advent/screens/rooms/.#behind_house.clj | 1 - desktop/src-common/advent/screens/title.clj | 18 +++++++++++++- 8 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 desktop/resources/title/balloon.png create mode 100644 desktop/resources/title/balloon.pxa/0.pxi create mode 100644 desktop/resources/title/balloon.pxa/1.pxi create mode 100644 desktop/resources/title/balloon.pxa/2.pxi create mode 100644 desktop/resources/title/balloon.pxa/3.pxi create mode 100644 desktop/resources/title/balloon.pxa/CelData.plist delete mode 120000 desktop/src-common/advent/screens/rooms/.#behind_house.clj diff --git a/desktop/resources/title/balloon.png b/desktop/resources/title/balloon.png new file mode 100644 index 0000000000000000000000000000000000000000..37777984ebd4400d01710c6137470aae8d8367a8 GIT binary patch literal 1490 zcmV;@1ugoCP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zxM zB^D|D5Ag>q#NH}}Sc$!jkVa76!5n+*?ab`#4u`r6VK=k$=FNL^xpZAy&4EAVz=5Zl z-P!3E)n7lqWN~?652>Nl4r2PGa;D-p>+?Y@?n41n`C-fx%L=v<1GoA7=rt@aFS_OJ zU4Pby_Qoa!mk@{3>d)KjA0c(1GIrrbe7`vEFy;4$$AJPd&GN*uf=h@s!sf_HKGHRs zfnhXN+O>7Pu%ciK@zw5W^cO^8LIHxvt)L7g={FcUj+)#`OzlZo79BRyk?TJAi zHV}%E&il95(f_fOAKqKBR@}f{QeX}&$0`1X2i5=Oz`3RI0C-Cc3kLm2eC`uII$5zV zMvZB?IUJ|E;M`_Q@- zeIy0faM@DBg3*daUQ#eFYq)HwVZoqZ&0+;>3Z!x@ld@olUyF4SOyoI}vS4Dd8a@}n sXhcI!4byJHlo&<4ZEp@V2Y!zO-#GU8J7G5?^Z)<=07*qoM6N<$f&rG@$N&HU literal 0 HcmV?d00001 diff --git a/desktop/resources/title/balloon.pxa/0.pxi b/desktop/resources/title/balloon.pxa/0.pxi new file mode 100644 index 0000000000000000000000000000000000000000..d2546977c84f31479bc9f99484330af8e9714fd1 GIT binary patch literal 264179 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 R-Buo7JMiP+->K<~{s-eK+PMG# literal 0 HcmV?d00001 diff --git a/desktop/resources/title/balloon.pxa/2.pxi b/desktop/resources/title/balloon.pxa/2.pxi new file mode 100644 index 0000000000000000000000000000000000000000..ea0d7182300faf2d8485e8a4712e596170f54b95 GIT binary patch literal 264179 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 P^5g6Kp7#GtO_~3Htwh%S literal 0 HcmV?d00001 diff --git a/desktop/resources/title/balloon.pxa/3.pxi b/desktop/resources/title/balloon.pxa/3.pxi new file mode 100644 index 0000000000000000000000000000000000000000..0f1e6196973ce31a5a8530e173e3a00ea048fd56 GIT binary patch literal 264179 zcmeI$eQexy9l-H+y~zfJ9UEh8Fet1H#4+1FGJJwPPH4s-tX|urz3qBeuGh^n z(4PwU3?dH#0zxNDL_$c^m>6S-55&YoWiSmfN{q@MiUuEJjN<3Ib>k_a{K@gU<=y-B ze&753e&5$`-@9eK!};7uxvA-?+G%yE>2Le$L*0$LvZaw+vC!RE?A?*=E01hx%#`{D zbMf-##&U6Zc1`UK_dS|E`=}Xn7c{=Jsd?F|_rC9f3)jB?vW=}DxV*h9Ggv5%?)u2b zKl!PfZu!!^U*7wbj>f`hK7U~5(Z|#ud)%z_@w4Zg(3#JS#Ywt*2i6q}SLOz;7%pXZ z<+8imb600O8~gH^k&(><<^~4K zaq{K!?_ZJ3OlDOMvHJY?jGwnAIXXFJ{9W%(>XT!W}ZeP@MwSe|6qhvm!7Rfywnh`CR$_pWL3x`;8$$;LR;Cx!zy; z{N|pKt0zFrPr%YuafvOX*{;Temnh=30 z2~^g;^*<#lg9ucefVE$Bx736POi93Z|CE>vB2bkAzWb~4wwe@yDG6BrQ(`iRKvfD@ z|5bTgO^U#j1g!rlF&RXlDg~_ns=TcxMc{P>Dr?{Re_bX62vnVbwO@6&)Px93Nx<5l z5|cp$2oNAZfB*pk1PBlyK!5-N0tDVP0#B}6zu}^-jeYsd$VeeGld2w?ZraeYbz>%1Xt*phmMty1V9PU$UV^=Gdf*wPzkSXay!OC5ccpUEl7Ny*8{g8jK2^*i%JG25=e zTsa#|6NB1^Gkw{$%{A$|WPVJgI2;2ec8p(Dk(t=6ymcf$w6SUFs>#Rdnq+=YdUkv8 z4`%xtj$CORWA}$*Ph0oIzOf^F_KjV==bCFj-13?`gQ%^0{b;dVEWC{9gtqRD#lkCI z-qzNAY~{-MrFqrLWviN(uU=D= zuC2^<)q6O-mY@Dmx!| zu)D2$U8b-rGcvxfX-4WdrJrM1S9*Q209*G`}9*e#eJsy2O`eF1$^kno*^lbF| z==ta`(F@VvqJKpHjQ(3wQ#(DH866WH8_kO5M02Bg(fsJ-==A8UXlb-OS{cQ)*RF{! zh}K0LqL%2A=(4CaYK!7Sqjr0gtx47HjE18<(RIaShXc5d9?jY4nTe*U_J%Ki8z{>Y^FZ!syKC{HQG&h|19?qFbUk zM_rtw?%wFWXkYY5bRha=^h^}Ttb3s*m5Sq~j*H@Wsb$fIDCU*wiF%`$Pb!ISitdaa zjN*8yhoZRtR2(<;jp&K!$I;KCr=u`T{U-WD^nCQ!=s(f_YEsjWisnbBL~*Yxk5uLF QZRPRxgHMNkrlv3YKfl!4xc~qF literal 0 HcmV?d00001 diff --git a/desktop/resources/title/balloon.pxa/CelData.plist b/desktop/resources/title/balloon.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/resources/title/balloon.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/.#behind_house.clj b/desktop/src-common/advent/screens/rooms/.#behind_house.clj deleted file mode 120000 index db1830a8..00000000 --- a/desktop/src-common/advent/screens/rooms/.#behind_house.clj +++ /dev/null @@ -1 +0,0 @@ -brycecovert@brometheus.local.31618 \ No newline at end of file diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index d8b2a480..91638f73 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -48,6 +48,16 @@ (def do-once (atom false)) +(defn fly-balloon [screen entities] + (let [speed 0.03 + pos-f (- (* (:total-time screen) speed) (int (* (:total-time screen) speed))) + v (vector-2 0 0) + a (catmull-rom-spline! (:path (:balloon entities)) :value-at v pos-f)] + (-> entities + (update-in [:balloon] + merge {:x (vector-2! v :x) + :y (vector-2! v :y)})))) + (defn fly-ego [screen entities] (let [speed 0.07 pos-f (- (* (:total-time screen) speed) (int (* (:total-time screen) speed))) @@ -89,6 +99,7 @@ quit (center quit) music (utils/make-music "intro.ogg") ui-skin (skin "ui/ui.json") + balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4)) ] (label! start-playing :set-alignment Align/center) (label! quit :set-alignment Align/center) @@ -114,6 +125,9 @@ :path (catmull-rom-spline (map #(apply vector-2* %) [[-800 450] [1280 450] [2000 100] [0 100] [-800 300] [1280 300] [2000 450]]) true) :x 450 :y 650) + :balloon (assoc (animation->texture (assoc screen :total-time 0.0) balloon) :x 100 :y 100 :scale-x 4 :scale-y 4 + :anim balloon + :path (catmull-rom-spline (map #(apply vector-2* %) [[50 50] [70 100] [100 200] [151 206] [300 225] [480 300] [560 400] [650 440] [700 550] [750 600] [860 650] [950 700] [1030 800] [1280 960] [1300 1000] [-50 1000] [-50 -50]]) true)) :particle-clouds (assoc (particle-effect "title/particle-clouds" :reset :start) :x 640 :y 480 ) :ego-jet (assoc (particle-effect "ego/jet" :reset :start) :x 450 :y 650 ) :toolbox (center (assoc (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) @@ -162,13 +176,15 @@ (clear!) (let [entities (utils/apply-tweens screen entities (:tweens entities)) entities (fly-ego screen entities) + entities (fly-balloon screen entities) + entities (update-in entities [:balloon] merge (animation->texture screen (:anim (:balloon entities)))) ] (label! (:fullscreen entities) :set-text (if (.isFullscreen Gdx/graphics) "Fullscreen" "Windowed")) (music! (:music entities) :set-volume (utils/current-music-volume (:volume entities))) - (render! screen [(:background entities) (:particle-clouds entities) (:cloud-background entities) (:ego-jet entities) (:flying-ego entities) (:logo entities) (:toolbox entities) (:start-playing entities) (:quit entities) (:fullscreen entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:copyright entities) (:fade entities) ]) + (render! screen [(:background entities) (:particle-clouds entities) (:cloud-background entities) (:balloon entities) (:ego-jet entities) (:flying-ego entities) (:logo entities) (:toolbox entities) (:start-playing entities) (:quit entities) (:fullscreen entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:copyright entities) (:fade entities) ]) entities)) :show-screen (fn [entities]