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

refactoring

Browse source
This commit is contained in:
Michele 2020-11-08 23:48:15 +00:00
parent 9c100531ef
commit 92f333a4c4
26 changed files with 860 additions and 491 deletions
Download patch file Download diff file Expand all files Collapse all files

177
Sledgemapper.Shared/Entities/SessionData.cs
View file

@ -10,16 +10,44 @@ namespace Sledgemapper.Shared.Entities
public TileAddedEventArgs(Tile tile) => Tile = tile;
}
public class OverlayAddedEventArgs : EventArgs
public class OverlayAddedEventArgs : EventArgs
{
public Overlay Overlay { get; set; }
public OverlayAddedEventArgs(Overlay overlay) => Overlay = overlay;
}
public class WallAddedEventArgs : EventArgs
{
public Wall Wall { get; set; }
public WallAddedEventArgs(Wall wall) => Wall = wall;
}
public class WallDeletedEventArgs : EventArgs
{
public Wall Wall { get; set; }
public WallDeletedEventArgs(Wall wall) => Wall = wall;
}
public class OverlayDeletedEventArgs : EventArgs
{
public Overlay Overlay { get; set; }
public OverlayDeletedEventArgs(Overlay overlay) => Overlay = overlay;
}
public class TileDeletedEventArgs : EventArgs
{
public Tile Tile { get; set; }
public TileDeletedEventArgs(Tile tile) => Tile = tile;
}
public class SessionData
{
public event EventHandler<TileAddedEventArgs> RaiseTileAddedEvent;
public event EventHandler<OverlayAddedEventArgs> RaiseOverlayAddedEvent;
public event EventHandler<TileAddedEventArgs> TileAdded;
public event EventHandler<OverlayAddedEventArgs> OverlayAdded;
public event EventHandler<WallAddedEventArgs> WallAdded;
public event EventHandler<WallDeletedEventArgs> WallDeleted;
public event EventHandler<OverlayDeletedEventArgs> OverlayDeleted;
public event EventHandler<TileDeletedEventArgs> TileDeleted;
public SessionData()
{
@ -39,82 +67,151 @@ namespace Sledgemapper.Shared.Entities
public void NewTile(Tile selectedTile, string tileId)
{
if (selectedTile is null || string.IsNullOrWhiteSpace(tileId))
{
return;
}
var tileExist = Map.TryGetValue(selectedTile.ToString(), out var tile);
Tile newTile;
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 = new Tile { X = selectedTile.X, Y = selectedTile.Y, ID = tileId, Rotation = (tile.Rotation + 1) % 4 };
newTile.Rotation = (tile.Rotation + 1) % 4;
}
else
{
newTile = new Tile { X = selectedTile.X, Y = selectedTile.Y, ID = tileId };
}
}
else
{
newTile = new Tile { X = selectedTile.X, Y = selectedTile.Y, ID = tileId };
}
Map.TryAdd(newTile.ToString(), newTile);
OnRaiseTileAddedEvent(new TileAddedEventArgs(newTile));
}
public void NewOverlay(Overlay selectedOverlay, string tileId)
public void NewOverlay(Overlay selectedOverlay, string overlayId)
{
if (selectedOverlay is null || string.IsNullOrWhiteSpace(overlayId))
{
return;
}
var overlayExist = Overlays.TryGetValue(selectedOverlay.ToString(), out var overlay);
Overlay newOverlay;
var newOverlay = new Overlay { X = selectedOverlay.X, Y = selectedOverlay.Y, ID = overlayId, Intersection = selectedOverlay.Intersection }; ;
if (overlayExist)
{
Overlays.TryRemove(overlay.ToString(), out var rrtile);
if (overlay.ID == tileId)
if (overlay.ID == overlayId)
{
newOverlay = new Overlay { X = overlay.X, Y = overlay.Y, ID = tileId, Intersection = overlay.Intersection, Rotation = (overlay.Rotation + 1) % 4 };
newOverlay.Rotation = (overlay.Rotation + 1) % 4;
}
else
{
newOverlay = new Overlay { X = selectedOverlay.X, Y = selectedOverlay.Y, ID = tileId, Intersection = selectedOverlay.Intersection };
}
}
else
{
newOverlay = new Overlay { X = selectedOverlay.X, Y = selectedOverlay.Y, ID = tileId, Intersection = selectedOverlay.Intersection };
}
Overlays.TryAdd(newOverlay.ToString(), newOverlay);
OnRaiseOverlayAddedEvent(new OverlayAddedEventArgs(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);
OnRaiseWallAddedEvent(new WallAddedEventArgs(newWall));
}
public void DeleteWall(Wall wall)
{
if (wall is null)
{
return;
}
var removed = Walls.TryRemove(wall.ToString(), out var _);
if (removed)
{
OnRaiseWallDeletedEvent(new WallDeletedEventArgs(wall));
}
}
public void DeleteOverlay(Overlay overlay)
{
if (overlay is null)
{
return;
}
var removed = Overlays.TryRemove(overlay.ToString(), out var _);
if (removed)
{
OnRaiseOverlayDeletedEvent(new OverlayDeletedEventArgs(overlay));
}
}
public void DeleteTile(Tile tile)
{
if (tile is null)
{
return;
}
var removed = Map.TryRemove(tile.ToString(), out var _);
if (removed)
{
OnRaiseTileDeletedEvent(new TileDeletedEventArgs(tile));
}
}
protected virtual void OnRaiseTileAddedEvent(TileAddedEventArgs e)
{
// Make a temporary copy of the event to avoid possibility of
// a race condition if the last subscriber unsubscribes
// immediately after the null check and before the event is raised.
EventHandler<TileAddedEventArgs> raiseEvent = RaiseTileAddedEvent;
// Event will be null if there are no subscribers
var raiseEvent = TileAdded;
if (raiseEvent != null)
{
// Call to raise the event.
raiseEvent(this, e);
}
}
protected virtual void OnRaiseOverlayAddedEvent(OverlayAddedEventArgs e)
{
// Make a temporary copy of the event to avoid possibility of
// a race condition if the last subscriber unsubscribes
// immediately after the null check and before the event is raised.
EventHandler<OverlayAddedEventArgs> raiseEvent = RaiseOverlayAddedEvent;
// Event will be null if there are no subscribers
var raiseEvent = OverlayAdded;
if (raiseEvent != null)
{
raiseEvent(this, e);
}
}
protected virtual void OnRaiseWallAddedEvent(WallAddedEventArgs e)
{
var raiseEvent = WallAdded
;
if (raiseEvent != null)
{
raiseEvent(this, e);
}
}
protected virtual void OnRaiseWallDeletedEvent(WallDeletedEventArgs e)
{
var raiseEvent = WallDeleted;
if (raiseEvent != null)
{
raiseEvent(this, e);
}
}
protected virtual void OnRaiseOverlayDeletedEvent(OverlayDeletedEventArgs e)
{
var raiseEvent = OverlayDeleted;
if (raiseEvent != null)
{
raiseEvent(this, e);
}
}
protected virtual void OnRaiseTileDeletedEvent(TileDeletedEventArgs e)
{
var raiseEvent = TileDeleted;
if (raiseEvent != null)
{
// Call to raise the event.
raiseEvent(this, e);
}
}