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

progress

Browse source
This commit is contained in:
Michele Scandura 2020-11-17 15:16:14 +00:00
parent 9ef43bb9f6
commit 0a4b8ebeb2
14 changed files with 157 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Sledgemapper/Sledgemapper.cs
View file

@ -38,10 +38,10 @@ namespace Sledgemapper
public Sledgemapper()
{
_graphics = new GraphicsDeviceManager(this);
_graphics.GraphicsProfile = GraphicsProfile.Reach;
_graphics.PreferMultiSampling = false;
//GraphicsDevice?.PresentationParameters.MultiSampleCount = 8;
_graphics.GraphicsProfile = GraphicsProfile.Reach;
_graphics.PreferMultiSampling = false;
//GraphicsDevice?.PresentationParameters.MultiSampleCount = 8;
Content.RootDirectory = "Content";
_desktop = new Desktop();
@ -91,9 +91,11 @@ namespace Sledgemapper
_mainWidget.MenuConnectLogin.Selected += OnMenuConnectLoginSelected;
_mainWidget.MenuConnectNew.Selected += OnMenuConnectNewSelected;
_mainWidget.MenuConnectJoin.Selected += OnMenuConnectJoinSelected;
_mainWidget.MenuConnectUpload.Selected += OnMenuConnectUploadSelected;
_mainWidget.MenuConnectNew.Enabled = false;
_mainWidget.MenuConnectJoin.Enabled = false;
_mainWidget.MenuConnectSync.Enabled = false;
_mainWidget.MenuConnectUpload.Enabled = false;
AddItemToToolGrid(_mainWidget.GridTiles, OnTileButtonClicked, "tiles");
AddItemToToolGrid(_mainWidget.GridWalls, OnWallButtonClicked, "walls");
@ -140,7 +142,7 @@ namespace Sledgemapper
{
_state._selectedTile.X = _state._hoveredTile.X;
_state._selectedTile.Y = _state._hoveredTile.Y;
_communicationManager.Connection?.SendAsync("UpdatePosition", _sessionData.SessionName, _state._selectedTile);
_communicationManager.Connection?.SendAsync("UpdatePosition", _sessionData.SessionName, _sessionData.SessionId, _state._selectedTile);
}
if (newState.IsKeyDown(Keys.LeftControl)
@ -152,7 +154,7 @@ namespace Sledgemapper
case InsertMode.Tile:
_state._selectedTile.X = _state._hoveredTile.X;
_state._selectedTile.Y = _state._hoveredTile.Y;
_communicationManager.Connection?.SendAsync("UpdatePosition", _sessionData.SessionName, _state._selectedTile);
_communicationManager.Connection?.SendAsync("UpdatePosition", _sessionData.SessionName, _sessionData.SessionId, _state._selectedTile);
_sessionData.NewTile(_state._selectedTile, _state._currentTileId);
break;
@ -258,7 +260,7 @@ namespace Sledgemapper
if (string.IsNullOrWhiteSpace(_sessionData.SessionName))
{
_spriteBatch.DrawRectangle(new Rectangle((_state._selectedTile.X * _state._tileSize)-2,(_state._selectedTile.Y * _state._tileSize)-2, _state._tileSize + 3, _state._tileSize + 3), Color.Red, 2);
_spriteBatch.DrawRectangle(new Rectangle((_state._selectedTile.X * _state._tileSize) - 2, (_state._selectedTile.Y * _state._tileSize) - 2, _state._tileSize + 3, _state._tileSize + 3), Color.Red, 2);
}
DrawPlayers();
@ -432,9 +434,13 @@ namespace Sledgemapper
_sessionData.Map = result.Map;
_sessionData.Walls = result.Walls;
_sessionData.Overlays = result.Overlays;
_sessionData.MapEntityAdded -= OnMapEntityAdded;
_sessionData.MapEntityDeleted -= OnMapEntityDeleted;
_sessionData.MapEntityAdded += OnMapEntityAdded;
_sessionData.MapEntityDeleted += OnMapEntityDeleted;
_sessionData.SessionId = result.SessionId;
_sessionData.SessionName = result.SessionName;
}
successful = result != null;
}
@ -475,19 +481,24 @@ namespace Sledgemapper
{
var result = await _communicationManager.Api.NewSession(localContent.TxtSession.Text);
// var session = await _communicationManager.Connection?.InvokeAsync<Session>("NewSession", localContent.TxtSession.Text, _authResponse.Initials);
// var session = await _communicationManager.Connection?.InvokeAsync<Session>("NewSession", localContent.TxtSession.Text, _authResponse.Initials);
if (result)
{
//_sessionData;
_sessionData.SessionName = localContent.TxtSession.Text;
_sessionData.MapEntityAdded -= OnMapEntityAdded;
_sessionData.MapEntityDeleted -= OnMapEntityDeleted;
_sessionData.MapEntityAdded += OnMapEntityAdded;
// _sessionData.Players = session.Players;
_sessionData.MapEntityDeleted += OnMapEntityDeleted;
// _sessionData.Players = session.Players;
}
successful = result;
var result2 = await _communicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text);
_sessionData.SessionId = result2.SessionId;
_sessionData.SessionName = localContent.TxtSession.Text;
}
catch (Exception ex)
{
@ -524,7 +535,7 @@ namespace Sledgemapper
var successful = false;
try
{
_authResponse = await _communicationManager.Login(new AuthenticateModel
{
Username = localContent.TxtEmail.Text,
@ -688,9 +699,19 @@ namespace Sledgemapper
private async void OnMenuConnectSyncSelected(object sender, EventArgs e)
{
// await _communicationManager.Connection?.InvokeAsync("Sync", _sessionData.SessionName, _sessionData);
var serverMap = await _communicationManager.Api.Session(_sessionData.SessionName);
// await _communicationManager.Connection?.InvokeAsync("Sync", _sessionData.SessionName, _sessionData);
var serverMap = await _communicationManager.Api.Session(_sessionData.SessionName);
_sessionData.Overlays = serverMap.Overlays;
_sessionData.Map = serverMap.Map;
_sessionData.Walls = serverMap.Walls;
}
private async void OnMenuConnectUploadSelected(object sender, EventArgs e)
{
await _communicationManager.Api.SaveSnapshot(_sessionData, _sessionData.SessionName);
// _sessionData.Overlays = serverMap.Overlays;
// _sessionData.Map = serverMap.Map;
// _sessionData.Walls = serverMap.Walls;
}
private void OnMenuConnectNewSelected(object sender, EventArgs e)