Skip to content

Added ConcurrentDictionary #1

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

Open
Xanumbra wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added ConcurrentDictionary #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc3237e
Added ConcurrentDictionary
Xanumbra Aug 29, 2022
57ca92f
Changed addition of feet data to the player
Xanumbra Aug 30, 2022
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
13 changes: 10 additions & 3 deletions Assets/UnityPharusAPI/Managers/ATracklinkPlayerManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,11 @@ public virtual void AddPlayer(TrackRecord trackRecord)
aPlayer.Orientation = new Vector2(trackRecord.orientation.x, trackRecord.orientation.y);
aPlayer.Speed = trackRecord.speed;
aPlayer.Echoes.Clear();
trackRecord.echoes.AddToVector2List(VectorAdapter.ToPharusVector2List(aPlayer.Echoes));

// trackRecord.echoes.AddToVector2List(VectorAdapter.ToPharusVector2List(aPlayer.Echoes));
for (int i = 0; i < trackRecord.echoes.Count; i++)
{
aPlayer.Echoes.TryAdd(i, new Vector2(trackRecord.echoes[i].x, trackRecord.echoes[i].y));
}
aPlayer.gameObject.name = string.Format("PharusPlayer_{0}", aPlayer.TrackID);

_playerList.Add(aPlayer);
Expand All @@ -118,7 +121,11 @@ public virtual void UpdatePlayerPosition(TrackRecord trackRecord)
aPlayer.Speed = trackRecord.speed;
// use AddToVector2List() instead of ToVector2List() as it is more performant
aPlayer.Echoes.Clear();
trackRecord.echoes.AddToVector2List(VectorAdapter.ToPharusVector2List(aPlayer.Echoes));
// trackRecord.echoes.AddToVector2List(VectorAdapter.ToPharusVector2List(aPlayer.Echoes));
for(int i = 0; i < trackRecord.echoes.Count; i++)
{
aPlayer.Echoes.TryAdd(i, new Vector2(trackRecord.echoes[i].x, trackRecord.echoes[i].y));
}
//aPlayer.SetPosition(TracklinkTrackingService.GetScreenPositionFromRelativePosition(trackRecord.relPos));
aPlayer.SetPosition(VectorAdapter.ToUnityVector2(TrackingAdapter.GetScreenPositionFromRelativePosition(trackRecord.relPos.x, trackRecord.relPos.y)));
return;
Expand Down
11 changes: 6 additions & 5 deletions Assets/UnityPharusAPI/Player/ATrackingEntity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Assets.UnityPharusAPI.Helper;
using System.Collections.Concurrent;
using System.Collections.Generic;
using UnityEngine;
using UnityPharusAPI;
Expand All @@ -16,7 +17,7 @@ public abstract class ATrackingEntity : MonoBehaviour
private Vector2 _relativePosition;
private Vector2 _orientation;
private float _speed;
private List<Vector2> _echoes = new List<Vector2>();
private ConcurrentDictionary<int,Vector2> _echoes = new ConcurrentDictionary<int, Vector2>();

#region properties
/// <summary>
Expand Down Expand Up @@ -74,9 +75,9 @@ public float Speed
}

/// <summary>
/// A list of the track's echoes (feet) as Vector2
/// A Dictionary of the track's echoes (feet) as key,value(integer,Vector2) pair
/// </summary>
public List<Vector2> Echoes
public ConcurrentDictionary<int,Vector2> Echoes
{
get { return _echoes; }
set { _echoes = value; }
Expand All @@ -99,9 +100,9 @@ private void OnDrawGizmos()
Gizmos.color = Color.red;

// DEBUG DRAW ECHOES
foreach (Vector2 echo in Echoes)
foreach (KeyValuePair<int,Vector2> keyValuePair in Echoes.ToArray())
{
Gizmos.DrawWireSphere (VectorAdapter.ToUnityVector2(TrackingAdapter.GetScreenPositionFromRelativePosition(echo.x, echo.y)), 12f);
Gizmos.DrawWireSphere (VectorAdapter.ToUnityVector2(TrackingAdapter.GetScreenPositionFromRelativePosition(keyValuePair.Value.x, keyValuePair.Value.y)), 12f);
}
}
}
Expand Down