From 6199b0e29f798cf7c284709cf9a1c36ccb19ca19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Fri, 8 Apr 2016 01:02:29 -0400 Subject: [PATCH] =?UTF-8?q?PlanetManager=20:=20pas=20commit=C3=A9=20bonne?= =?UTF-8?q?=20version=20apparamment.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/file.txt.meta | 8 +++++++ Assets/Scripts/PlanetManager.cs | 33 +++++++++++++------------- Assets/Scripts/PlanetManager.cs.meta | 12 ++++++++++ Assets/Scripts/file.txt.meta | 8 +++++++ Assets/Scripts/testRotate.cs.meta | 12 ++++++++++ Assets/Sounds/file.txt.meta | 8 +++++++ Assets/_Scenes/file.txt.meta | 8 +++++++ Assets/_Scenes/planet.unity.meta | 8 +++++++ ProjectSettings/ProjectSettings.asset | Bin 36701 -> 37833 bytes 9 files changed, 80 insertions(+), 17 deletions(-) create mode 100644 Assets/Prefabs/file.txt.meta create mode 100644 Assets/Scripts/PlanetManager.cs.meta create mode 100644 Assets/Scripts/file.txt.meta create mode 100644 Assets/Scripts/testRotate.cs.meta create mode 100644 Assets/Sounds/file.txt.meta create mode 100644 Assets/_Scenes/file.txt.meta create mode 100644 Assets/_Scenes/planet.unity.meta diff --git a/Assets/Prefabs/file.txt.meta b/Assets/Prefabs/file.txt.meta new file mode 100644 index 0000000..5db0151 --- /dev/null +++ b/Assets/Prefabs/file.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afc3ba2bd5b70194e9fb05d80712eecb +timeCreated: 1460091048 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlanetManager.cs b/Assets/Scripts/PlanetManager.cs index a62a2a4..155c11b 100644 --- a/Assets/Scripts/PlanetManager.cs +++ b/Assets/Scripts/PlanetManager.cs @@ -1,5 +1,7 @@ -using UnityEngine; +using System; +using UnityEngine; using System.Collections; +using System.Collections.Generic; public class PlanetManager : MonoBehaviour { @@ -7,19 +9,17 @@ public class PlanetManager : MonoBehaviour public int NbCartiers = 10; public float TailleCartiersEnDegres = 0; //radian -> valeurs 0 a 360 - var wedges = new List(); + public List wedges = new List(); // Use this for initialization void Start () { - TailleCartiersEnRadiants = 360.0 / NbCartiers; - - float debutAngleTheta = 0.0; - + TailleCartiersEnDegres = 360.0f / NbCartiers; + for(int i = 0; i < NbCartiers; i++) { - debutAngleTheta = i*TailleCartiersEnRadiants; - wedges.Add(new wedges(){tMin = debutAngleTheta, tMax = debutAngleTheta + TailleCartiersEnRadiants}); + float debutAngleTheta = i* TailleCartiersEnDegres; + wedges.Add(new Wedge(){tMin = debutAngleTheta, tMax = debutAngleTheta + TailleCartiersEnDegres }); } } @@ -33,18 +33,17 @@ public class PlanetManager : MonoBehaviour public float GetPlanetRadius() { - + return 5.0f; } public Vector3 GetPlanetCoordinatesFromPlayerXY(float playerLocalX, float playerLocalY) { var theta = playerLocalX; - double x = r * Math.Cos(theta * Math.PI / 180); - double y = r * Math.Sin(theta * Math.PI / 180) + playerLocalY; + var x = GetPlanetRadius() * Math.Cos(theta * Math.PI / 180); + var y = GetPlanetRadius() * Math.Sin(theta * Math.PI / 180) + playerLocalY; - - return new Vector3(x,y,0); + return new Vector3((float)x, (float)y, 0); } @@ -54,7 +53,7 @@ public class PlanetManager : MonoBehaviour /// public int GetWedgeIndex(float thetaPlayerX) { - return Math.Floor(thetaPlayerX / TailleCartiersEnRadiants); + return (int)Math.Floor(thetaPlayerX / TailleCartiersEnDegres); } /// @@ -84,9 +83,9 @@ public class PlanetManager : MonoBehaviour /// public class Wedge { - float yoffset = 0; //valeurs entre -1 et 1; -1 étant renfoncé, 0 position normale, et 1 vers l'extérieur - float tMin = 0; //theta min et theta max : angle thetat de début et fin du cartier; - float tMax = 0; + public float yoffset = 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/PlanetManager.cs.meta b/Assets/Scripts/PlanetManager.cs.meta new file mode 100644 index 0000000..a796795 --- /dev/null +++ b/Assets/Scripts/PlanetManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 43d953650863ce04d8918939e0248654 +timeCreated: 1460091046 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/file.txt.meta b/Assets/Scripts/file.txt.meta new file mode 100644 index 0000000..1390611 --- /dev/null +++ b/Assets/Scripts/file.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6681384214c3a3e4a90c112542387b03 +timeCreated: 1460091047 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/testRotate.cs.meta b/Assets/Scripts/testRotate.cs.meta new file mode 100644 index 0000000..0cd53ad --- /dev/null +++ b/Assets/Scripts/testRotate.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ac56b6226ed50a742a676cbfae403f88 +timeCreated: 1460091047 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/file.txt.meta b/Assets/Sounds/file.txt.meta new file mode 100644 index 0000000..2fb6a85 --- /dev/null +++ b/Assets/Sounds/file.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b2a8ad68d415d446ac7ecf9db5491bc +timeCreated: 1460091047 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/file.txt.meta b/Assets/_Scenes/file.txt.meta new file mode 100644 index 0000000..cecd3cf --- /dev/null +++ b/Assets/_Scenes/file.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e82e3d7221e4604f8b5b5ce23f8eccb +timeCreated: 1460091048 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/planet.unity.meta b/Assets/_Scenes/planet.unity.meta new file mode 100644 index 0000000..9d5ff4f --- /dev/null +++ b/Assets/_Scenes/planet.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5f60472012ea55409d7eb4b1ecaec89 +timeCreated: 1460091041 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 01791a2cc9c4a14ffc3682e55c8f144c152a5524..92dfed61624114e48f1a801bfdfa33a6182e80f0 100644 GIT binary patch delta 1901 zcmZ{lO-vI(6vt;N1c@+0@_3k@v`iWu-fi!cH4xa$(Bno zgoK#A=*4*R;E8baWMV?XU5;wv)f3T!H+^q+cG}&x)9hyV_h$b8H}6f`Z|@rRKQy!v zvN=YGy-x^fh3AFWZQ<_H*Tmq)uhi4`e;&Sx%^ry+8wvRt-EZyE0h@EyiG1N@82Epi+KN!PeNM2bHk@DD~8@*?sEVFaG=Lf*}J z$Vs#h)*$M^8w`Pj$UR`s*!*5TztN`?1}-EmT+rkbI)MR4sEOPM5fsArKF$R)2ka0M zMc$7FFtBpSTjDN{1b9E=1C<>7i{mUXh=HUlgq27E#~q(UUPSJ%M3i%XC1S{71S=8e z^UIY;p}`OYgd{HTS7I2sBjm5dDb59_)QfTZx3p+s)peHhS?=Y}`5d?M=X{<^hI~c8 zz`1KxWcn9T|1+k?^)2UkT&iO*!iD?>qnx`2ADO{rG${HE9Q`XeKZ)GGfvb(qQE~&7 z$7U>G@QE2*t79-;$KX2G@oymEaSL+77VI&D8+8nB)-kx{3Bk@PH!#7ud%h1qA5X<3 z>cd#bhy`k->8>IV#llmnY-oy{NTel0(Q}HrJS|GksVduBrRbBpbJYRzh%O-)^RlAN zXj$E$rm1LZN;9%z&WqAjiGrM_rt`Y48JuTnRx=7|WsTZLw7DEnm1QbFpr)2LB>SK=JkNw^)^zql)hT1y^w#8PR?mnz zN<>*!FflPRn;D(ab({pdsiyYd(nK#-&KrdmLe}AB9lqxF;j7-=m5rCpr<;L<;i_9n zi1ouS{8lMq^}sXBGFWdCDaY!R7Jf9#bE*p5UXGQE46M)P*mk>fJ8I!EaCXJEhVK=+ zVz3Pz?s{x_Wh*>g@~ delta 733 zcmX@Poayd7CIJS9b~grw{#XVE27VwrVWNPfSUvBrUW?}%jgMXmhkV^xctwYWf#HJE zM*E_~dQT+=1|W}tA4E7XFfan4ATvWlDp34C5D0+88$jYrjD|oK2!q50;o{5;_kd#3 zKs_KKArJusj10^S9zd}ysCr?zdKP4J>i>%XB^Vt*8dy;b5(SBa4Ps>o1R4S|2*ekI zi!(C#0L99I4h4yegDh|Wu^}F4g?c~&Bz^!Sj_LtPka$BqNCMRdQXmN+K=*+(SOZ8L z#Rvaofa2IZAPW))n}g~BIk-3@gGW6uh-N}vDi5~+)ujq>3s4=Z2selsC4`jV;y??4 z=C6R7uZ+cfH&9%v;IKdyZV;*kYH)Fg1zVIRe@>3#1;xf;pj{wOYj3tnGgg}XXQIsH z{z$ZSuoziOmsRHSCN`lfO<>p4>A@ NXR^X%k;yFGq5xqZlQ94Q