diff --git a/Assets/ControllerMapper.asset b/Assets/ControllerMapper.asset index 556769e..dae1f5f 100644 Binary files a/Assets/ControllerMapper.asset and b/Assets/ControllerMapper.asset differ diff --git a/Assets/Prefabs/Asteroid.prefab b/Assets/Prefabs/Asteroid.prefab index f21dc6f..d28abf7 100644 Binary files a/Assets/Prefabs/Asteroid.prefab and b/Assets/Prefabs/Asteroid.prefab differ diff --git a/Assets/Prefabs/Astronaut.prefab b/Assets/Prefabs/Astronaut.prefab index 565df51..f6bf33d 100644 Binary files a/Assets/Prefabs/Astronaut.prefab and b/Assets/Prefabs/Astronaut.prefab differ diff --git a/Assets/Prefabs/WedgePrefab.prefab b/Assets/Prefabs/WedgePrefab.prefab index b3ff5aa..58d7579 100644 Binary files a/Assets/Prefabs/WedgePrefab.prefab and b/Assets/Prefabs/WedgePrefab.prefab differ diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs index b5075d1..5aa35c7 100644 --- a/Assets/Scripts/Astronaut.cs +++ b/Assets/Scripts/Astronaut.cs @@ -40,10 +40,10 @@ public class Astronaut : MonoBehaviour { SpriteDash.SetActive(false); } - if (_state == AstronautState.Walking) + /*if (_state == AstronautState.Walking) { StartCoroutine(WalkingStance()); - } + }*/ } } @@ -51,7 +51,6 @@ public class Astronaut : MonoBehaviour { private float height = 0; private float angle = 0; private float walkTime = 0; - private int nextStep = 1; // Use this for initialization @@ -62,6 +61,15 @@ public class Astronaut : MonoBehaviour { // Update is called once per frame void Update () { + /*if (State == AstronautState.Walking) + { + walkTime += Time.deltaTime / StepTime; + Vector3 rotation = transform.rotation.eulerAngles; + rotation.z = Mathf.Sin(walkTime * Mathf.PI)*50; + transform.rotation = Quaternion.Euler(rotation); + Debug.Log(rotation.z); + }*/ + /* switch (State) { @@ -97,8 +105,8 @@ public class Astronaut : MonoBehaviour { } else { - Debug.Log("walking"); State = AstronautState.Walking; + walkTime = 0f; } } } @@ -121,7 +129,7 @@ public class Astronaut : MonoBehaviour { Debug.Log("Clicked the button with an image"); } - IEnumerator WalkingStance() + /*IEnumerator WalkingStance() { Debug.Log("walking stance"); walkTime += Time.deltaTime / StepTime; @@ -133,10 +141,10 @@ public class Astronaut : MonoBehaviour { yield return null; } - /*walkTime = 0f; + walkTime = 0f; if(State == AstronautState.Walking) { StartCoroutine("WalkingStance"); - }*/ - } + } + }*/ } diff --git a/Assets/Scripts/PlanetUtilities.cs b/Assets/Scripts/PlanetUtilities.cs new file mode 100644 index 0000000..2119588 --- /dev/null +++ b/Assets/Scripts/PlanetUtilities.cs @@ -0,0 +1,16 @@ +using UnityEngine; +using System.Collections; + +public class PlanetUtilities { + + public static void Spheric2Cartesian(float theta, float radius, out float x, out float y) + { + x = -radius * Mathf.Sin(Mathf.Deg2Rad * theta); + y = radius * Mathf.Cos(Mathf.Deg2Rad * theta); + } + + public static float GetDisplacementAngle(float delta, float radius) + { + return Mathf.Rad2Deg * radius / delta; + } +} diff --git a/Assets/Scripts/PlanetUtilities.cs.meta b/Assets/Scripts/PlanetUtilities.cs.meta new file mode 100644 index 0000000..5e5bdc7 --- /dev/null +++ b/Assets/Scripts/PlanetUtilities.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8f6095fa026be7947a9f7d253ee7e848 +timeCreated: 1460114132 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Test/FloorTest.mat b/Assets/Test/FloorTest.mat index 3441c4f..38941e4 100644 Binary files a/Assets/Test/FloorTest.mat and b/Assets/Test/FloorTest.mat differ diff --git a/Assets/Test/SR_TestInput.unity b/Assets/Test/SR_TestInput.unity index 278577f..4277d06 100644 Binary files a/Assets/Test/SR_TestInput.unity and b/Assets/Test/SR_TestInput.unity differ diff --git a/Assets/_Scenes/planet.unity b/Assets/_Scenes/planet.unity index bc6ecc9..db41455 100644 Binary files a/Assets/_Scenes/planet.unity and b/Assets/_Scenes/planet.unity differ diff --git a/Assets/_Scenes/sophieScene.unity b/Assets/_Scenes/sophieScene.unity index 6729570..9480a93 100644 Binary files a/Assets/_Scenes/sophieScene.unity and b/Assets/_Scenes/sophieScene.unity differ diff --git a/Assets/m_asteroid.mat b/Assets/m_asteroid.mat index 11969cb..6a10223 100644 Binary files a/Assets/m_asteroid.mat and b/Assets/m_asteroid.mat differ diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index 279b1b5..faf901c 100644 Binary files a/ProjectSettings/AudioManager.asset and b/ProjectSettings/AudioManager.asset differ diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset index 78deb53..e7886b2 100644 Binary files a/ProjectSettings/ClusterInputManager.asset and b/ProjectSettings/ClusterInputManager.asset differ diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index c018563..3534236 100644 Binary files a/ProjectSettings/DynamicsManager.asset and b/ProjectSettings/DynamicsManager.asset differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 4ddc1e6..6dc24f7 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 62c1cc2..ff0f189 100644 Binary files a/ProjectSettings/EditorSettings.asset and b/ProjectSettings/EditorSettings.asset differ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4ab962d..5a96ca8 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index cb97f77..17c8f53 100644 Binary files a/ProjectSettings/InputManager.asset and b/ProjectSettings/InputManager.asset differ diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index ed1316c..a04f35c 100644 Binary files a/ProjectSettings/NavMeshAreas.asset and b/ProjectSettings/NavMeshAreas.asset differ diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset index fe3da54..5dc6a83 100644 Binary files a/ProjectSettings/NetworkManager.asset and b/ProjectSettings/NetworkManager.asset differ diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 853a8a1..7e9e664 100644 Binary files a/ProjectSettings/Physics2DSettings.asset and b/ProjectSettings/Physics2DSettings.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 64d079b..a9642ef 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 674f6a2..90962e5 100644 Binary files a/ProjectSettings/QualitySettings.asset and b/ProjectSettings/QualitySettings.asset differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 9f9baf1..8f98569 100644 Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index c8d2469..a2dc235 100644 Binary files a/ProjectSettings/TimeManager.asset and b/ProjectSettings/TimeManager.asset differ diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset index 39abcdf..224050c 100644 Binary files a/ProjectSettings/UnityAdsSettings.asset and b/ProjectSettings/UnityAdsSettings.asset differ diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 2e7e09c..9b7a578 100644 Binary files a/ProjectSettings/UnityConnectSettings.asset and b/ProjectSettings/UnityConnectSettings.asset differ