Timestamp is now float
This commit is contained in:
@@ -400,10 +400,10 @@ MonoBehaviour:
|
||||
Data: loopOffset
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 11
|
||||
Data: 19
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 11
|
||||
Data: 19
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
|
||||
@@ -24,15 +24,15 @@ public class TestBall : SyncedObject
|
||||
|
||||
private NetworkManager networkManager;
|
||||
|
||||
private const int LoopTimeMs = 1000;
|
||||
private const float LoopTime = 1f;
|
||||
private const float MaxUp = 0.7f;
|
||||
private const float UpPerPress = 0.4f;
|
||||
private const float DownPerSecond = 1;
|
||||
private const float DownPerSecond = 1f;
|
||||
|
||||
private float sumOfDt;
|
||||
|
||||
private float amountUp = 0;
|
||||
private int loopOffset = 0;
|
||||
private float loopOffset = 0;
|
||||
|
||||
private float[] jumps;
|
||||
private int jumpsIndex;
|
||||
@@ -78,25 +78,25 @@ public class TestBall : SyncedObject
|
||||
private void SetProgress(float progress)
|
||||
{
|
||||
var currentTimestamp = GetCurrentTimestamp();
|
||||
loopOffset = (int)(currentTimestamp - progress * LoopTimeMs);
|
||||
loopOffset = currentTimestamp - progress * LoopTime;
|
||||
}
|
||||
|
||||
private float GetProgress()
|
||||
{
|
||||
var currentTimestamp = GetCurrentTimestamp();
|
||||
//Debug.Log($"CurrentTimeStamp for mode {mode}: {currentTimestamp}");
|
||||
return ((int)currentTimestamp - loopOffset) % LoopTimeMs / (float)LoopTimeMs; // "uint % int" is not exposed, I love working in Udon
|
||||
return currentTimestamp - loopOffset % LoopTime / LoopTime;
|
||||
}
|
||||
|
||||
private uint GetCurrentTimestamp()
|
||||
private float GetCurrentTimestamp()
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
case TestBallMode.UseNetworkTime:
|
||||
return NetworkManager.TimeToTimestamp(networkManager.SyncedTime);
|
||||
return networkManager.SyncedTime;
|
||||
case TestBallMode.UseNetworkDt:
|
||||
case TestBallMode.UseUnityDt:
|
||||
return NetworkManager.TimeToTimestamp(sumOfDt);
|
||||
return sumOfDt;
|
||||
default:
|
||||
Debug.LogError($"({nameof(TestBall)}) Unknown mode {mode}!");
|
||||
return 0;
|
||||
|
||||
@@ -56,7 +56,7 @@ public class TestBallManager : UdonSharpBehaviour
|
||||
{
|
||||
if (VRCPlayerApi.GetPlayerCount() == 1)
|
||||
{
|
||||
networkManager.SimulateSyncToTimestamp(NetworkManager.TimeToTimestamp(networkManager.SyncedTime - 0.5f));
|
||||
networkManager.SimulateSyncToTimestamp(networkManager.SyncedTime - 0.5f);
|
||||
}
|
||||
else if (networkManager.IsOwner)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user