celisej567/UnitySourceMovement
1
0
Fork 0
mirror of https://github.com/celisej567/UnitySourceMovement.git synced 2026-02-25 14:33:01 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update SurfController.cs

Browse Source
This commit is contained in:
Olezen
2019-11-10 13:25:00 +01:00
committed by GitHub
parent cb19da3134
commit 1c13790034
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modified fragsurf/Movement/SurfController.cs
View File

@@ -1,4 +1,4 @@
using UnityEngine; using UnityEngine;
using Fragsurf.TraceUtil; using Fragsurf.TraceUtil;
namespace Fragsurf.Movement { namespace Fragsurf.Movement {
@@ -47,7 +47,7 @@ namespace Fragsurf.Movement {
if (_surfer.moveData.laddersEnabled && !_surfer.moveData.climbingLadder) { if (_surfer.moveData.laddersEnabled && !_surfer.moveData.climbingLadder) {
// Look for ladders // Look for ladders
LadderCheck (new Vector3(1f, 0.95f, 1f), _surfer.moveData.velocity * Time.deltaTime * 2f); LadderCheck (new Vector3(1f, 0.95f, 1f), _surfer.moveData.velocity * Mathf.Clamp (Time.deltaTime * 2f, 0.025f, 0.25f));
} }
@@ -330,7 +330,7 @@ namespace Fragsurf.Movement {
_surfer.moveData.climbingLadder = true; _surfer.moveData.climbingLadder = true;
_surfer.moveData.ladderNormal = hit.normal; _surfer.moveData.ladderNormal = hit.normal;
_surfer.moveData.ladderDirection = direction; _surfer.moveData.ladderDirection = -hit.normal * direction.magnitude * 2f;
if (_surfer.moveData.angledLaddersEnabled) { if (_surfer.moveData.angledLaddersEnabled) {
@@ -345,6 +345,7 @@ namespace Fragsurf.Movement {
_surfer.moveData.ladderClimbDir = Vector3.up; _surfer.moveData.ladderClimbDir = Vector3.up;
} }
} }
} }
@@ -363,14 +364,15 @@ namespace Fragsurf.Movement {
} }
private void LadderPhysics () { private void LadderPhysics () {
_surfer.moveData.ladderVelocity = _surfer.moveData.ladderClimbDir * _surfer.moveData.verticalAxis * 6f; _surfer.moveData.ladderVelocity = _surfer.moveData.ladderClimbDir * _surfer.moveData.verticalAxis * 6f;
_surfer.moveData.velocity = Vector3.Lerp (_surfer.moveData.velocity, _surfer.moveData.ladderVelocity, Time.deltaTime * 10f); _surfer.moveData.velocity = Vector3.Lerp (_surfer.moveData.velocity, _surfer.moveData.ladderVelocity, Time.deltaTime * 10f);
LadderCheck (Vector3.one, _surfer.moveData.ladderDirection); LadderCheck (Vector3.one, _surfer.moveData.ladderDirection);
Trace floorTrace = TraceToFloor (); Trace floorTrace = TraceToFloor ();
if (_surfer.moveData.verticalAxis < 0f && floorTrace.hitCollider != null) { if (_surfer.moveData.verticalAxis < 0f && floorTrace.hitCollider != null && Vector3.Angle (Vector3.up, floorTrace.planeNormal) <= _surfer.moveData.slopeLimit) {
_surfer.moveData.velocity = _surfer.moveData.ladderNormal * 0.5f; _surfer.moveData.velocity = _surfer.moveData.ladderNormal * 0.5f;
_surfer.moveData.ladderVelocity = Vector3.zero; _surfer.moveData.ladderVelocity = Vector3.zero;