Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize yielding to fix jank #964

Merged
merged 2 commits into from
Mar 12, 2025
Merged

Synchronize yielding to fix jank #964

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bbe108
Synchronize yielding to fix jank
toberge Mar 11, 2025
9007e6c
Actually remember that yield countdown has stopped
toberge Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Assets/Scripts/Auction/AuctionDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class AuctionDriver : NetworkBehaviour
{
[SerializeField]
private float biddingBeginDelay = 2f;
private bool isAuctionStart = false;
private bool hasAuctionStarted = false;

[SerializeField]
private BiddingPlatform[] biddingPlatforms;
Expand All @@ -42,7 +42,6 @@ public class AuctionDriver : NetworkBehaviour
private BiddingPlatform lastExtendedAuction;

private HashSet<PlayerManager> playersInAuction;
private Dictionary<PlayerManager, int> chipsInPlay = new Dictionary<PlayerManager, int>();

[SerializeField]
private PlayerFactory playerFactory;
Expand Down Expand Up @@ -83,8 +82,6 @@ private void Awake()
yieldingPlayers = new();
}

// Stages
// BiddingStage contains a list of items (scriptableobjects)
private void Start()
{
StartCoroutine(WaitAndStartAuction());
Expand Down Expand Up @@ -130,7 +127,7 @@ private IEnumerator WaitAndStartCameraAnimation()
{
yield return new WaitForSeconds(biddingBeginDelay);
cameraAnimator.SetTrigger("start");
isAuctionStart = true;
hasAuctionStarted = true;
}

[Server]
Expand All @@ -139,11 +136,26 @@ public void StopAuctionEarly()
biddingPlatforms.ToList().ForEach(platform => platform.ForceEndAuction());
}

#region Yielding

[Server]
public void AddYieldingPlayer(PlayerManager player)
{
if (yieldingPlayers.Contains(player))
return;

AddYieldingPlayerRpc(player.id);
}

[ClientRpc]
private void AddYieldingPlayerRpc(uint id)
{
if (!RPRNetworkManager.PlayerInstanceByID.TryGetValue(id, out var player))
return;

if (yieldingPlayers.Contains(player))
return;

yieldingPlayers.Add(player);
OnYieldCountChange?.Invoke();

Expand All @@ -152,10 +164,13 @@ public void AddYieldingPlayer(PlayerManager player)

OnYieldChange?.Invoke();

if (isAuctionStart && IsAuctionYielded())
if (hasAuctionStarted && IsAuctionYielded())
StartCoroutine(nameof(WaitAndTryAuctionEnd));
else
{
StopCoroutine(nameof(WaitAndTryAuctionEnd));
isYieldCountdownOn = false;
}
}

private bool IsAuctionYielded()
Expand Down Expand Up @@ -194,18 +209,36 @@ private IEnumerator WaitAndTryAuctionEnd()
StopAuctionEarly();
}

[Server]
public void RemoveYieldingPlayer(PlayerManager player)
{
if (!yieldingPlayers.Contains(player))
return;
RemoveYieldingPlayerRpc(player.id);
}

[ClientRpc]
private void RemoveYieldingPlayerRpc(uint id)
{
if (!RPRNetworkManager.PlayerInstanceByID.TryGetValue(id, out var player))
return;

if (!yieldingPlayers.Remove(player))
return;

OnYieldCountChange?.Invoke();

if (IsAuctionYielded())
return;

// Abort if not yielded
StopCoroutine(nameof(WaitAndTryAuctionEnd));
isYieldCountdownOn = false;
OnYieldChange?.Invoke();
}

#endregion Yielding

public void ScreenShake()
{
if (cameraAnimator.transform.localPosition != cameraStandbyPosition)
Expand Down