From 7832eb2bbccd0ac7d095ce5dca99d3f8d8b33fe3 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 1 Aug 2014 10:49:13 +0100 Subject: [PATCH] Added MoveCamera command --- .../Fungus/Tests/Sequence/SequenceTest.unity | Bin 71160 -> 73496 bytes Assets/Fungus/VisualScripting/MoveCamera.cs | 63 ++++++++++++++++++ .../Fungus/VisualScripting/MoveCamera.cs.meta | 8 +++ 3 files changed, 71 insertions(+) create mode 100644 Assets/Fungus/VisualScripting/MoveCamera.cs create mode 100644 Assets/Fungus/VisualScripting/MoveCamera.cs.meta diff --git a/Assets/Fungus/Tests/Sequence/SequenceTest.unity b/Assets/Fungus/Tests/Sequence/SequenceTest.unity index 6fe3c57fbfde80f9e8f15edd3c3a92fe35934201..69adc1fbeb49d2cf335ebc0d64a0881c30594469 100644 GIT binary patch delta 2986 zcmY+F4N#QF8OQhGJ~~lPHo#617HbB^9P#3R58oVkOf? zNT(l}v~*%N$x1$`&5Rvlnh3p`m}Kn0l+5T%k}<7KZK^Gu>2!?ws9zBDa?t<2_r7@S z%)Yz(+vnNm+2`5ackWgF;XmqEFqYiN$WzD|%S68&Evu_pRa5(5h|Mo7EG)Dt#B+rtQQ<*2gAKD%3f7@JXCbeFtl;#b}N zxYG}pc31u)e#ZBlfe!{B=a(z}@v6`TGpCT;6}Cd*F>d~vKYk(nhKY}d{qa*xk!}3x zCV%{xN!@AN25a2-(%VGI_~gi(j!%sEJjwyE_q zuzmw$KfzdLOzM6P#*A!$)nSlS;TM1n#+2c&RQ5lxr@%%{j3rcdMatzc)(_oVD!U3c z2A1yh`Hta;IhV0+$Y~D#9jqTLB{z`T-N%4u0XIPKrn=xizzS`Q{RnJMWjlUe*?bsm zC~d)3unIe4Tfn|l<#vMggSCUrs_a`}=fTo#e0u<}G*9y;<;*Ur4Au$d8CAIrY#OW$ z?1su59}nFf&0m^2C)g1%=`^ySR2NvOBemXjRrhdT&gLh;1|Efw7Mfu|vy-v4VAoW^ z=fRr68o;iq>;3zi

