Conjure/PixelSphinx
6
0
Fork 0
mirror of https://github.com/ConjureETS/PixelSphinx.git synced 2026-03-25 19:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapted movement - Started implementation

Browse Source
This commit is contained in:
Sophie 2016-04-09 11:01:15 -04:00
parent 00a6812a96
commit 5d17f3575a
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Assets/Scripts/Astronaut.cs
View File

@ -122,6 +122,7 @@ public class Astronaut : MonoBehaviour {
private float Repeat(float num, float limit) private float Repeat(float num, float limit)
{ {
//This is a modulus
return Mathf.Repeat(num + limit, limit); return Mathf.Repeat(num + limit, limit);
} }
@ -196,12 +197,30 @@ public class Astronaut : MonoBehaviour {
public void Move(float x, float y) public void Move(float x, float y)
{ {
Vector3 pos = transform.position;
pos.z = 0;
float playerX, playerY;
PlanetUtilities.Spheric2Cartesian(theta, height, out playerX, out playerY);
Debug.Log(theta);
//Vector3 v =
Vector3 dirV = Vector3.Cross(pos, Vector3.up).normalized;
float proj = Vector3.Dot(new Vector3(x, y, 0), dirV);
//Debug.Log(proj / Time.deltaTime);
Debug.Log(dirV);
//float move = proj / Time.deltaTime; //Mathf.Abs(proj) < 0.1 ? 0 : proj;
float move = x;
if (State >= AstronautState.Ejecting ) if (State >= AstronautState.Ejecting )
return; return;
if (State < AstronautState.Jumping) if (State < AstronautState.Jumping)
{ {
if (Mathf.Approximately(x, 0)) if (Mathf.Approximately(move, 0))
{ {
State = AstronautState.Idle; State = AstronautState.Idle;
} }
@ -214,9 +233,9 @@ public class Astronaut : MonoBehaviour {
if (State < AstronautState.Dashing) if (State < AstronautState.Dashing)
{ {
if (-0.2 < x && x < 0.2) return; if (-0.2 < move && move < 0.2) return;
//Debug.Log(x + " " + Speed + " " + height); //Debug.Log(x + " " + Speed + " " + height);
float movement = PlanetUtilities.GetDisplacementAngle(Speed * -x, height) * Time.deltaTime; float movement = PlanetUtilities.GetDisplacementAngle(Speed * -move, height) * Time.deltaTime;
//Debug.Log("Moving! - " + height); //Debug.Log("Moving! - " + height);
//Debug.Log("Daaa - " + movement); //Debug.Log("Daaa - " + movement);
float newTheta = (360 + theta + movement) % 360; // angle positif float newTheta = (360 + theta + movement) % 360; // angle positif