GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wormholes Fixed

Browse source 
Fixed issues when jumping to another zone:
All bodies from the old zone are correctly destroyed
Ship controls & UI transfer smoothly to new ship instance
Animation issues are sorted
This commit is contained in:
Reinier Vens 2021-03-05 21:45:32 +00:00
commit 273095afec
8 changed files with 66 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Assets/Scripts/ServerShared/Ship.cs
View file

@ -222,7 +222,7 @@ public class Ship : Entity
public override void Update(float delta)
{
if (_active && !_exitingWormhole)
if (_active && !_exitingWormhole && !_enteringWormhole)
{
foreach (var thruster in _allThrusters) thruster.Axis = 0;
var rightThrusterTorqueCompensation = abs(RightStrafeTotalTorque) / RightStrafeTorqueThrusters.Length;
@ -287,8 +287,8 @@ public class Ship : Entity
}
else
{
var exitLerp = _wormholeAnimationProgress - ItemManager.GameplaySettings.WormholeExitCurveStart /
(1 - ItemManager.GameplaySettings.WormholeExitCurveStart);
var exitLerp = (_wormholeAnimationProgress - ItemManager.GameplaySettings.WormholeExitCurveStart) /
(1 - ItemManager.GameplaySettings.WormholeExitCurveStart);
exitLerp *= exitLerp; // Square the interpolation variable to produce curve with zero slope at start
Position.xz = _wormholePosition + normalize(_wormholeExitVelocity) * exitLerp * ItemManager.GameplaySettings.WormholeExitRadius;
Rotation = quaternion.LookRotation(