0zw~I|-&5QEb#m-6F>Jz}^*gBZ1a|XlFlQJD`@Q zAOz2Y$(?9|;kQS7nwK%QA54o@1Z)Bn);EnD`(OP;09jDxk8F5O5RYyvFZ@E^d;Ww#?! zqlW`0q%z=6^fj*o=(GRM%{}|iVD!NkikcHw?s;Zo1}~c}jz_L-(AiGv_Pa&x<~QF- ze3U)(!Td0PY{t!x&m7=uX9Mxx+1ZR$FaM0>8cM;Alx@m^d|l)VAd7reWQ)gv$v3r8 zj9aOk2S3tR{dgHJeOgf-Ds^l-51w^@(s!7LVHwC`Qo5iH(MYmoxAPcOKZ%q_CrI+bSauFlHdCNm4 zUX<|KWh|$U9>h0Qbi5_uAv5nz6ez1S$yJK*6I-&11>?cDDp?jkmGCHXQ7K1Oo=kAc z=7+wDP!9hP-&}4_ew}Q*B^e<*A3{HmpGmF^;l3*?q^zcnxaN!8u-3ly$A#WTdEyNnEvJ0(R~?m;P9$~IN?vilo*qK;u3j0H7|26DvCcr7#FUdN#P1B$ zVE4jY`q43p83TE#O=KHs7nHk=uz0})#W5pU4N|;WJYu9`;md^GFN{>9z;8%cE$%gu zHS1iX+=MJ%5i`*N*t%$$|4_J*~)7tTlt6J;|mU`ugju9rgrt#FJ3)yB#X9V zdL|2wWC*8~B1%?%n|7g%B4$NaD#c?~+AX?uWD`$iYk@51XXnj!`KT|A;YBMJ^ogXE zN|vN#MK)3r5HDrZCM9*-#J{a+`E-e@9BP1o%#nB^hpH5*Q4w-bfjFB(ZNSyJSo;ns z5>RG$h)}M!#_PFMufUxWRtuMnTvEkGyPq?Y9$P(RBTrElqEi#B4c4z&Ro_sr1WN{t zDbvLz@=q!6ZcV5*xTdZ?SS#n$LW1mY@JJr%MV%elQ+j(Ad(SNPretp-A96SBh=tN~ z=TSw843#|h@{D!wzPF=0cKcae&+T*hVsjq(aF-s*qX3%Uq?!*?4dp8^lxjLs&7o8? znXlZzPg0HDfun=XI}mfPIO@P{QZCMj5x3`(gWO7_+QchT&L>tlq3jhcPHI&qzN1X2 Ncg;jD@tKpX{|BI6=u!Xx delta 2428 zcmY+GdrVVT9LLYEw3J6%T4+n56ewUUR7w#LbdI7jWs62MOwh?>PK+k%7Uu?LPHLii z{9!V^ZU?4DGsni}oFm;7-6XQj1QRv7Y2qA4NM_=5!v_wh9s8bpZ@)K})4yt0`6H#Rork~Zmm-Sho=x-SLw1)=jD z=VGMcv$3Hyhp!Vo2nF>nEj@%8joF#0lXfR zHE9{!iaB~5TMv5|>;_mV?nUE*{RNh-W2_GMVU_(2)(Y08XY8rUhJ~MzwXs$>K2hO4 zz;>e&jJ!;Y%dd0q_d%vdepsOs1N)&SN7_K(UIgY|$#7g++vEaMmRl86Och1f@Gto6$F=TCwy z28%ReYXi(qR#q74*bcTIOazap!R;GNbK_DN+ZYwx0ro!Fbg+l2-zQ-GU=?5wRJI$8 zS(&W#MQ}0pfVG0PEyW~K_}86jwU+^-SNI!Pg>8Iy7r{ORYeMXOwMc$_)v94IMOLN5 zNnow^@oE)>bA+neSnTs##R8{Qxg_}1;Ip-i2Q!AL9jJZewD|&*3~)~dlM`o zYXGbtEP6Yuz#M6cs*!v%kGFNL3j#*(=PVHnrmj$4V4rQ?TiNN14WPnJycuG24cu;F z8I1iB#lB5Xf4ko`elgu(Rhi=(34!egt1iW=Bd7H{z#D+kg})cUS&TJAso)DWJg$k6 zjy$zX{>OId%+nTWHtei$ku(_Aht`K5X?T!mm-PD2+O(>ycMz(s7FN9PLM9C_*3dyB zepN$RHnhVAHy*}c<CSO93+Qo5C1*zK)(D6K~dG zmc%>7%*=;$RFaRENlptRU*h;g)+zUhxma^De>RpTCgHV^-K~n{ug20;%h@w?D*z=vl@n$1!UWhX-kd;V+ zCd!oOHGGE&dQaeC69r`QfQ9AMPLMwFl@NHHoUC2AF z6p$tUe4NB1R!E#@qdHlUTU;AQ!N L@b+*+78(8rwl!A! diff --git a/Assets/Fungus/VisualScripting/MoveCamera.cs b/Assets/Fungus/VisualScripting/MoveCamera.cs new file mode 100644 index 00000000..13d54eba --- /dev/null +++ b/Assets/Fungus/VisualScripting/MoveCamera.cs @@ -0,0 +1,63 @@ +using UnityEngine; +using System; +using System.Collections; + +namespace Fungus.Script +{ + + public class MoveCamera : FungusCommand + { + public enum Transition + { + Move, + Fade + } + + public Transition transition; + public float duration; + public View targetView; + public bool waitUntilFinished = true; + + public override void OnEnter() + { + + Game game = Game.GetInstance(); + + if (waitUntilFinished) + { + game.waiting = true; + } + + if (transition == Transition.Fade) + { + game.cameraController.FadeToView(targetView, duration, delegate { + if (waitUntilFinished) + { + game.waiting = false; + Continue(); + } + }); + } + else if (transition == Transition.Move) + { + Vector3 targetPosition = targetView.transform.position; + Quaternion targetRotation = targetView.transform.rotation; + float targetSize = targetView.viewSize; + + game.cameraController.PanToPosition(targetPosition, targetRotation, targetSize, duration, delegate { + if (waitUntilFinished) + { + game.waiting = false; + Continue(); + } + }); + } + + if (!waitUntilFinished) + { + Continue(); + } + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/VisualScripting/MoveCamera.cs.meta b/Assets/Fungus/VisualScripting/MoveCamera.cs.meta new file mode 100644 index 00000000..ee89295e --- /dev/null +++ b/Assets/Fungus/VisualScripting/MoveCamera.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b3057c17923c47bbbbf6dd0d8ecef99 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: