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

refactoring and cleanup

Browse source
This commit is contained in:
Michele 2020-11-08 14:39:57 +00:00
parent 777608941b
commit 535c420952
8 changed files with 212 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Sledgemapper/Sledgemapper.cs
View file

@ -276,6 +276,8 @@ namespace Sledgemapper
var session = await connection?.InvokeAsync<SessionData>("NewSession", textbox.Text, initialsTextbox.Text);
if (session != null)
{
session.RaiseTileAddedEvent += TileAddedEvent;
session.RaiseOverlayAddedEvent += OverlayAddedEvent;
Players = session.Players;
}
@ -400,6 +402,8 @@ namespace Sledgemapper
return menu;
}
protected override void LoadContent()
{
_spriteBatch = new SpriteBatch(GraphicsDevice);
@ -930,62 +934,22 @@ namespace Sledgemapper
private void SetTile(string tileId)
{
var tileExist = _sessionData.Map.TryGetValue(_selectedTile.ToString(), out var rtile);
if (tileExist)
{
var get = _sessionData.Map.TryGetValue(_selectedTile.ToString(), out var tile);
_sessionData.NewTile(_selectedTile, tileId);
}
_sessionData.Map.TryRemove(tile.ToString(), out var rrtile);
if (tile.ID == tileId)
{
var newTile = new Tile { X = _selectedTile.X, Y = _selectedTile.Y, ID = tileId, Rotation = (tile.Rotation + 1) % 4 };
_sessionData.Map.TryAdd(newTile.ToString(), newTile);
_api.NewTile(newTile, _session);
//connection?.InvokeAsync("NewTile", _session, newTile);
}
else
{
var newTile = new Tile { X = _selectedTile.X, Y = _selectedTile.Y, ID = tileId };
_sessionData.Map.TryAdd(newTile.ToString(), newTile);
_api.NewTile(newTile, _session);
// connection?.InvokeAsync("NewTile", _session, newTile);
}
}
else
{
var newTile = new Tile { X = _selectedTile.X, Y = _selectedTile.Y, ID = tileId };
_sessionData.Map.TryAdd(newTile.ToString(), newTile);
_api.NewTile(newTile, _session);
// connection?.InvokeAsync("NewTile", _session, newTile);
}
private void TileAddedEvent(object sender, TileAddedEventArgs e)
{
_api.NewTile(e.Tile, _session);
}
private void SetOverlay(string tileId)
{
var overlayExist = _sessionData.Overlays.TryGetValue(_selectedOverlay.ToString(), out var tile);
if (overlayExist)
{
var exist = _sessionData.Overlays.TryGetValue(_selectedOverlay.ToString(), out var overlay);
_sessionData.Overlays.TryRemove(tile.ToString(), out var rrtile);
if (overlay.ID == tileId)
{
var newOverlay = new Overlay { X = overlay.X, Y = overlay.Y, ID = tileId, Intersection = overlay.Intersection, Rotation = (overlay.Rotation + 1) % 4 };
_sessionData.Overlays.TryAdd(newOverlay.ToString(), newOverlay);
connection?.InvokeAsync("NewOverlay", _session, newOverlay);
}
else
{
var newOverlay = new Overlay { X = _selectedOverlay.X, Y = _selectedOverlay.Y, ID = tileId, Intersection = _selectedOverlay.Intersection };
_sessionData.Overlays.TryAdd(newOverlay.ToString(), newOverlay);
connection?.InvokeAsync("NewOverlay", _session, newOverlay);
}
}
else
{
var newOverlay = new Overlay { X = _selectedOverlay.X, Y = _selectedOverlay.Y, ID = tileId, Intersection = _selectedOverlay.Intersection };
_sessionData.Overlays.TryAdd(newOverlay.ToString(), newOverlay);
connection?.InvokeAsync("NewOverlay", _session, newOverlay);
}
_sessionData.NewOverlay(_selectedOverlay, tileId);
}
private void OverlayAddedEvent(object sender, OverlayAddedEventArgs e)
{
_api.NewOverlay(e.Overlay, _session);
}
private void DeleteWall()