mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-06 00:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Revert "use unscaled Time.timeSinceLevelLoad"

Browse Source 
This reverts commit 489a67133374da5e19000a05e180bbd09417591d.
This commit is contained in:
JohnCorby 2023-06-10 11:21:02 -07:00
parent 216197e466
commit 20813409c0
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
QSB/TimeSync/TimeSyncUI.cs
View File

@ -66,7 +66,7 @@ internal class TimeSyncUI : MonoBehaviour, IAddComponentOnStart
_currentType = type;
_currentReason = reason;
_startTime = WakeUpSync.TimeSinceLevelLoad;
_startTime = Time.timeSinceLevelLoad;
enabled = true;
_canvas.enabled = true;
Canvas.willRenderCanvases += OnWillRenderCanvases;
@ -112,7 +112,7 @@ internal class TimeSyncUI : MonoBehaviour, IAddComponentOnStart
switch ((FastForwardReason)_currentReason)
{
case FastForwardReason.TooFarBehind:
var totalSeconds = Mathf.Max(TargetTime - WakeUpSync.TimeSinceLevelLoad, 0f);
var totalSeconds = Mathf.Max(TargetTime - Time.timeSinceLevelLoad, 0f);
var minutes = Mathf.FloorToInt(totalSeconds / 60f);
var seconds = Mathf.FloorToInt(totalSeconds) % 60;
var milliseconds = totalSeconds % 1 * 1000;
@ -130,7 +130,7 @@ internal class TimeSyncUI : MonoBehaviour, IAddComponentOnStart
break;
case PauseReason.TooFarAhead:
var totalSeconds = Mathf.Max(WakeUpSync.TimeSinceLevelLoad - TargetTime, 0f);
var totalSeconds = Mathf.Max(Time.timeSinceLevelLoad - TargetTime, 0f);
var minutes = Mathf.FloorToInt(totalSeconds / 60f);
var seconds = Mathf.FloorToInt(totalSeconds) % 60;
var milliseconds = totalSeconds % 1 * 1000;

24
QSB/TimeSync/WakeUpSync.cs
View File

@ -20,12 +20,6 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
{
public static WakeUpSync LocalInstance { get; private set; }
private static float _sceneLoadTime;
/// <summary>
/// Time.timeSinceLevelLoad is scaled. this is not
/// </summary>
public static float TimeSinceLevelLoad = Time.unscaledTime - _sceneLoadTime;
private const float PauseOrFastForwardThreshold = 1.0f;
private const float TimescaleBounds = 0.3f;
@ -72,7 +66,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
public float GetTimeDifference()
{
var myTime = TimeSinceLevelLoad;
var myTime = Time.timeSinceLevelLoad;
return myTime - _serverTime;
}
@ -96,8 +90,6 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
private void OnSceneLoaded(OWScene oldScene, OWScene newScene, bool isInUniverse)
{
_sceneLoadTime = Time.unscaledTime;
HasWokenUp = false;
if (isInUniverse)
{
@ -168,7 +160,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
return;
}
var myTime = TimeSinceLevelLoad;
var myTime = Time.timeSinceLevelLoad;
var diff = myTime - _serverTime;
if (ServerStateManager.Instance.GetServerState() is not (ServerState.InSolarSystem or ServerState.InEye))
@ -202,7 +194,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
return;
}
DebugLog.DebugWrite($"START FASTFORWARD (Target:{_serverTime} Current:{TimeSinceLevelLoad})", MessageType.Info);
DebugLog.DebugWrite($"START FASTFORWARD (Target:{_serverTime} Current:{Time.timeSinceLevelLoad})", MessageType.Info);
if (Locator.GetActiveCamera() != null)
{
Locator.GetActiveCamera().enabled = false;
@ -226,7 +218,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
return;
}
DebugLog.DebugWrite($"START PAUSING (Target:{_serverTime} Current:{TimeSinceLevelLoad})", MessageType.Info);
DebugLog.DebugWrite($"START PAUSING (Target:{_serverTime} Current:{Time.timeSinceLevelLoad})", MessageType.Info);
Locator.GetActiveCamera().enabled = false;
//OWInput.ChangeInputMode(InputMode.None);
@ -280,7 +272,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
private void UpdateServer()
{
_serverTime = TimeSinceLevelLoad;
_serverTime = Time.timeSinceLevelLoad;
if (ServerStateManager.Instance == null)
{
@ -354,7 +346,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
Locator.GetPlayerCamera().enabled = false;
}
var diff = _serverTime - TimeSinceLevelLoad;
var diff = _serverTime - Time.timeSinceLevelLoad;
OWTime.SetTimeScale(Mathf.SmoothStep(MinFastForwardSpeed, MaxFastForwardSpeed, Mathf.Abs(diff) / MaxFastForwardDiff));
TimeSyncUI.TargetTime = _serverTime;
@ -413,7 +405,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
if (CurrentState == State.Pausing && (PauseReason)CurrentReason == PauseReason.TooFarAhead)
{
if (TimeSinceLevelLoad <= _serverTime)
if (Time.timeSinceLevelLoad <= _serverTime)
{
ResetTimeScale();
}
@ -421,7 +413,7 @@ public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
if (CurrentState == State.FastForwarding && (FastForwardReason)CurrentReason == FastForwardReason.TooFarBehind)
{
if (TimeSinceLevelLoad >= _serverTime)
if (Time.timeSinceLevelLoad >= _serverTime)
{
ResetTimeScale();
}