From c88889a085adb47b5d37c83927b16a8ef808116e Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Thu, 4 Sep 2014 15:57:26 +0100 Subject: [PATCH] Added Shake Camera command --- Assets/Fungus/Camera/Commands/ShakeCamera.cs | 46 ++++++++++++++++++ .../Camera/Commands/ShakeCamera.cs.meta | 8 +++ Assets/Shuttle/ShuttleGame.unity | Bin 131248 -> 133064 bytes 3 files changed, 54 insertions(+) create mode 100644 Assets/Fungus/Camera/Commands/ShakeCamera.cs create mode 100644 Assets/Fungus/Camera/Commands/ShakeCamera.cs.meta diff --git a/Assets/Fungus/Camera/Commands/ShakeCamera.cs b/Assets/Fungus/Camera/Commands/ShakeCamera.cs new file mode 100644 index 00000000..f5c000c0 --- /dev/null +++ b/Assets/Fungus/Camera/Commands/ShakeCamera.cs @@ -0,0 +1,46 @@ +using UnityEngine; +using System; +using System.Collections; + +namespace Fungus.Script +{ + [CommandInfo("Camera", + "Shake Camera", + "Applies a camera shake effect to the main camera.")] + public class ShakeCamera : FungusCommand + { + public float duration = 0.5f; + public Vector2 amount = new Vector2(1, 1); + public bool waitUntilFinished; + + public override void OnEnter() + { + iTween.ShakePosition(Camera.main.gameObject, new Vector3(amount.x, amount.y, 0), duration); + + if (waitUntilFinished) + { + Invoke("OnWaitComplete", duration); + } + else + { + Continue(); + } + } + + void OnWaitComplete() + { + Continue(); + } + + public override string GetSummary() + { + return "For " + duration + " seconds."; + } + + public override Color GetButtonColor() + { + return new Color32(216, 228, 170, 255); + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/Camera/Commands/ShakeCamera.cs.meta b/Assets/Fungus/Camera/Commands/ShakeCamera.cs.meta new file mode 100644 index 00000000..e6b9dfa5 --- /dev/null +++ b/Assets/Fungus/Camera/Commands/ShakeCamera.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 616cd37e21c7645c58a89edf5abee56f +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index f801a7b3babf47f0cdb0b7e9374c3997429f85f2..1d5fe2c8dd4132e05c8e2e90ea7393e651f35b39 100644 GIT binary patch delta 3986 zcmZA4dr(x@9S899Lxd$7*;=JEHL?v)T|_i$c2a|@RfnWL7Df>S+Sm!sI$6xau_efM+E}Wf{E_JTAR=gk2CZpg?Dy>63+FB~2k!ms z_dM=-T%heWjkigYz^L>r3kml!#v*X-!%sFZWkE`6@to(_kB=Weeim@WakXUT2~%b$ z`S_Lli%@5n<7lYfZJ+Q&sAJ;P5|^G}l_=2V#D ztJs&Q-(NQ~E+*WO7^im|Tgt~f3LC>5PtG~&sMe3xC=a0le{z|jB+T)YLGQkhHZ+w6 z{boISZruL6VeZeew~TX~UZZy}GkiRLYSzY*nyPJcH?gA1s#mwxFb&2W=Qw>ghTNyI>Dw`<~~<%<6CO2Viy%V>Sf8m4lC9 zK3E=XNVdl?<9fzgga$u4s$cDcWx)7D@Zy0Pav6IW*UE!fntE2dVAVoyN0YT@bu@Y~ z1AmY^sYB2PtB3jIvJ{Z+=9mm34Fbk|lE^)Bv4UARbUKvb0 z%my=9fmL!z0G&Fe_irB%q;09h?Dcge?^+&xCn{a(b8+^Sn^VCBsZXHVbBliS4CW)>ut_K%-E3 zHiFR`)s_m&hKZfbfjNV6b76f!xo3HMo7C+sTJTn8HtYn${43LH1ZqnI>#pq9#V|We z+|^59nlg3n*DxDQ+`vnDdz%9%M`>>v%mw2o%ztwD`Y#7Q1RlV(5=@8Lw=m{{DaYVxWAC&ik6J{;j8aQI1_<)yp zk}s_D!hS1MZi1y_m+pf3 z9Oi!jXv87r!LQ}Yw_r|~3#Kf|Ak0u3ILG~RZV1*2<8^Pyb{odFt8;f?X4qKAjBO~G zleRd#dGNaUo0`^eVo~nx(et8B0JjPYMALQ97Uua$B z-FJWWaw`mP=FyJ-4b$$y`4^w$JkY*J-N^+Qdt2RL*Ojg^9ZZ~7FU$fHmuXgxue>`b zmjX+|u?gfb|9tw7r2nC!5hyn3g7u9C1G$VNFIA@QQ|B^aHkjD)zuFd>eL=ZynBg6D zF5mj(cC#HQcDw;L5EN{fKB?N+q|RAkPMFy7<^f~%Fzm0wRBwT`+ts;pnD$+~e;X0J zC$C)v&Q`W`FefT2ui)*vj2h!X^$xbcyfASC?|_+_)f=-8=7NcvdZ*5sQ4@_G#9dvF zpbaMOV5u~>rWJ-a>F5r2!jcZ*Z#dXh`RNY93SqoGpKOO=-LQqQE3&-@(;mhHE9akY z!qTj{wPnDyxK_?*8SD&9e7b|j=hvpcr``+AFc(bR3wwKy)IJQ#?Sq+G#&TBP@uc{^ z+E$>r2_s?b_hUhxoAOQ8_H3A#n+j_S%H96U^#;xR>f9YzAxs?Lp9Y7Xx3&ZGg(v>= z;E*-?h&uQI%nY+2*CUr1o;UKTK13UJ_Jy01>z8-#-gE2Gv7rqQJl_>iCV4W8==@rW zkm5a5GLiq*<6r!L3dwbkq9vDybdq^9X{7opnj)pPQ>gT%hwKzCRkl+iJ(BjdQ-^f? z66rkVQ}iiG2Re`&uA`_Yj7G+Ei+TCz6Pl)p4nfO&y%_uZ64Q^LFY#aEn>4S3;-nTM zIw|a+dD54>g;svGu#>mNuWp>9$({wDQyBR#rB$6&8~9k)!H3jIW&GACSj$;T3WO(h zQc9qOs4hAePBEVTbCfe4^%nKeS5jUd&6LuPQ<$`(muyn%t;XFPIVjKxXpcb&|3e!_rw3MGW8b%V-uS%Xc03VB z8ak5c&+_daX$^UYe>>C1zh@2YJ$f`FWVU=lzR2aFp{mh#qKm#@(d1C;DSY9*_k|4K zqW%=4>YV}tq z$mboCv~SWPYv@=FN`@<38KM0(d6#HqIQmO^d!+I%214SwS+d}< zmU70*@HtaFU%|Rz9(*3aIGIy+s1i?}yUghU4nqrCBl$2t0@*{P3Sn(alC$-1F_MWeTMc8y zsOy@rNicVsSzr;#6m>oC0~(exHd`t@8Rmq^6drQ`HJ#a_+~lKw9qM2Y)j+273<;YqRQr`B$jRj``Pi z<|9B;t$qj3f_Y)hD6Hjv1~b;_H|uP*LYP;|{TyalsXryZfVIH3YdLlOi-D$9j0Nzn z9kEAY?J)T$`V&p%#?{ydLm0c7k$iSe-(PN8!x*+hYIGdd0#kQ-pV$k2SU+qLEK@wM z6da$gIM*`vv{bki*ah1Pi;2eztH9RvV*YwXg|EWmXhA+sucU0LXc zorG!Ae;($<#=~8qq%MmKz$nmyadi}*!1#44)YOl35G2XOSsy7PuNNT#i19QQ)!D8aMN6l?u>?inqRy^N@IbgH# zS^bry9_^RL9<21hO7X5u|29|*rnakS4f{8`s_Yx}!Cf#fOzz-k!=9;%r{z9}IX3BY z51sq4$`8Y3m}+Arp;I;>EtZ9{`eA43)WvQybu^`(Kk{&d0vfui$3=#%nOq{bMKxVHSx6E z4`GgH^tmy$du#l#!6jDDzq&4Cfre-G$7vkQ4Z}pF*4+#nfaSupBi3=ry419lu^=ka z?uExzytOp?9Ao&Kn*PUO&gb<P@r^WO-(C~ytX3zTgw%rshiD8 zX`|7v-*CLPve5>^4VgMRepnD@hn*Lr+Xaim)LA$uY&Wc8SMon4F=4O6{4jOI+HG4~ zKDDVIHcvbM>L#oM7Vp-NZpS+hG;w&;$16gX!wg-`g9%{_$Pm*rF>ck*?oyD121SJ zBad}ZCg0XUUdrNQKB7syKnpkVcSva9Lmc&>7H=TXH@(x3}*hn=nReHM^4cczU(x4 z__WhBneRP|f#jYc3s0Ozzl=>ty3WuZ8qY`c&=kt!5B1PGKBEWOp7)UrHlQ1rB?FI~ zqHKIW=2IP7h=cbJP(DrMBW}@j-uX2-lJ8&P k$J1LdjRm)