michele/sledgemapper
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 4 Wiki Activity

ping on map feature complete

Browse source
This commit is contained in:
Michele 2021-02-09 17:13:52 +00:00
parent 17cce56866
commit bce97de302
19 changed files with 1002 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

326
Sledgemapper.Shared/Entities/Session.cs
View file

@ -27,10 +27,11 @@ namespace Sledgemapper.Shared.Entities
Overlays = new ConcurrentDictionary<string, Overlay>();
Walls = new ConcurrentDictionary<string, Wall>();
Notes = new ConcurrentDictionary<string, Note>();
Lines=new ConcurrentDictionary<string, Line>();
Rooms=new ConcurrentDictionary<string, Room>();
Lines = new ConcurrentDictionary<string, Line>();
Rooms = new ConcurrentDictionary<string, Room>();
Players = new List<Player>();
Colors = new List<string>();
Pings = new ConcurrentDictionary<Guid, Ping>();
}
public ConcurrentDictionary<string, Tile> Map { get; set; }
@ -39,189 +40,190 @@ namespace Sledgemapper.Shared.Entities
public ConcurrentDictionary<string, Note> Notes { get; set; }
public bool IsValid { get; set; }
public List<Player> Players { get; set; }
public List<string> Colors { get; set; }
public string SessionName { get; set; }
public int SessionId { get; set; }
public ConcurrentDictionary<string, Line> Lines { get; set; }
public ConcurrentDictionary<string, Room> Rooms { get; set; }
public ConcurrentDictionary<Guid, Ping> Pings { get; set; }
public List<string> Colors { get; set; }
public string SessionName { get; set; }
public int SessionId { get; set; }
public ConcurrentDictionary<string, Line> Lines { get; set; }
public ConcurrentDictionary<string, Room> Rooms { get; set; }
public void NewTile(Tile selectedTile, string tileId)
public void NewTile(Tile selectedTile, string tileId)
{
if (selectedTile is null || string.IsNullOrWhiteSpace(tileId))
{
if (selectedTile is null || string.IsNullOrWhiteSpace(tileId))
{
return;
}
var tileExist = Map.TryGetValue(selectedTile.ToString(), out var tile);
var newTile = new Tile { X = selectedTile.X, Y = selectedTile.Y, ID = tileId };
if (tileExist)
{
Map.TryRemove(tile.ToString(), out var _);
if (tile.ID == tileId)
{
newTile.Rotation = (tile.Rotation + 1) % 4;
}
}
Map.TryAdd(newTile.ToString(), newTile);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newTile));
return;
}
public void NewOverlay(Overlay selectedOverlay, string overlayId)
var tileExist = Map.TryGetValue(selectedTile.ToString(), out var tile);
var newTile = new Tile { X = selectedTile.X, Y = selectedTile.Y, ID = tileId };
if (tileExist)
{
if (selectedOverlay is null || string.IsNullOrWhiteSpace(overlayId))
Map.TryRemove(tile.ToString(), out var _);
if (tile.ID == tileId)
{
return;
}
var overlayExist = Overlays.TryGetValue(selectedOverlay.ToString(), out var overlay);
var newOverlay = new Overlay { X = selectedOverlay.X, Y = selectedOverlay.Y, ID = overlayId, Intersection = selectedOverlay.Intersection };
if (overlayExist)
{
Overlays.TryRemove(overlay.ToString(), out var _);
if (overlay.ID == overlayId)
{
newOverlay.Rotation = (overlay.Rotation + 1) % 4;
}
}
Overlays.TryAdd(newOverlay.ToString(), newOverlay);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newOverlay));
}
public void NewWall(Wall selectedWall, string wallId)
{
if (selectedWall is null || string.IsNullOrWhiteSpace(wallId))
{
return;
}
var tileExist = Walls.TryGetValue(selectedWall.ToString(), out var wall);
var newWall = new Wall { X = selectedWall.X, Y = selectedWall.Y, ID = wallId, Rotation = selectedWall.Rotation };
if (tileExist)
{
Walls.TryRemove(wall.ToString(), out var _);
}
Walls.TryAdd(newWall.ToString(), newWall);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newWall));
}
public void NewNote(Note selectedNote)
{
if (selectedNote is null)
{
return;
}
var noteExists = Notes.TryGetValue(selectedNote.ToString(), out var note);
var newNote = new Note { X = selectedNote.X, Y = selectedNote.Y, Text=selectedNote.Text };
if (noteExists)
{
Walls.TryRemove(note.ToString(), out var _);
}
Notes.TryAdd(newNote.ToString(), newNote);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newNote));
}
public void DeleteWall(Wall wall)
{
if (wall is null)
{
return;
}
var removed = Walls.TryRemove(wall.ToString(), out var _);
if (removed)
{
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(wall));
newTile.Rotation = (tile.Rotation + 1) % 4;
}
}
public void DeleteNote(Note note)
Map.TryAdd(newTile.ToString(), newTile);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newTile));
}
public void NewOverlay(Overlay selectedOverlay, string overlayId)
{
if (selectedOverlay is null || string.IsNullOrWhiteSpace(overlayId))
{
if (note is null)
return;
}
var overlayExist = Overlays.TryGetValue(selectedOverlay.ToString(), out var overlay);
var newOverlay = new Overlay { X = selectedOverlay.X, Y = selectedOverlay.Y, ID = overlayId, Intersection = selectedOverlay.Intersection };
if (overlayExist)
{
Overlays.TryRemove(overlay.ToString(), out var _);
if (overlay.ID == overlayId)
{
return;
}
var removed = Notes.TryRemove(note.ToString(), out var _);
if (removed)
{
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(note));
newOverlay.Rotation = (overlay.Rotation + 1) % 4;
}
}
public void DeleteOverlay(Overlay overlay)
Overlays.TryAdd(newOverlay.ToString(), newOverlay);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newOverlay));
}
public void NewWall(Wall selectedWall, string wallId)
{
if (selectedWall is null || string.IsNullOrWhiteSpace(wallId))
{
if (overlay is null)
{
return;
}
var removed = Overlays.TryRemove(overlay.ToString(), out var _);
if (removed)
{
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(overlay));
}
return;
}
var tileExist = Walls.TryGetValue(selectedWall.ToString(), out var wall);
var newWall = new Wall { X = selectedWall.X, Y = selectedWall.Y, ID = wallId, Rotation = selectedWall.Rotation };
if (tileExist)
{
Walls.TryRemove(wall.ToString(), out var _);
}
public void DeleteTile(Tile tile)
Walls.TryAdd(newWall.ToString(), newWall);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newWall));
}
public void NewNote(Note selectedNote)
{
if (selectedNote is null)
{
if (tile is null)
{
return;
}
var removed = Map.TryRemove(tile.ToString(), out var _);
if (removed)
{
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(tile));
}
return;
}
var noteExists = Notes.TryGetValue(selectedNote.ToString(), out var note);
var newNote = new Note { X = selectedNote.X, Y = selectedNote.Y, Text = selectedNote.Text };
if (noteExists)
{
Walls.TryRemove(note.ToString(), out var _);
}
protected virtual void OnRaiseMapEntityAddedEvent(MapEntityAddedEventArgs e)
Notes.TryAdd(newNote.ToString(), newNote);
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newNote));
}
public void DeleteWall(Wall wall)
{
if (wall is null)
{
MapEntityAdded?.Invoke(this, e);
return;
}
protected virtual void OnRaiseMapEntityDeletedEvent(MapEntityDeletedEventArgs e)
var removed = Walls.TryRemove(wall.ToString(), out var _);
if (removed)
{
MapEntityDeleted?.Invoke(this, e);
}
public void NewLine(Line line)
{
if (line is null)
{
return;
}
var lineExist = Lines.TryGetValue(line.ToString(), out var tile);
var newLine = new Line { Start=line.Start, End=line.End, Width=line.Width};
if (lineExist)
{
Lines.TryRemove(line.ToString(), out var _);
}
Lines.TryAdd(newLine.ToString(), newLine);
//TODO fix this
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newLine));
}
public void NewRoom(Room line)
{
if (line is null)
{
return;
}
var lineExist = Rooms.TryGetValue(line.ToString(), out var tile);
var newLine = new Room { Start=line.Start, End=line.End, Delete=line.Delete};
if (lineExist)
{
Rooms.TryRemove(line.ToString(), out var _);
}
Rooms.TryAdd(newLine.ToString(), newLine);
//TODO fix this
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newLine));
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(wall));
}
}
public void DeleteNote(Note note)
{
if (note is null)
{
return;
}
var removed = Notes.TryRemove(note.ToString(), out var _);
if (removed)
{
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(note));
}
}
public void DeleteOverlay(Overlay overlay)
{
if (overlay is null)
{
return;
}
var removed = Overlays.TryRemove(overlay.ToString(), out var _);
if (removed)
{
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(overlay));
}
}
public void DeleteTile(Tile tile)
{
if (tile is null)
{
return;
}
var removed = Map.TryRemove(tile.ToString(), out var _);
if (removed)
{
OnRaiseMapEntityDeletedEvent(new MapEntityDeletedEventArgs(tile));
}
}
protected virtual void OnRaiseMapEntityAddedEvent(MapEntityAddedEventArgs e)
{
MapEntityAdded?.Invoke(this, e);
}
protected virtual void OnRaiseMapEntityDeletedEvent(MapEntityDeletedEventArgs e)
{
MapEntityDeleted?.Invoke(this, e);
}
public void NewLine(Line line)
{
if (line is null)
{
return;
}
var lineExist = Lines.TryGetValue(line.ToString(), out var tile);
var newLine = new Line { Start = line.Start, End = line.End, Width = line.Width };
if (lineExist)
{
Lines.TryRemove(line.ToString(), out var _);
}
Lines.TryAdd(newLine.ToString(), newLine);
//TODO fix this
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newLine));
}
public void NewRoom(Room line)
{
if (line is null)
{
return;
}
var lineExist = Rooms.TryGetValue(line.ToString(), out var tile);
var newLine = new Room { Start = line.Start, End = line.End, Delete = line.Delete };
if (lineExist)
{
Rooms.TryRemove(line.ToString(), out var _);
}
Rooms.TryAdd(newLine.ToString(), newLine);
//TODO fix this
OnRaiseMapEntityAddedEvent(new MapEntityAddedEventArgs(newLine));
}
}
}

7
Sledgemapper.Shared/Entities/Tile.cs
View file

@ -21,6 +21,13 @@ namespace Sledgemapper.Shared.Entities
public double Timestamp { get; set; }
}
public class Ping : BaseMapEntity
{
public Player Player { get; set; }
public int Iterations {get;set;}
public double StartTime {get;set;}
}
public class Tile : BaseMapEntity
{