From 7fbc9e1d4e6a0b0f62adebc1a049e5a733297868 Mon Sep 17 00:00:00 2001 From: Sophie Date: Fri, 8 Apr 2016 01:25:19 -0400 Subject: [PATCH 1/5] starting asteroid --- Assets/Asteroid.cs | 26 ++++++++++++++++++ Assets/Asteroid.cs.meta | 12 ++++++++ Assets/Scripts.meta | 9 ------ Assets/Sounds.meta | 9 ------ Assets/SpawnAsteroids.cs | 19 +++++++++++++ Assets/SpawnAsteroids.cs.meta | 12 ++++++++ Assets/_Scenes.meta | 4 +-- Assets/_Scenes/sophieScene.unity | Bin 0 -> 16548 bytes .../sophieScene.unity.meta} | 5 ++-- Assets/m_asteroid.mat | Bin 0 -> 4896 bytes Assets/m_asteroid.mat.meta | 8 ++++++ ProjectSettings/TagManager.asset | Bin 4308 -> 4320 bytes 12 files changed, 81 insertions(+), 23 deletions(-) create mode 100644 Assets/Asteroid.cs create mode 100644 Assets/Asteroid.cs.meta delete mode 100644 Assets/Scripts.meta delete mode 100644 Assets/Sounds.meta create mode 100644 Assets/SpawnAsteroids.cs create mode 100644 Assets/SpawnAsteroids.cs.meta create mode 100644 Assets/_Scenes/sophieScene.unity rename Assets/{Prefabs.meta => _Scenes/sophieScene.unity.meta} (58%) create mode 100644 Assets/m_asteroid.mat create mode 100644 Assets/m_asteroid.mat.meta diff --git a/Assets/Asteroid.cs b/Assets/Asteroid.cs new file mode 100644 index 0000000..ab18c29 --- /dev/null +++ b/Assets/Asteroid.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using System.Collections; + +public class Asteroid : MonoBehaviour +{ + Vector3 center; + public float speed; + public float step; + + // Use this for initialization + void Start () { + center = new Vector3(0, 0); + } + + // Update is called once per frame + void Update () { + MoveObject(center); + + } + + void MoveObject(Vector3 center) + { + step = speed * Time.deltaTime; + this.transform.position = Vector3.MoveTowards(transform.position, center, step); + } +} diff --git a/Assets/Asteroid.cs.meta b/Assets/Asteroid.cs.meta new file mode 100644 index 0000000..50ef0f8 --- /dev/null +++ b/Assets/Asteroid.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 025c26020d5e62f40be0e8a2d063c51b +timeCreated: 1460088774 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta deleted file mode 100644 index 14bba09..0000000 --- a/Assets/Scripts.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2a2a40279929a214db32fd8ec2e94b23 -folderAsset: yes -timeCreated: 1460086249 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta deleted file mode 100644 index 8a769b8..0000000 --- a/Assets/Sounds.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c8a47bc917a8b874eabaca4e75369948 -folderAsset: yes -timeCreated: 1460086241 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SpawnAsteroids.cs b/Assets/SpawnAsteroids.cs new file mode 100644 index 0000000..8e6c050 --- /dev/null +++ b/Assets/SpawnAsteroids.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using System.Collections; + +public class SpawnAsteroids : MonoBehaviour { + + public bool doSpawn; + + // Use this for initialization + void Start () { + doSpawn = true; + InvokeRepeating("LaunchProjectile", 0, 0.4F); + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/SpawnAsteroids.cs.meta b/Assets/SpawnAsteroids.cs.meta new file mode 100644 index 0000000..d0986ca --- /dev/null +++ b/Assets/SpawnAsteroids.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 665432c96ca23f140a869ed98ade0dde +timeCreated: 1460092006 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes.meta b/Assets/_Scenes.meta index 400ffa7..6e47d4c 100644 --- a/Assets/_Scenes.meta +++ b/Assets/_Scenes.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 3c5f064c6cc9dad4d942c7175ca62bf8 +guid: eaff437385965f0409ef60dcab46e52a folderAsset: yes -timeCreated: 1460086225 +timeCreated: 1460088152 licenseType: Free DefaultImporter: userData: diff --git a/Assets/_Scenes/sophieScene.unity b/Assets/_Scenes/sophieScene.unity new file mode 100644 index 0000000000000000000000000000000000000000..c14e5719a92924882db138415d0b53d19fe1e0d7 GIT binary patch literal 16548 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 dp}k*$Z&>yF!T%mTckxboOzrY9{(Lyr{{$ zWaI~t?PU?UQ{*ljL=KM~96PjfKyGYoY~*qPJD{ImzOwiFm0j(t?=D=sxckD+3RoVC zB^)U)iX^b#(33%4UP88$p8$Kd}f_+k9KMlRtw`P>1-LnUX-xhe93 zj&l#rVVtAnS_^Utw(mhX-)eYH;6o;$%$G{(&G&ZAQr;cs9fqfI9>tvTpj)_-wzuMB z3;V^nja;i8=iP><{dya7=CvJ4VeMGYI>zMp5JJeWfq#fG<&5XCdLH8oQ2Kum$E-fOZeM5oA;Sw+UJn~SWaae;IfV7;uG^!833*XI z!>CiY#|$s&dVYsF<9XchVe7hl&eD8Gtm{5Wu64w!=Tn9k<$H`-PuBQpD1~+V2L1gR zW8VAE5JGY?to?VM_h&UrdH4N4W_U?{hwoo7=QFw=DpJ;dE+XH{m<>UnBktmVU`Ebo zFy*PAzc8bp=ZU-QJAMxK@Q$BDhUax3uVT)69wtv1zum_d47dA;_obHJKE7n^?LNM2 zxZTHB47dCEDtNy>j+1M(`}msSMPWVJN7jw+EehXPeBPlt-$}w`bG}oC+xZ?LhxFz< zO_-3|`OX+_=R0e-o$nlYzkKJ(wc7deJ(}{OoJ9o8m+#JFP?0j$O1cjJV#YcghvvHY z^^CvX!*68#L=Wf1=;vg{D{ibp&-G<-F%HM)YF-?KbM06)BQI!9NW+=;e06*lgGD#4 zW1#Jp>TXSiTuw)3a6+wr5QMb|;H0-&j~njVyzj1ZKGTZgpz)?^;>=Sm)lw40q1RkJ z?XFhbH96Dt;`PNaSW{uVzEoE#rc?Kvs%6kq^m1CY=bGmtX}S%So|BSvDQ<;|r&V2F zNn6%2URYU)w6A$TaAO@v;0IwOp{&ZXxGacBd25*mE#*SG)!2a>OapC^EpmHeBvet* z3acvG-(vL6a?A5$uj#0E9JOQGxgZu=It{M>dHs#U+m{njR9tlF_?-*XKw>T7P>^3y+yyW&RgW7aLUZC8#* z{AE=OHicr_Z-XnRf|~fgS3T+nQMBmU?!9UQB=v+E=Ns<0*iGQCsoxaU*1DY+G ZL*_eM`}C8aCO-P-{KVhl;EO1k{0|v<8~XqN literal 0 HcmV?d00001 diff --git a/Assets/m_asteroid.mat.meta b/Assets/m_asteroid.mat.meta new file mode 100644 index 0000000..1e016b8 --- /dev/null +++ b/Assets/m_asteroid.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 373eeb9894b74ec43b7157c541d7cde8 +timeCreated: 1460088680 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index c5070920117e0b6ff5b64b324928d33ca9d41d86..9f9baf16074641c13599be0913de9169b44f66b1 100644 GIT binary patch delta 45 zcmcbj_&||^fr0541B1YWjT|4C7$0o@$;8epz{tSB0F+>GEG|hc%Fj%h%p!0B05Zu9 A1ONa4 delta 32 ocmaE$ctw$efr0541B1YojT|4C7_V&p$;8e(S%H~lvVgz^0IwbjUH||9 From 8b8de8b58a4a4e0b88d43b9ad2abce68070d14d0 Mon Sep 17 00:00:00 2001 From: Sophie Date: Fri, 8 Apr 2016 01:54:33 -0400 Subject: [PATCH 2/5] starting spawn asteroid --- Assets/Prefabs/Asteroid.prefab | Bin 0 -> 7316 bytes Assets/Prefabs/Asteroid.prefab.meta | 8 +++++++ Assets/Scripts.meta | 9 +++++++ Assets/{ => Scripts}/Asteroid.cs | 0 Assets/{ => Scripts}/Asteroid.cs.meta | 0 Assets/Scripts/SpawnAsteroids.cs | 25 ++++++++++++++++++++ Assets/{ => Scripts}/SpawnAsteroids.cs.meta | 0 Assets/Sounds.meta | 9 +++++++ Assets/SpawnAsteroids.cs | 19 --------------- Assets/_Scenes/sophieScene.unity | Bin 16548 -> 13412 bytes 10 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 Assets/Prefabs/Asteroid.prefab create mode 100644 Assets/Prefabs/Asteroid.prefab.meta create mode 100644 Assets/Scripts.meta rename Assets/{ => Scripts}/Asteroid.cs (100%) rename Assets/{ => Scripts}/Asteroid.cs.meta (100%) create mode 100644 Assets/Scripts/SpawnAsteroids.cs rename Assets/{ => Scripts}/SpawnAsteroids.cs.meta (100%) create mode 100644 Assets/Sounds.meta delete mode 100644 Assets/SpawnAsteroids.cs diff --git a/Assets/Prefabs/Asteroid.prefab b/Assets/Prefabs/Asteroid.prefab new file mode 100644 index 0000000000000000000000000000000000000000..f21dc6fe0daf24668bd401287ad7a5b310327ef4 GIT binary patch literal 7316 zcmd^DZHyIH89uWg(9!~0PzuHNLXjfsnih&gE8J!IT3ukf3sft$oxOLscj(d`cX!S0 zPvdOP&Yb7G^PF?uuk+q9X7MRwmVVM0GvAoSf5qM0+Owu-?f#q1tCufdc4h;>{qoLz zANI-rS+54}5Q83FOwGIcT#T(|D&b4Zepi zo`^f`?)wp+{QP#oJS-km1^eNw&!F#}S1Nv7aV=C{Mk9C;F zPZFN)jC_`7RtC@VaG#cEEqEpp9?sD_&3dlP;8~tIP24fZvCg}|!yR6Q=Je_u)WiFL zb6?!E)k78Y{xO+%E^uD0dYC7e;@Np&y(Z6g@IM9~>i>1b8zS%A41KZ@e?9Rc@lMh6 zb$EyCxrVs3PIEhC51_HXpou$%{A&{ag~S_trz6Mz2I58Hd4Ae+I{rmX+%YFG=PLBM zo@>!)XxfH&Pl7K_@WH`2ylqR_kArZ_;n=H3eo)_FM(^J0*S!ACco=l!DjuRS&nufK z_QquTZ(Tp@+jq`eb@I}sP2qv{3!kSu`3d#onC5@keNV$YR3FWpao?PIQuoc9Cw1RW za|7Iw=BEqMeKica#9clQ+`6yDS3rIa=B7*2eHHJ{g)!aN;;rthxTcA(+E%(;%LAJ8|D4@%+A0_szStxG$(I|801t-sry5@r(Nwr}C%no9Czds=GVp8R%y_ z`qYoOuZ-o>9Mh=EcbKexu503|pIzuvKTBKiza?qqO~8#Q%Dx7$lMf|w*C+RO!)EmE zzF>4LsC)Gou{7XLdLiz+-O6wr`t=H)`%6I`x1H|94lk-&iTcJ1>JR%Wvmpux0rN(Ir2F zEh}&NCD^9nXRu}EEkA?J@-x}pg)W1Z!KO(hpA;BuiszF8gU#Znl4QqqGT0Q?WM^v- z2AjpR!O37#+%e>-qE8+THb?Au7C~rvc-Ro7eX~4;ChkbmJcvH+xJ+PCHZ4cO%BQ@z$b`^YKLEm@4qU z7k!qewdk`v?G}BO=Ss}mn=zc_Nl#7348YL2qOYiHJq|~`Ro0yZaJO7Ci6R>8aUiwqzVz0$JqMvF*OnqOVIF((WrgH66qC+=F+yp7hkr zuSbf$Y1SjBW`ffnSXI!5^eH{CP?K7uaiWgzpS4>4fBhG)*JrzY|Iyc)=gXXn*GR-O~!{|-3FUqHh_jHc`Ph4gJ8 zr}&u!=Yg1&|7U`8-%e5Gxqkex68;q#dCt2e!Qb41_aykr489TA`_Z`Ho6wB#=l9El zNY|qY%If(oO@D5;aC0;a!mBEl#M;bvQX+Mkgxlue^b<4q_ z2svrUD|x6WQecN0d!g^vI5<2$5_xfdz3i7f=`;0}Ho0-B$`l5PJ&`xySE}(~7>tO> zkhj0)p-2hp0_}<13bUYedh4ZXz)DAQV}D)V9CgQJ+>5+$!rQZ#^YmBhLFnxa!cnYa zYY_HT-7wzl#Y#*8R8L{-*5hsc=`-eZ~Ly2QGf@mGuXiX^)^W%6QRWTlEo7s_dBz##3V^gE50lXRsdNuf<@N zr`2GVr(J_to>qfdo~*&31D?Lq8qD&v8qD%ogV9C7(YOOV4%$34HGKYLrw;AsoD+~Q zp-;VO39b5PX`=oE?17Jj=< zaYv2;za4AjI>}3S%<_L2ee%;Cb^UpMDFlmC`Dq{J$@9}4EkE_}QS`Z|v=GeeAuR-F zLFnh4)^DWwS0b73y=Qp;dJvHl|zXS zxN81L=!TQ;7_a;BWT6Z<7_Y^J(2Iickfm@Nmt8X#PTldcI;Bo{SzU3jysQqWPhM8f zR!3HU9Agsg#h3Rm@XOg}jK1EyYSR>v1fX2&HQm1HCg*NSCEI<^%JFXf iFlC{x^s;ic&---i$c`sQYjSXGI-cA+Nyplg^8W#=6(#%t literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/Asteroid.prefab.meta b/Assets/Prefabs/Asteroid.prefab.meta new file mode 100644 index 0000000..0da83ea --- /dev/null +++ b/Assets/Prefabs/Asteroid.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc1a204562630cd40a1dd685b5ed8e6e +timeCreated: 1460093261 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000..823506f --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f0123460f54262d43bd494bf9cbc0126 +folderAsset: yes +timeCreated: 1460093246 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Asteroid.cs b/Assets/Scripts/Asteroid.cs similarity index 100% rename from Assets/Asteroid.cs rename to Assets/Scripts/Asteroid.cs diff --git a/Assets/Asteroid.cs.meta b/Assets/Scripts/Asteroid.cs.meta similarity index 100% rename from Assets/Asteroid.cs.meta rename to Assets/Scripts/Asteroid.cs.meta diff --git a/Assets/Scripts/SpawnAsteroids.cs b/Assets/Scripts/SpawnAsteroids.cs new file mode 100644 index 0000000..524ca47 --- /dev/null +++ b/Assets/Scripts/SpawnAsteroids.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using System.Collections; + +public class SpawnAsteroids : MonoBehaviour { + + public GameObject myAsteroid; + public Vector3 initialPosition; + + // Use this for initialization + void Start () { + InvokeRepeating("Spawn", 0, 0.5F); + + } + + // Update is called once per frame + void Update () { + + } + + void Spawn() + { + GameObject instance = Instantiate(myAsteroid); + instance.transform.position = new Vector3(10, 10, 0); + } +} diff --git a/Assets/SpawnAsteroids.cs.meta b/Assets/Scripts/SpawnAsteroids.cs.meta similarity index 100% rename from Assets/SpawnAsteroids.cs.meta rename to Assets/Scripts/SpawnAsteroids.cs.meta diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta new file mode 100644 index 0000000..9c1e5fe --- /dev/null +++ b/Assets/Sounds.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 043c9d3c0b79fd64b9d82d520495597e +folderAsset: yes +timeCreated: 1460093246 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SpawnAsteroids.cs b/Assets/SpawnAsteroids.cs deleted file mode 100644 index 8e6c050..0000000 --- a/Assets/SpawnAsteroids.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class SpawnAsteroids : MonoBehaviour { - - public bool doSpawn; - - // Use this for initialization - void Start () { - doSpawn = true; - InvokeRepeating("LaunchProjectile", 0, 0.4F); - - } - - // Update is called once per frame - void Update () { - - } -} diff --git a/Assets/_Scenes/sophieScene.unity b/Assets/_Scenes/sophieScene.unity index c14e5719a92924882db138415d0b53d19fe1e0d7..6729570891655f17238233f54fab8976eee13208 100644 GIT binary patch delta 462 zcmZ3|$oM3~kAXpV9|MC)3IhWJKal+ZNHdt~8S9y(88ZC)|NlQD4^RL||Nkx55cs|% zGbqGqUeD_(W@{VXta)8#e_C+E5~I`do8GI)0M+?!^mAv@TENWEpaJAD0RRZMfsU2n?Ez1=h@sX`j=_5rPO+X&E>lH*ck;jhnp5M zPA)L#VD(^SV5pp2Yc3vo0>}dSlm(3c{|8bGZpOT}AliV9fguD)gZx?q5&$_Lgn{5e z<$5s93?kE9mFFDO`s}zMF=(=lxiQp;VQ=lFeWYK!_XZ3C z?fi#e6cTQtf`Afq7VdI-@BN)~ z&*#18?PlWaIO_vgT>%h03jnil?ZFvV_yhiq9qn+hSS&I`0q0`hwx@pnz3bD1tG@`p z^>+S+rq52_R%`xce|=b0IZ)X7!R|Vg3tZ^i=k8r<*&zHCe zPWM&lS-=tJof}!Tf1jIE6MyBv$~#~Fmi;FFMl)j1GtpGNl2wYM&IPPN z+^BG~X3OoseHad!(62 zG{{?$56d+`C4oT`{|V){;FfYyMK}%y4%UwHLIv&4;RcdpvxBHIZY9FX6MY%($X zK3)b_5o^FbC2I~6xxsMfM>Ea1rZ8&m;|$3BFz(5G?R|Wb`Qls?7sHPF-0LV$c1b^F z*3{47Tl6Q3d-8{hWa5rV{!o!@ywo2mwXKKJ^o+G%fU}(@ic0|afeb%H3>=hKGW;g4 z$#6Y^I52;vVUb@rQN4wdW1c#L>Mr7*w0R_+m)gkuS8@;Foq}Jn@I_Pbe=MBR&Vr^M zaYEzUYAOI&4foO z%YaWZ=nw-B7W5$E4#bub9t7y+dSZa5V_Xycwaap;?O{bX1`|pwvqy*2_5mK{>TW&( z^eP6|R3%Bw!O;<&8s;H-hqjWTNIad2c64vGq_hBAklettJgB`Rx9FLt8`0I!YDJg&8&HtCt=^*(;attQXf4 zchzT~ynW*C>Rr?w_9M{+qCsJGiyIA#*(@1Nqm0HcqiK}U_+>PWvb9nJpBfEnpmzDd zXz0y6C>mRj9gW>`A4hpgxNNO5`bn)jM_(ymArdmbC{fFRY_`^cTbQmS;*?&q*?MFe z&tRydmOM3EfC+q$g;TRF#m6k1nk~BJfx&EoYdoAuCe;|_J}h(JpBU5CsQs{H6|6^w z1&QceG&LUQ^ehIHm^w=LKg`qk3Slpd!M?(K4cE#YbD{9!vRy29d~ZEP37e(?eKgT^ zqGFM-6Bh4J2=T2I@OUT=VINgjxmd;ZaZ(cb7Uhtgk zq+W}8+G6%2Glqw#m}M5PD^R%>w{Q`89OqI;H&{Fm)@0H-Q;3ei^|5nucG9os^AXRb zTTPqKmscI}Rj%B2L5#ONI$Qtsqr;K?H+u^1(QUN{emUY0-?z*!+-dPoV@~l{YirE* z&nqbtiGRANTRwA6p1uq+dpLChyt`hEw+F=amT9KiKU&?a z6QSlRTPZ!zYl{)`d29%gl9BJc{MvAEf9*S+#{ykwYZ29khMjv_S0HUvQhf8sPVB7W PV4z#Hb<7Z#0&D&U7!&8q From 8a25f480aee132e4cd3ebafa9a210e82e0eee20e Mon Sep 17 00:00:00 2001 From: Sophie Date: Fri, 8 Apr 2016 02:33:23 -0400 Subject: [PATCH 3/5] random spawn around a circle --- Assets/Scripts/SpawnAsteroids.cs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/SpawnAsteroids.cs b/Assets/Scripts/SpawnAsteroids.cs index 524ca47..751e263 100644 --- a/Assets/Scripts/SpawnAsteroids.cs +++ b/Assets/Scripts/SpawnAsteroids.cs @@ -4,10 +4,16 @@ using System.Collections; public class SpawnAsteroids : MonoBehaviour { public GameObject myAsteroid; - public Vector3 initialPosition; + Vector3 center; + float x; + float y; + float d; // Use this for initialization - void Start () { + void Start() + { + center = new Vector3(0, 0); + d = 4; InvokeRepeating("Spawn", 0, 0.5F); } @@ -20,6 +26,16 @@ public class SpawnAsteroids : MonoBehaviour { void Spawn() { GameObject instance = Instantiate(myAsteroid); - instance.transform.position = new Vector3(10, 10, 0); + instance.transform.position = getPositions(); } + + Vector3 getPositions() + { + float theta = Random.Range(0F, 360F); + x = center.x - Mathf.Sin(theta) * d; + y = center.y - Mathf.Cos(theta) * d; + return new Vector3(x, y); + } + + } From 1fefe8e78825c69fee67605de2e65ebe4d96ef6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Fri, 8 Apr 2016 03:19:09 -0400 Subject: [PATCH 4/5] Pushing wedges forth and back. (need to adjust planet radius with offest) --- Assets/Scripts/PlanetManager.cs | 60 ++++++++++++-- Assets/Scripts/TimerFunctionsClass.cs | 92 ++++++++++++++++++++++ Assets/Scripts/TimerFunctionsClass.cs.meta | 12 +++ Assets/Scripts/testRotate.cs | 57 +++++++++++--- 4 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 Assets/Scripts/TimerFunctionsClass.cs create mode 100644 Assets/Scripts/TimerFunctionsClass.cs.meta diff --git a/Assets/Scripts/PlanetManager.cs b/Assets/Scripts/PlanetManager.cs index 06db24c..c0fdb53 100644 --- a/Assets/Scripts/PlanetManager.cs +++ b/Assets/Scripts/PlanetManager.cs @@ -23,15 +23,16 @@ public class PlanetManager : MonoBehaviour { float debutAngleTheta = i* TailleCartiersEnDegres; var w = new Wedge() {tMin = debutAngleTheta, tMax = debutAngleTheta + TailleCartiersEnDegres}; - wedges.Add(w); //pushes at end. + //float angle = i * Mathf.PI * 2 / NbCartiers * 360; var wedgePos = GetPlanetCoordinatesFromPlayerXY(debutAngleTheta, 0); wedgePos.x -= 8/ Mathf.PI * Mathf.Cos(debutAngleTheta * Mathf.PI / 180); wedgePos.y -= 8/ Mathf.PI * Mathf.Sin(debutAngleTheta * Mathf.PI / 180); - Instantiate(WedgePrefab, wedgePos, Quaternion.Euler(0, 0, debutAngleTheta)); - - + var obj = Instantiate(WedgePrefab, wedgePos, Quaternion.Euler(0, 0, debutAngleTheta)); + obj.name = "wedge_" + i; + w.sprite = GameObject.Find(obj.name); + wedges.Add(w); //pushes at end. } } @@ -54,6 +55,55 @@ public class PlanetManager : MonoBehaviour } + public void PushWedge(float thetaPlayerX) + { + var index = GetWedgeIndex(thetaPlayerX); + var w = wedges[index]; + + + + w.offset = w.offset - 0.5f; + if (w.offset < -1.0f) + w.offset = -1.0f; + + var angle = w.tMin; //w.tMax - TailleCartiersEnDegres/2; + + var normalPos = GetPlanetCoordinatesFromPlayerXY(angle, 0); + normalPos.x -= 8 / Mathf.PI * Mathf.Cos(angle * Mathf.PI / 180); + normalPos.y -= 8 / Mathf.PI * Mathf.Sin(angle * Mathf.PI / 180); + + var wedgePos = GetPlanetCoordinatesFromPlayerXY(angle, 0); + wedgePos.x -= 8 / Mathf.PI * Mathf.Cos(angle * Mathf.PI / 180) - 50 * w.offset * Mathf.Cos(angle * Mathf.PI / 180); + wedgePos.y -= 8 / Mathf.PI * Mathf.Sin(angle * Mathf.PI / 180) - 50 * w.offset * Mathf.Sin(angle * Mathf.PI / 180); + + + w.sprite.transform.position = Vector3.Lerp(normalPos, wedgePos, Time.deltaTime); + + ///push back l'opposée + var indexOppose = GetWedgeOpposé(index); + var v = wedges[indexOppose]; + + v.offset = v.offset + 0.5f; + if (v.offset > 1.0f) + v.offset = 1.0f; + + angle = v.tMin; //w.tMax - TailleCartiersEnDegres/2; + + normalPos = GetPlanetCoordinatesFromPlayerXY(angle, 0); + normalPos.x -= 8 / Mathf.PI * Mathf.Cos(angle * Mathf.PI / 180); + normalPos.y -= 8 / Mathf.PI * Mathf.Sin(angle * Mathf.PI / 180); + + wedgePos = GetPlanetCoordinatesFromPlayerXY(angle, 0); + wedgePos.x -= 8 / Mathf.PI * Mathf.Cos(angle * Mathf.PI / 180) - 50 * v.offset * Mathf.Cos(angle * Mathf.PI / 180); + wedgePos.y -= 8 / Mathf.PI * Mathf.Sin(angle * Mathf.PI / 180) - 50 * v.offset * Mathf.Sin(angle * Mathf.PI / 180); + + + v.sprite.transform.position = Vector3.Lerp(normalPos, wedgePos, Time.deltaTime); + + + } + + /// /// Radius sphere est scale/2 /// @@ -110,7 +160,7 @@ public class PlanetManager : MonoBehaviour /// public class Wedge { - public float yoffset = 0; //valeurs entre -1 et 1; -1 étant renfoncé, 0 position normale, et 1 vers l'extérieur + public float offset = 0; //valeurs entre -1 et 1; -1 étant renfoncé, 0 position normale, et 1 vers l'extérieur public float tMin = 0; //theta min et theta max : angle thetat de début et fin du cartier; public float tMax = 0; diff --git a/Assets/Scripts/TimerFunctionsClass.cs b/Assets/Scripts/TimerFunctionsClass.cs new file mode 100644 index 0000000..a95f830 --- /dev/null +++ b/Assets/Scripts/TimerFunctionsClass.cs @@ -0,0 +1,92 @@ + +using UnityEngine; +using System.Collections; + + + +/// +/// +/// +public class TimerFunctionsClass : MonoBehaviour +{ + + public delegate void OnTimerEvent(); //delegate type definition + + private OnTimerEvent CallBackFunction; // the function that is called when the time is up + private float OriginalTimeInterval; // used for resetting + private float TimeLeft; // used for counting down + private bool Active = false; + + protected bool DestroyTimerOnTimeEnds = false; + + public string textTime = ""; + + + public float GetTimeLeft() + { + return TimeLeft; + } + + // setup the timer: how long should the timer wait and which function should it call when the event is triggered + public void SetTimer(float TimeInterval, OnTimerEvent NewCallBackFunction) + { + OriginalTimeInterval = TimeInterval; + TimeLeft = TimeInterval; + CallBackFunction = NewCallBackFunction; + } + + + // actually start the timer: + public void StartTimer() + { + Active = true; + } + + + // I'm not using this, but whatever: + public void StopTimer() + { + Active = false; + } + + + // ohwell + public void ResetTimer() + { + TimeLeft = OriginalTimeInterval; + } + + + public void DestroyTimer() + { + Destroy(this); + } + + + // TimeLeft is decreased by Time.deltaTime every tick, if it hits 0 then the CallBackFunction is called + public void Update() + { + + if (Active) + { + + TimeLeft -= Time.deltaTime; + if (TimeLeft <= 0) + { + CallBackFunction(); + + + //si usage unique + if (DestroyTimerOnTimeEnds) + { + StopTimer(); + DestroyTimer(); + } + + } + } + } + + + +} diff --git a/Assets/Scripts/TimerFunctionsClass.cs.meta b/Assets/Scripts/TimerFunctionsClass.cs.meta new file mode 100644 index 0000000..e2b2cee --- /dev/null +++ b/Assets/Scripts/TimerFunctionsClass.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ba34cb3424d86984e882e8e209276792 +timeCreated: 1460097512 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/testRotate.cs b/Assets/Scripts/testRotate.cs index 6c8155f..4560318 100644 --- a/Assets/Scripts/testRotate.cs +++ b/Assets/Scripts/testRotate.cs @@ -4,15 +4,52 @@ using System.Collections; public class testRotate : MonoBehaviour { + + + public float fireRate = 1.0f; + private float lastShot = 0.0f; + + + void Update() + { + if(Input.GetKeyDown("space") || Input.GetKey("s")) + { + + Fire(); + } + } + + private void Fire() + { + if (Time.time > fireRate + lastShot) + { + lastShot = Time.time; + + var speed = 13.2f; + var theta = Time.realtimeSinceStartup * speed % 360.0f; + + + + var pmgr = FindObjectOfType(); + pmgr.PushWedge(theta); + + + + var index = pmgr.GetWedgeIndex(theta); + + + } + } + + // Use this for initialization void Start () { } - // Update is called once per frame - void Update () { - - } + + + /// /// Juste pour tester le mouvement du player autour du cercle. @@ -21,18 +58,18 @@ public class testRotate : MonoBehaviour { /// void FixedUpdate() { - var speed = 13.2; - var theta = Time.realtimeSinceStartup * speed % 360.0; // Position X du player = angle theta - var r = 5.0; //sphereradius + var speed = 13.2f; + var theta = Time.realtimeSinceStartup * speed % 360.0f; // Position X du player = angle theta + var r = 4.5f; //sphereradius // XY coordinates - double x = r * Math.Cos(theta * Math.PI / 180); - double y = r * Math.Sin(theta * Math.PI / 180); // + y0 du player + var x = r * Mathf.Cos(theta * Mathf.PI / 180); + var y = r * Mathf.Sin(theta * Mathf.PI / 180); // + y0 du player var player = GameObject.Find("CubePlayer").gameObject; - player.transform.position = Vector3.Lerp(player.transform.position, new Vector3( (float)x, (float)y, 0 ), Time.deltaTime); + player.transform.position = Vector3.Lerp(player.transform.position, new Vector3(x, y, 0 ), Time.deltaTime); } } From 142e369543c0dbe209f416ffd747ee8f1ba6bad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Fri, 8 Apr 2016 03:33:59 -0400 Subject: [PATCH 5/5] fixed planet scene --- Assets/Prefabs/WedgePrefab.prefab | Bin 5444 -> 5444 bytes Assets/_Scenes/planet.unity | Bin 19752 -> 18384 bytes ProjectSettings/ProjectSettings.asset | Bin 37833 -> 37861 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Assets/Prefabs/WedgePrefab.prefab b/Assets/Prefabs/WedgePrefab.prefab index 2aed2fd7fdb51a8cb05acde4d81ecd35b2ffb94b..b3ff5aa6d2c937966ad54a5f69e7d1abb027379d 100644 GIT binary patch delta 18 ZcmX@2bwq2!KM}SDdj^IE`^hY#4gf_)1`hxL delta 18 WcmX@2bwq2!KM^(tFqq6D>Hq*a)C7?L diff --git a/Assets/_Scenes/planet.unity b/Assets/_Scenes/planet.unity index 10b01e1e2e2c6c347448d05feac2051773645277..bc6ecc918efa7138a42773d6d5db5c18e36ddd39 100644 GIT binary patch delta 664 zcmYLGO=wd=5T1R>OJa-~Ta(&6qe&5s6=FhDB&c~WZGPGZO`{-+m_u4${3)UhvD%YC z5PK052Ly95RSK;jZFv{*q6Z1mQv?s%L-AClco6g;XpFN-!G&*U_SYj=-GJ91U9lN597b0**yKqrU=e1mROs`pQ95K+3^^=jUjGe`d z+~xjm09fErT4*-OfU9OZz-<-Fvc&56LY4#&aYc5y10q0~u6DK1mhat^zeA=-EP!s> ze_>dW+%sl?G%2GkwAIH}@9>J@BTkaej`wN5g$s)0e?tYv=%zsv$x{RPk~h_sEdWDw z=F`dp{n?1yqrKaBZ$3{iawV8C98K6)w27YeOf~s*s`h)s_+tjAqmRpq2|ETJGEtu! zc-9&^FshfAY$C|Ma?pv_V@pg#Z~PjT50o8(E)gflYS=AvF<$nr9s+<4- delta 1829 zcmbW1U2GIp6vxk|)M#SLi4jdqAS8+pB$$1WM_w@U0vMtpJ`j1*CX(QjLeTMlW`@bEAy(P!nVI{$ z=i`4ruY9OZf2tlM8d)HkOcT)xqEWnvwq>?tww8zJFW>joYJj^<+h9%o8N8ZRhi~d@udadHuCI0%G3f3fQ5 z&y}0+U%R7zn;(SxMVJP=uJH+DvnPd6&=;f{Fmzths3ES)VaNg|mZIxKjjj0BBfG~l zDQe`v+F=GP@b32%r$^7FdR?%vjXvLaDFp6u-L!eJf(70KOkZ|g80O7P?`dtx50 z$46+(C?Ae_s%4bDF^`tRi`GN7S}02o=3RyeMK%{*gQYIYSh>R@5DP#~Jm)x*yKr(Ei7UU;fQsR{mWdyo2s7q**y$8jV!Vqn-{ zFyF_E%x{+CA|d*g2ePL2ht4~)YgC$F&YFGa4Wb!zg(o$1f8xitcZqwN=d-4|#b@wr z@I`oE!5NfuEi*R|CC^6Q?W}U9s&OBl=lIE-nIW9Oo$$PiUE~B;3DK|bSw$ckN8eA_ zC35*Jq)<1-<=h6<#-HWJ_;!x@*p6dLZ$A3;DaH9weW`*k{$%i(XAg66q^NX0Ib!pz zu{590x5H;WAJ6wUKN#&#DRH_AhquOT-n7%;BZV!TF68-ap`B}maah`uTSKmzcSq%3 zA(F#Z*)w5Jmkt)~`mF4N%;DysI4=zR v4@&P_@Ii&X77cLd-=l+AumJ$pc@`=F delta 50 zcmaF5oay9pCJqLME;9y($tO2*=ydT^axyS9GJx>^|C1kfOKgtl+Q2mVLpRT6gWj!d E0J*dh#Q*>R