diff --git a/Sledgemapper.Api/LocalDatabase.db b/Sledgemapper.Api/LocalDatabase.db deleted file mode 100644 index e8db702..0000000 Binary files a/Sledgemapper.Api/LocalDatabase.db and /dev/null differ diff --git a/Sledgemapper.Api/db/LocalDatabase.db b/Sledgemapper.Api/db/LocalDatabase.db index e25ecdd..e311919 100644 Binary files a/Sledgemapper.Api/db/LocalDatabase.db and b/Sledgemapper.Api/db/LocalDatabase.db differ diff --git a/Sledgemapper.Api/sledgemapper.db b/Sledgemapper.Api/sledgemapper.db index 7c9664a..0ef8b39 100644 Binary files a/Sledgemapper.Api/sledgemapper.db and b/Sledgemapper.Api/sledgemapper.db differ diff --git a/Sledgemapper/CommunicationManager.cs b/Sledgemapper/CommunicationManager.cs index ea28c64..f413969 100644 --- a/Sledgemapper/CommunicationManager.cs +++ b/Sledgemapper/CommunicationManager.cs @@ -1,9 +1,11 @@ using Microsoft.AspNetCore.SignalR.Client; +using Microsoft.Extensions.Configuration; using Polly; using Refit; using Sledgemapper.Shared.Entities; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Net; using System.Net.Http; @@ -23,26 +25,27 @@ namespace Sledgemapper public CommunicationManager(Session sessionData) { + +#if DEBUG + var baseAddress = "http://localhost:5000"; +#else + var baseAddress = "http://hub.michelescandura.com:5000"; +#endif + SessionData = sessionData; Connection = new HubConnectionBuilder() .WithAutomaticReconnect() - //.WithUrl("http://hub.michelescandura.com:5001/SledgemapperHub") - - //.WithUrl("http://localhost:5001/SledgemapperHub", options => - .WithUrl("http://hub.michelescandura.com:5000/SledgemapperHub", options => - { - options.AccessTokenProvider = () => Task.FromResult(_authenticateResponse.Token); - }) + .WithUrl($"{baseAddress}/SledgemapperHub", options => + { + options.AccessTokenProvider = () => Task.FromResult(_authenticateResponse.Token); + }) .Build(); - - Api = RestService.For( new HttpClient(new AuthenticatedHttpClientHandler(GetToken)) { - BaseAddress = new Uri("http://hub.michelescandura.com:5000") - // BaseAddress = new Uri("http://localhost:5001") + BaseAddress = new Uri(baseAddress) } ); diff --git a/Sledgemapper/Sledgemapper.cs b/Sledgemapper/Sledgemapper.cs index 0fc5b3a..77d729c 100644 --- a/Sledgemapper/Sledgemapper.cs +++ b/Sledgemapper/Sledgemapper.cs @@ -659,34 +659,46 @@ namespace Sledgemapper private void DrawPlayers() { - foreach (var player in _sessionData.Players.Copy()) + try { - - var color = player.Color.ToColor(); - _spriteBatch.DrawRectangle(new Rectangle(player.Position.X * _state.TileSize - 4, player.Position.Y * _state.TileSize - 4, _state.TileSize + 7, _state.TileSize + 7), color, 2); - - var ffont = _fonts.FirstOrDefault(m => int.Parse(m.Key.Replace("font", "")) > _state.TileSize).Value ?? _fonts.Last().Value; - - var fscale = _state.TileSize / ((float)ffont.LineSpacing * 2); - _spriteBatch.DrawString(ffont, - player.Initials, - new Vector2(player.Position.X * _state.TileSize + 2, player.Position.Y * _state.TileSize + _state.TileSize - 2 - ffont.LineSpacing * fscale), - color, - 0, - Vector2.Zero, - fscale, - SpriteEffects.None, - 0); - } - - - foreach (var player in _sessionData.Players.Copy()) - { - var isOffscreen = IsOffscreen(player.Position); - if (isOffscreen) + foreach (var player in _sessionData.Players.Copy()) { - DrawPlayerPointer(player); + + var color = player.Color.ToColor(); + _spriteBatch.DrawRectangle(new Rectangle(player.Position.X * _state.TileSize - 4, player.Position.Y * _state.TileSize - 4, _state.TileSize + 7, _state.TileSize + 7), color, 2); + + foreach (var font in _fonts.Keys) + { + System.Console.WriteLine(font); + } + + var ffont = _fonts.FirstOrDefault(m => int.Parse(m.Key.Replace("font", "")) > _state.TileSize).Value ?? _fonts.Last().Value; + + var fscale = _state.TileSize / ((float)ffont.LineSpacing * 2); + _spriteBatch.DrawString(ffont, + player.Initials, + new Vector2(player.Position.X * _state.TileSize + 2, player.Position.Y * _state.TileSize + _state.TileSize - 2 - ffont.LineSpacing * fscale), + color, + 0, + Vector2.Zero, + fscale, + SpriteEffects.None, + 0); } + + + foreach (var player in _sessionData.Players.Copy()) + { + var isOffscreen = IsOffscreen(player.Position); + if (isOffscreen) + { + DrawPlayerPointer(player); + } + } + } + catch (Exception ex) + { + System.Console.WriteLine(ex.Message); } } diff --git a/Sledgemapper/Sledgemapper.csproj b/Sledgemapper/Sledgemapper.csproj index 4577a71..5c9b639 100644 --- a/Sledgemapper/Sledgemapper.csproj +++ b/Sledgemapper/Sledgemapper.csproj @@ -20,6 +20,12 @@ app.manifest Icon.ico + + DEBUG;TRACE + + + TRACE + @@ -36,6 +42,7 @@ --> + diff --git a/Sledgemapper/Utils.cs b/Sledgemapper/Utils.cs index 6a0cfd5..089dc65 100644 --- a/Sledgemapper/Utils.cs +++ b/Sledgemapper/Utils.cs @@ -18,10 +18,12 @@ namespace Sledgemapper public static Color ToColor(this string s) { + System.Console.WriteLine(s); var hexs = s.TrimStart('#').Split(2).ToArray(); var color = new Color(int.Parse(hexs[0], System.Globalization.NumberStyles.HexNumber), int.Parse(hexs[1], System.Globalization.NumberStyles.HexNumber), int.Parse(hexs[2], System.Globalization.NumberStyles.HexNumber)); + System.Console.WriteLine(color); return color; } }