gjcampbell/Magical-Jumping-Bean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rushed attempt at siwtching the physics and speed from frame rate dependent to frame rate independent

Browse Source
This commit is contained in:
Gregory Campbell
2020-02-10 20:38:24 -05:00
parent 3479ada7b8
commit a8b31cdc0e
6 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Floor Level.unity
+1 -1
View File
@@ -2568,7 +2568,7 @@ MonoBehaviour:
lives: 3
maxSpeed: 25
acceleration: 0.5
friction: 1
friction: 1.25
jumpHeight: 20
gravity: 5
rotationSpeed: 20
Assets/Scenes/Hub World.unity
+1 -1
View File
@@ -4156,7 +4156,7 @@ MonoBehaviour:
lives: 3
maxSpeed: 25
acceleration: 0.5
friction: 1
friction: 1.25
jumpHeight: 20
gravity: 5
rotationSpeed: 20
Assets/Scenes/Infinity Runner.unity
+1 -1
View File
@@ -2914,7 +2914,7 @@ MonoBehaviour:
lives: 3
maxSpeed: 25
acceleration: 0.5
friction: 1
friction: 1.25
jumpHeight: 20
gravity: 5
rotationSpeed: 20
Assets/Scenes/Waypoint Race.unity
+1 -1
View File
@@ -2663,7 +2663,7 @@ MonoBehaviour:
lives: 3
maxSpeed: 25
acceleration: 0.5
friction: 1
friction: 1.25
jumpHeight: 20
gravity: 5
rotationSpeed: 20
Assets/Scripts/MovingBlock.cs
+1 -1
View File
@@ -59,7 +59,7 @@ public class MovingBlock : MonoBehaviour
}
// Update is called once per frame
void Update()
void FixedUpdate()
{
if(xaxis)
Assets/Scripts/PlayerController.cs
+74 -71
View File
@@ -74,6 +74,8 @@ public class PlayerController : MonoBehaviour
mr = playerSkin.GetComponent<MeshRenderer>();
mr.material = characterSkins[characterSelect];
Application.targetFrameRate = 45;
}
void OnControllerColliderHit(ControllerColliderHit hit)
@@ -156,6 +158,48 @@ public class PlayerController : MonoBehaviour
moveDirection = Vector3.ClampMagnitude(moveDirection, 1.0f);
moveDirection.y = yStore;
moveDirection.y += Physics.gravity.y * gravity * Time.deltaTime;
if (jump >= 2)
{
if(maxSpeed > maxSpeedStore/1.5f)
{
maxSpeed -= acceleration;
}
}
if (characterController.collisionFlags == CollisionFlags.None)
{
wallRunning = false;
wall = 0;
}
if (wallRunning)
{
if(maxSpeed < maxSpeedStore*1.5f)
{
maxSpeed += acceleration;
}
jump = 0;
if(wall == 1)
{
wallRunTime = Time.time;
}
if(wallRunTime + oneSec < Time.time)
{
moveDirection.y += Physics.gravity.y * (gravity/8) * Time.deltaTime;
} else {
moveDirection.y = 0.0f;
}
}
if(transform.position.y < -20.0f)
{
@@ -172,16 +216,9 @@ public class PlayerController : MonoBehaviour
}
if (jump >= 2)
{
if(maxSpeed > maxSpeedStore/1.5f)
{
maxSpeed -= acceleration;
}
}
if (characterController.isGrounded)
{
diving = false;
dive = 0;
jump = 0;
@@ -226,7 +263,7 @@ public class PlayerController : MonoBehaviour
if(maxSpeed < maxSpeedStore*2)
{
maxSpeed += acceleration*2;
maxSpeed += acceleration*5;
}
if(Input.GetButton("Jump") && slideTime + quarterSec >= Time.time)
@@ -248,11 +285,14 @@ public class PlayerController : MonoBehaviour
characterController.height = controllerHeight;
capsule.height = capsuleHeight;
transform.localScale = new Vector3(transform.localScale.x, transformHeight, transform.localScale.z);
sliding = false;
}
} else {
slideTime = Time.time;
sliding = false;
if((Input.GetButton("Crouch") || Input.GetAxis("Crouch") == 1.0f) && !PauseMenu.GameIsPaused)
{
@@ -281,61 +321,22 @@ public class PlayerController : MonoBehaviour
}
if(Input.GetButtonDown("Character Swap"))
{
characterSelect = Random.Range(0, characterSkins.Length);
mr.material = characterSkins[characterSelect];
}
if (Input.GetButtonDown("Jump") && jump <= 1)
{
moveDirection.y = jumpHeight;
jump++;
jumpNoise.Play();
if(wallRunning) wallRunning = false;
}
if (characterController.collisionFlags == CollisionFlags.None)
if(Input.GetButtonDown("Character Swap"))
{
wallRunning = false;
wall = 0;
characterSelect = Random.Range(0, characterSkins.Length);
mr.material = characterSkins[characterSelect];
}
moveDirection.y += Physics.gravity.y * gravity * Time.deltaTime;
if (wallRunning)
{
if(maxSpeed < maxSpeedStore*1.5f)
{
maxSpeed += acceleration;
}
jump = 0;
if(wall == 1)
{
wallRunTime = Time.time;
}
if(wallRunTime + oneSec < Time.time)
{
moveDirection.y += Physics.gravity.y * (gravity/8) * Time.deltaTime;
} else {
moveDirection.y = 0.0f;
}
if (Input.GetButtonDown("Jump") && jump <= 1)
{
moveDirection.y = jumpHeight;
wallRunning = false;
}
}
velocity.x += moveDirection.x;
velocity.z += moveDirection.z;
if((Input.GetAxis("Horizontal") == 0 && Input.GetAxis("Vertical") == 0) || (Input.GetButton("Stop") || Input.GetAxis("Stop") == 1.0f)){
//Remove or "lower" friction to add an 'ice' effect
@@ -345,6 +346,25 @@ public class PlayerController : MonoBehaviour
}
//Debug.Log(transform.position);
Debug.Log(velocity.x + "," + velocity.z);
//Move the player in different directions based on camera look direction
if(Input.GetAxis("Horizontal") != 0 || Input.GetAxis("Vertical") != 0)
{
transform.rotation = Quaternion.Euler(0f, pivot.rotation.eulerAngles.y, 0f);
Quaternion newRotation = Quaternion.LookRotation(new Vector3(moveDirection.x, 0f, moveDirection.z));
playerModel.transform.rotation = Quaternion.Slerp(playerModel.transform.rotation, newRotation, rotationSpeed * Time.deltaTime);
}
}
void FixedUpdate()
{
velocity.x += moveDirection.x;
velocity.z += moveDirection.z;
//Remove or "lower" friction to add an 'ice' effect
velocity.x = Mathf.SmoothDamp(velocity.x, 0.0f, ref xVelocity, friction);
velocity.z = Mathf.SmoothDamp(velocity.z, 0.0f, ref zVelocity, friction);
@@ -358,15 +378,6 @@ public class PlayerController : MonoBehaviour
velocity.y = moveDirection.y;
if(moveDirection.y <= -5 && Mathf.Abs(velocity.x) <= 1.5f && Mathf.Abs(velocity.z) <= 1.5f
&& (Input.GetAxis("Horizontal") != 0 && Input.GetAxis("Vertical") != 0))
{
velocity.x = velocity.x * Mathf.Abs(moveDirection.y);
velocity.z = velocity.z * Mathf.Abs(moveDirection.y);
}
Debug.Log(transform.position);
// Move the controller
if((finished == false || respawn == false) && respawnTime + tenthSec < Time.time)
{
@@ -374,13 +385,5 @@ public class PlayerController : MonoBehaviour
respawn = false;
}
//Move the player in different directions based on camera look direction
if(Input.GetAxis("Horizontal") != 0 || Input.GetAxis("Vertical") != 0)
{
transform.rotation = Quaternion.Euler(0f, pivot.rotation.eulerAngles.y, 0f);
Quaternion newRotation = Quaternion.LookRotation(new Vector3(moveDirection.x, 0f, moveDirection.z));
playerModel.transform.rotation = Quaternion.Slerp(playerModel.transform.rotation, newRotation, rotationSpeed * Time.deltaTime);
}
}
}