celisej567/UnitySourceMovement
1
0
Fork 0
mirror of https://github.com/celisej567/UnitySourceMovement.git synced 2026-01-05 10:09:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
Olezen
2019-08-02 17:18:15 +02:00
committed by GitHub
parent 76f9be0933
commit 4ee942e09d
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Modified fragsurf/Movement/SurfController.cs
View File

@@ -74,9 +74,10 @@ namespace Fragsurf.Movement {
speed = _surfer.moveData.velocity.magnitude; speed = _surfer.moveData.velocity.magnitude;
_surfer.moveData.velocity.y = yVel; _surfer.moveData.velocity.y = yVel;
float maxDistPerFrame = 1f; float maxDistPerFrame = 0.05f;
Vector3 velocityThisFrame = _surfer.moveData.velocity * _deltaTime; Vector3 velocityThisFrame = _surfer.moveData.velocity * _deltaTime;
float velocityDistLeft = velocityThisFrame.magnitude; float velocityDist = velocityThisFrame.magnitude;
float velocityDistLeft = velocityDist;
float initialVel = velocityDistLeft; float initialVel = velocityDistLeft;
while (velocityDistLeft > 0f) { while (velocityDistLeft > 0f) {
@@ -88,7 +89,7 @@ namespace Fragsurf.Movement {
_surfer.moveData.origin += velThisLoop; _surfer.moveData.origin += velThisLoop;
// don't penetrate walls // don't penetrate walls
SurfPhysics.ResolveCollisions (_surfer.collider, ref _surfer.moveData.origin, ref _surfer.moveData.velocity, _surfer.moveData.rigidbodyPushForce); SurfPhysics.ResolveCollisions (_surfer.collider, ref _surfer.moveData.origin, ref _surfer.moveData.velocity, _surfer.moveData.rigidbodyPushForce, amountThisLoop / velocityDist);
} }

10
Modified fragsurf/Movement/SurfPhysics.cs
View File

@@ -29,7 +29,12 @@ namespace Fragsurf.Movement {
/// <param name="origin"></param> /// <param name="origin"></param>
/// <param name="velocity"></param> /// <param name="velocity"></param>
/// http://www.00jknight.com/blog/unity-character-controller /// http://www.00jknight.com/blog/unity-character-controller
public static void ResolveCollisions (Collider collider, ref Vector3 origin, ref Vector3 velocity, float rigidbodyPushForce) { public static void ResolveCollisions (Collider collider, ref Vector3 origin, ref Vector3 velocity, float rigidbodyPushForce) {
ResolveCollisions (collider, ref origin, ref velocity, rigidbodyPushForce, 1f);
}
public static void ResolveCollisions (Collider collider, ref Vector3 origin, ref Vector3 velocity, float rigidbodyPushForce, float velocityMultiplier) {
// manual collision resolving // manual collision resolving
int numOverlaps = 0; int numOverlaps = 0;
@@ -59,17 +64,18 @@ namespace Fragsurf.Movement {
Quaternion.identity, _colliders [i], _colliders [i].transform.position, Quaternion.identity, _colliders [i], _colliders [i].transform.position,
_colliders [i].transform.rotation, out direction, out distance)) { _colliders [i].transform.rotation, out direction, out distance)) {
// Handle collision
direction.Normalize (); direction.Normalize ();
Vector3 penetrationVector = direction * distance; Vector3 penetrationVector = direction * distance;
Vector3 velocityProjected = Vector3.Project (velocity, -direction); Vector3 velocityProjected = Vector3.Project (velocity, -direction);
velocityProjected.y = 0; // don't touch y velocity, we need it to calculate fall damage elsewhere velocityProjected.y = 0; // don't touch y velocity, we need it to calculate fall damage elsewhere
origin += penetrationVector; origin += penetrationVector;
velocity -= velocityProjected; velocity -= velocityProjected * velocityMultiplier;
Rigidbody rb = _colliders [i].GetComponentInParent<Rigidbody> (); Rigidbody rb = _colliders [i].GetComponentInParent<Rigidbody> ();
if (rb) if (rb)
if (!rb.isKinematic) if (!rb.isKinematic)
rb.AddForceAtPosition (velocityProjected * rigidbodyPushForce, origin, ForceMode.Impulse); rb.AddForceAtPosition (velocityProjected * velocityMultiplier * rigidbodyPushForce, origin, ForceMode.Impulse);
} }