charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: PlayerKRB inputs in Update

Browse Source
This commit is contained in:
MrGadget 2024-10-23 16:23:06 -04:00
parent fbab75dfc8
commit 5fbd83279e
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Assets/Mirror/Examples/_Common/Controllers/PlayerControllerKRB/PlayerControllerKRBBase.cs
View File

@ -236,8 +236,6 @@ void Reset()
// Freeze rotation on X and Z axes, but allow rotation on Y axis // Freeze rotation on X and Z axes, but allow rotation on Y axis
rigidBody.constraints = RigidbodyConstraints.FreezeRotation; rigidBody.constraints = RigidbodyConstraints.FreezeRotation;
GetComponent<Rigidbody>().isKinematic = true;
#if UNITY_EDITOR #if UNITY_EDITOR
// For convenience in the examples, we use the GUID of the PlayerControllerUI // For convenience in the examples, we use the GUID of the PlayerControllerUI
// to find the correct prefab in the Mirror/Examples/_Common/Controllers folder. // to find the correct prefab in the Mirror/Examples/_Common/Controllers folder.
@ -312,6 +310,16 @@ public override void OnStopLocalPlayer()
void Update() void Update()
{ {
HandleOptions(); HandleOptions();
float deltaTime = Time.deltaTime;
if (controlOptions.HasFlag(ControlOptions.MouseSteer))
HandleMouseSteer(deltaTime);
else
HandleTurning(deltaTime);
HandleJumping(deltaTime);
HandleMove(deltaTime);
} }
void HandleOptions() void HandleOptions()
@ -343,14 +351,6 @@ void SetCursor(bool locked)
void FixedUpdate() void FixedUpdate()
{ {
float fixedDeltaTime = Time.fixedDeltaTime; float fixedDeltaTime = Time.fixedDeltaTime;
if (controlOptions.HasFlag(ControlOptions.MouseSteer))
HandleMouseSteer(fixedDeltaTime);
else
HandleTurning(fixedDeltaTime);
HandleJumping(fixedDeltaTime);
HandleMove(fixedDeltaTime);
ApplyMove(fixedDeltaTime); ApplyMove(fixedDeltaTime);
// Update ground state // Update ground state
@ -365,7 +365,7 @@ void FixedUpdate()
} }
// Turning works while airborne...feature? // Turning works while airborne...feature?
void HandleTurning(float fixedDeltaTime) void HandleTurning(float deltaTime)
{ {
float targetTurnSpeed = 0f; float targetTurnSpeed = 0f;
@ -378,13 +378,13 @@ void HandleTurning(float fixedDeltaTime)
// If there's turn input or AutoRun is not enabled, adjust turn speed towards target // If there's turn input or AutoRun is not enabled, adjust turn speed towards target
// If no turn input and AutoRun is enabled, maintain the previous turn speed // If no turn input and AutoRun is enabled, maintain the previous turn speed
if (targetTurnSpeed != 0f || !controlOptions.HasFlag(ControlOptions.AutoRun)) if (targetTurnSpeed != 0f || !controlOptions.HasFlag(ControlOptions.AutoRun))
runtimeData.turnSpeed = Mathf.MoveTowards(runtimeData.turnSpeed, targetTurnSpeed, turnAcceleration * maxTurnSpeed * fixedDeltaTime); runtimeData.turnSpeed = Mathf.MoveTowards(runtimeData.turnSpeed, targetTurnSpeed, turnAcceleration * maxTurnSpeed * deltaTime);
//transform.Rotate(0f, runtimeData.turnSpeed * fixedDeltaTime, 0f); //transform.Rotate(0f, runtimeData.turnSpeed * fixedDeltaTime, 0f);
transform.Rotate(transform.up, runtimeData.turnSpeed * fixedDeltaTime, Space.World); transform.Rotate(transform.up, runtimeData.turnSpeed * deltaTime, Space.World);
} }
void HandleMouseSteer(float fixedDeltaTime) void HandleMouseSteer(float deltaTime)
{ {
// Accumulate mouse input over time // Accumulate mouse input over time
runtimeData.mouseInputX += Input.GetAxisRaw("Mouse X") * runtimeData.mouseSensitivity; runtimeData.mouseInputX += Input.GetAxisRaw("Mouse X") * runtimeData.mouseSensitivity;
@ -396,16 +396,16 @@ void HandleMouseSteer(float fixedDeltaTime)
float targetTurnSpeed = runtimeData.mouseInputX * maxTurnSpeed; float targetTurnSpeed = runtimeData.mouseInputX * maxTurnSpeed;
// Use the same acceleration logic as HandleTurning // Use the same acceleration logic as HandleTurning
runtimeData.turnSpeed = Mathf.MoveTowards(runtimeData.turnSpeed, targetTurnSpeed, runtimeData.mouseSensitivity * maxTurnSpeed * fixedDeltaTime); runtimeData.turnSpeed = Mathf.MoveTowards(runtimeData.turnSpeed, targetTurnSpeed, runtimeData.mouseSensitivity * maxTurnSpeed * deltaTime);
// Apply rotation // Apply rotation
//transform.Rotate(0f, runtimeData.turnSpeed * fixedDeltaTime, 0f); //transform.Rotate(0f, runtimeData.turnSpeed * fixedDeltaTime, 0f);
transform.Rotate(transform.up, runtimeData.turnSpeed * fixedDeltaTime, Space.World); transform.Rotate(transform.up, runtimeData.turnSpeed * deltaTime, Space.World);
runtimeData.mouseInputX = Mathf.MoveTowards(runtimeData.mouseInputX, 0f, runtimeData.mouseSensitivity * fixedDeltaTime); runtimeData.mouseInputX = Mathf.MoveTowards(runtimeData.mouseInputX, 0f, runtimeData.mouseSensitivity * deltaTime);
} }
void HandleJumping(float fixedDeltaTime) void HandleJumping(float deltaTime)
{ {
if (runtimeData.groundState != GroundState.Falling && moveKeys.Jump != KeyCode.None && Input.GetKey(moveKeys.Jump)) if (runtimeData.groundState != GroundState.Falling && moveKeys.Jump != KeyCode.None && Input.GetKey(moveKeys.Jump))
{ {
@ -418,7 +418,7 @@ void HandleJumping(float fixedDeltaTime)
{ {
// Increase jumpSpeed using a square root function for a fast start and slow finish // Increase jumpSpeed using a square root function for a fast start and slow finish
float jumpProgress = (runtimeData.jumpSpeed - initialJumpSpeed) / (maxJumpSpeed - initialJumpSpeed); float jumpProgress = (runtimeData.jumpSpeed - initialJumpSpeed) / (maxJumpSpeed - initialJumpSpeed);
runtimeData.jumpSpeed += (jumpAcceleration * Mathf.Sqrt(1 - jumpProgress)) * fixedDeltaTime; runtimeData.jumpSpeed += (jumpAcceleration * Mathf.Sqrt(1 - jumpProgress)) * deltaTime;
} }
if (runtimeData.jumpSpeed >= maxJumpSpeed) if (runtimeData.jumpSpeed >= maxJumpSpeed)
@ -431,14 +431,14 @@ void HandleJumping(float fixedDeltaTime)
{ {
runtimeData.groundState = GroundState.Falling; runtimeData.groundState = GroundState.Falling;
runtimeData.jumpSpeed = Mathf.Min(runtimeData.jumpSpeed, maxJumpSpeed); runtimeData.jumpSpeed = Mathf.Min(runtimeData.jumpSpeed, maxJumpSpeed);
runtimeData.jumpSpeed += Physics.gravity.y * fixedDeltaTime; runtimeData.jumpSpeed += Physics.gravity.y * deltaTime;
} }
else else
// maintain small downward speed for when falling off ledges // maintain small downward speed for when falling off ledges
runtimeData.jumpSpeed = Physics.gravity.y * fixedDeltaTime; runtimeData.jumpSpeed = Physics.gravity.y * deltaTime;
} }
void HandleMove(float fixedDeltaTime) void HandleMove(float deltaTime)
{ {
// Initialize target movement variables // Initialize target movement variables
float targetMoveX = 0f; float targetMoveX = 0f;
@ -453,18 +453,18 @@ void HandleMove(float fixedDeltaTime)
if (targetMoveX == 0f) if (targetMoveX == 0f)
{ {
if (!controlOptions.HasFlag(ControlOptions.AutoRun)) if (!controlOptions.HasFlag(ControlOptions.AutoRun))
runtimeData.horizontal = Mathf.MoveTowards(runtimeData.horizontal, targetMoveX, inputGravity * fixedDeltaTime); runtimeData.horizontal = Mathf.MoveTowards(runtimeData.horizontal, targetMoveX, inputGravity * deltaTime);
} }
else else
runtimeData.horizontal = Mathf.MoveTowards(runtimeData.horizontal, targetMoveX, inputSensitivity * fixedDeltaTime); runtimeData.horizontal = Mathf.MoveTowards(runtimeData.horizontal, targetMoveX, inputSensitivity * deltaTime);
if (targetMoveZ == 0f) if (targetMoveZ == 0f)
{ {
if (!controlOptions.HasFlag(ControlOptions.AutoRun)) if (!controlOptions.HasFlag(ControlOptions.AutoRun))
runtimeData.vertical = Mathf.MoveTowards(runtimeData.vertical, targetMoveZ, inputGravity * fixedDeltaTime); runtimeData.vertical = Mathf.MoveTowards(runtimeData.vertical, targetMoveZ, inputGravity * deltaTime);
} }
else else
runtimeData.vertical = Mathf.MoveTowards(runtimeData.vertical, targetMoveZ, inputSensitivity * fixedDeltaTime); runtimeData.vertical = Mathf.MoveTowards(runtimeData.vertical, targetMoveZ, inputSensitivity * deltaTime);
} }
void ApplyMove(float fixedDeltaTime) void ApplyMove(float fixedDeltaTime)