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

Merged master

Browse Source
This commit is contained in:
MrGadget 2024-10-24 02:31:03 -04:00
commit 9b1a3eb3d2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Mirror/Examples/_Common/Controllers/PlayerControllerRB/PlayerControllerRBBase.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using UnityEngine; using UnityEngine;
using UnityEngine.Serialization; using UnityEngine.Serialization;
@ -335,7 +335,11 @@ void FixedUpdate()
runtimeData.groundState = GroundState.Falling; runtimeData.groundState = GroundState.Falling;
// Update velocity for diagnostics // Update velocity for diagnostics
#if UNITY_6000_0_OR_NEWER
runtimeData.velocity = Vector3Int.FloorToInt(rigidBody.linearVelocity);
#else
runtimeData.velocity = Vector3Int.FloorToInt(rigidBody.velocity); runtimeData.velocity = Vector3Int.FloorToInt(rigidBody.velocity);
#endif
} }
void HandleOptions() void HandleOptions()
@ -479,7 +483,11 @@ void ApplyMove(float fixedDeltaTime)
rigidBody.MovePosition(rigidBody.position + runtimeData.direction * fixedDeltaTime); rigidBody.MovePosition(rigidBody.position + runtimeData.direction * fixedDeltaTime);
// Handle vertical movement (jumping and gravity) // Handle vertical movement (jumping and gravity)
#if UNITY_6000_0_OR_NEWER
Vector3 verticalMovement = rigidBody.linearVelocity;
#else
Vector3 verticalMovement = rigidBody.velocity; Vector3 verticalMovement = rigidBody.velocity;
#endif
verticalMovement.y = runtimeData.jumpSpeed; verticalMovement.y = runtimeData.jumpSpeed;
// Apply gravity // Apply gravity
@ -487,7 +495,11 @@ void ApplyMove(float fixedDeltaTime)
verticalMovement.y += Physics.gravity.y * fixedDeltaTime; verticalMovement.y += Physics.gravity.y * fixedDeltaTime;
// Apply vertical movement // Apply vertical movement
#if UNITY_6000_0_OR_NEWER
rigidBody.linearVelocity = new Vector3(rigidBody.linearVelocity.x, verticalMovement.y, rigidBody.linearVelocity.z);
#else
rigidBody.velocity = new Vector3(rigidBody.velocity.x, verticalMovement.y, rigidBody.velocity.z); rigidBody.velocity = new Vector3(rigidBody.velocity.x, verticalMovement.y, rigidBody.velocity.z);
#endif
} }
} }
} }