GJP/GGJ2022
4
0
Fork 0
Code Issues 4 Pull Requests Projects 1 Releases Wiki Activity

Some edits in playert

Browse Source
This commit is contained in:
haitem 2022-01-29 13:48:05 +01:00
parent db767d7a9d
commit cd6745724d
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Assets/Scripts/PlayerController.cs
View File

@ -23,6 +23,9 @@ public class PlayerController : MonoBehaviour
private bool isGrounded = false; private bool isGrounded = false;
public bool isRunning = false; public bool isRunning = false;
private Vector3 saveRotation;
private Vector3 saveStartRotation;
private Vector3 downDirection; private Vector3 downDirection;
private Vector3 follow = Vector3.zero; private Vector3 follow = Vector3.zero;
@ -84,7 +87,7 @@ public class PlayerController : MonoBehaviour
} }
} }
void OnCollisionStay(Collision other){ void OnCollisionStay(Collision other) {
if (other.gameObject.tag != "platform") return; if (other.gameObject.tag != "platform") return;
PlatformManager platform = other.gameObject.GetComponent<PlatformManager>(); PlatformManager platform = other.gameObject.GetComponent<PlatformManager>();
if (platform == null) if (platform == null)
@ -101,18 +104,19 @@ public class PlayerController : MonoBehaviour
|| other.GetContact(0).normal == -other.transform.forward || other.GetContact(0).normal == -other.transform.forward
|| ( || (
other.GetContact(0).normal != -other.transform.up other.GetContact(0).normal != -other.transform.up
&& other.GetContact(0).normal != other.transform.up && other.GetContact(0).normal != other.transform.up
&& other.GetContact(0).normal != -other.transform.right && other.GetContact(0).normal != -other.transform.right
&& other.GetContact(0).normal != other.transform.right && other.GetContact(0).normal != other.transform.right
) )
) )
{ {
return; return;
} }
// if (platform.type == PlatformManager.PlatformType.SpeedUp) // if (platform.type == PlatformManager.PlatformType.SpeedUp)
// { // {
angle = Mathf.Atan2(Vector3.Magnitude(axis), Vector3.Dot(-transform.up, -other.GetContact(0).normal)); angle = Mathf.Atan2(Vector3.Magnitude(axis), Vector3.Dot(-transform.up, -other.GetContact(0).normal));
transform.RotateAround(axis, angle); transform.Rotate(axis * angle * 100.0f * Time.deltaTime);
//transform.RotateAround(axis, angle);
// } // }
// TODO: Handle other PlatformTypes // TODO: Handle other PlatformTypes
Physics.gravity = -other.GetContact(0).normal * 9.81f; Physics.gravity = -other.GetContact(0).normal * 9.81f;
@ -124,6 +128,7 @@ public class PlayerController : MonoBehaviour
isGrounded = true; isGrounded = true;
if (other.gameObject.tag == "platform") if (other.gameObject.tag == "platform")
{ {
if (other.GetContact(0).normal == other.transform.forward if (other.GetContact(0).normal == other.transform.forward
|| other.GetContact(0).normal == -other.transform.forward || other.GetContact(0).normal == -other.transform.forward
|| ( || (
@ -143,7 +148,8 @@ public class PlayerController : MonoBehaviour
if (axis != Vector3.zero) if (axis != Vector3.zero)
{ {
angle = Mathf.Atan2(Vector3.Magnitude(axis), Vector3.Dot(-transform.up, -other.GetContact(0).normal)); angle = Mathf.Atan2(Vector3.Magnitude(axis), Vector3.Dot(-transform.up, -other.GetContact(0).normal));
transform.RotateAround(axis, angle); transform.Rotate(axis * angle * 100.0f * Time.deltaTime);
//transform.RotateAround(axis, angle);
} }
Vector3 gDirection; Vector3 gDirection;