cleanup and sentry integration
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
Michele Scandura
parent
98e5f6bc89
commit
b671c661a7
21 changed files with 89 additions and 88 deletions
|
|
@ -3,24 +3,17 @@ using Microsoft.Xna.Framework;
|
|||
using Microsoft.Xna.Framework.Graphics;
|
||||
using Microsoft.Xna.Framework.Input;
|
||||
using MonoGame.Extended;
|
||||
using MonoGame.Extended.VectorDraw;
|
||||
using Myra;
|
||||
using Myra.Graphics2D.Brushes;
|
||||
using Myra.Graphics2D.TextureAtlases;
|
||||
using Myra.Graphics2D.UI;
|
||||
using Myra.Graphics2D.UI.File;
|
||||
using Myra.Graphics2D.UI.Properties;
|
||||
using Myra.Utility;
|
||||
using Newtonsoft.Json;
|
||||
using Sledgemapper.Shared.Entities;
|
||||
using Sledgemapper.UI;
|
||||
using System;
|
||||
using System.Buffers;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AsyncAwaitBestPractices;
|
||||
using TinyMessenger;
|
||||
|
|
@ -43,7 +36,6 @@ namespace Sledgemapper
|
|||
private readonly Session _sessionData;
|
||||
private RenderTarget2D rendertarget;
|
||||
private MainWidget _mainWidget;
|
||||
private readonly Settings _settings;
|
||||
private readonly TinyMessengerHub _messenger;
|
||||
|
||||
public Sledgemapper()
|
||||
|
|
@ -66,7 +58,7 @@ namespace Sledgemapper
|
|||
_communicationManager.Connection.Reconnecting += OnHubReconnecting;
|
||||
_communicationManager.Connection.Closed += OnHubDisconnected;
|
||||
_state = State.Instance;
|
||||
_settings = new Settings();
|
||||
|
||||
_vector2Pool = ArrayPool<Vector2>.Create();
|
||||
_messenger = new TinyMessengerHub();
|
||||
}
|
||||
|
|
@ -196,7 +188,7 @@ namespace Sledgemapper
|
|||
ResetRenderTarget();
|
||||
|
||||
|
||||
_mainWidget = new MainWidget(_communicationManager, _settings, _messenger, Window);
|
||||
_mainWidget = new MainWidget(_communicationManager, _messenger, Window);
|
||||
|
||||
|
||||
|
||||
|
|
@ -689,7 +681,7 @@ namespace Sledgemapper
|
|||
continue;
|
||||
}
|
||||
|
||||
if ((gameTime.TotalGameTime.TotalMilliseconds - ping.StartTime) > _settings.PingDuration)
|
||||
if ((gameTime.TotalGameTime.TotalMilliseconds - ping.StartTime) > Settings.Instance.PingDuration)
|
||||
{
|
||||
_sessionData.Pings.TryRemove(guid, out var _);
|
||||
}
|
||||
|
|
@ -732,7 +724,7 @@ namespace Sledgemapper
|
|||
var endposY = _state.SelectedSnapPoint.Y * _state.TileSize;
|
||||
if (_state.InsertMode == InsertMode.NewDelete)
|
||||
{
|
||||
var ww = _state.TileSize / _settings.TileDeleteDivider;
|
||||
var ww = _state.TileSize / Settings.Instance.TileDeleteDivider;
|
||||
if (posX == endposX) { endposX += ww; posX -= ww; }
|
||||
if (posY == endposY) { endposY += ww; posY -= ww; }
|
||||
}
|
||||
|
|
@ -985,11 +977,11 @@ namespace Sledgemapper
|
|||
outlineShader.Parameters["ImageSize"].SetValue(texelSize);
|
||||
outlineShader.Parameters["BorderSize"].SetValue((int)(_state.TileSize / 100f * 10f));
|
||||
|
||||
outlineShader.Parameters["R"].SetValue(_settings.OverlayTintColor.R / 255.0f);
|
||||
outlineShader.Parameters["G"].SetValue(_settings.OverlayTintColor.G / 255.0f);
|
||||
outlineShader.Parameters["B"].SetValue(_settings.OverlayTintColor.B / 255.0f);
|
||||
outlineShader.Parameters["R"].SetValue(Settings.Instance.OverlayTintColor.R / 255.0f);
|
||||
outlineShader.Parameters["G"].SetValue(Settings.Instance.OverlayTintColor.G / 255.0f);
|
||||
outlineShader.Parameters["B"].SetValue(Settings.Instance.OverlayTintColor.B / 255.0f);
|
||||
|
||||
GraphicsDevice.Clear(_settings.BackgroundColor);
|
||||
GraphicsDevice.Clear(Settings.Instance.BackgroundColor);
|
||||
|
||||
_spriteBatch.Begin(
|
||||
effect: outlineShader,
|
||||
|
|
@ -1093,7 +1085,7 @@ namespace Sledgemapper
|
|||
posX1, posY1,
|
||||
posX2,
|
||||
posY2,
|
||||
_settings.GridColor);
|
||||
Settings.Instance.GridColor);
|
||||
}
|
||||
|
||||
for (var i = -1; i < visibleTilesY + 2; i++)
|
||||
|
|
@ -1110,7 +1102,7 @@ namespace Sledgemapper
|
|||
_spriteBatch.DrawLine(posX1, posY1,
|
||||
posX2,
|
||||
posY2,
|
||||
_settings.GridColor);
|
||||
Settings.Instance.GridColor);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1170,7 +1162,7 @@ namespace Sledgemapper
|
|||
note.X * _state.TileSize + _state.TileSize - (int)(_state.TileSize / 2),
|
||||
note.Y * _state.TileSize + _state.TileSize / 8,
|
||||
(int)(_state.TileSize / 2.5), (int)(_state.TileSize / 2.5 / 1.136)
|
||||
), _settings.NoteColor
|
||||
), Settings.Instance.NoteColor
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -1191,7 +1183,7 @@ namespace Sledgemapper
|
|||
posY = tile.Y * _state.TileSize;
|
||||
|
||||
_spriteBatch.Draw(_spriteSheet.Texture, new Vector2(posX + _state.TileSize / 25, posY + _state.TileSize / 25), spriteRec, Color.Black * .2f, MathHelper.ToRadians(90 * tile.Rotation), new Vector2(spriteRec.Value.Width / 2, spriteRec.Value.Height / 2), ((float)_state.TileSize - 10) / spriteRec.Value.Width, SpriteEffects.None, 0);
|
||||
_spriteBatch.Draw(_spriteSheet.Texture, new Vector2(posX, posY), spriteRec, _settings.OverlayTintColor, MathHelper.ToRadians(90 * tile.Rotation), new Vector2(spriteRec.Value.Width / 2, spriteRec.Value.Height / 2), ((float)_state.TileSize - 10) / spriteRec.Value.Width, SpriteEffects.None, 0);
|
||||
_spriteBatch.Draw(_spriteSheet.Texture, new Vector2(posX, posY), spriteRec, Settings.Instance.OverlayTintColor, MathHelper.ToRadians(90 * tile.Rotation), new Vector2(spriteRec.Value.Width / 2, spriteRec.Value.Height / 2), ((float)_state.TileSize - 10) / spriteRec.Value.Width, SpriteEffects.None, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1200,7 +1192,7 @@ namespace Sledgemapper
|
|||
}
|
||||
|
||||
_spriteBatch.Draw(_spriteSheet.Texture, new Vector2(posX + _state.TileSize / 25, posY + _state.TileSize / 25), spriteRec, Color.Black * .2f, MathHelper.ToRadians(90 * tile.Rotation), new Vector2(spriteRec.Value.Width / 2, spriteRec.Value.Height / 2), ((float)_state.TileSize - 10) / spriteRec.Value.Width, SpriteEffects.None, 0);
|
||||
_spriteBatch.Draw(_spriteSheet.Texture, new Vector2(posX, posY), spriteRec, _settings.OverlayTintColor, MathHelper.ToRadians(90 * tile.Rotation), new Vector2(spriteRec.Value.Width / 2, spriteRec.Value.Height / 2), ((float)_state.TileSize - 10) / spriteRec.Value.Width, SpriteEffects.None, 0);
|
||||
_spriteBatch.Draw(_spriteSheet.Texture, new Vector2(posX, posY), spriteRec, Settings.Instance.OverlayTintColor, MathHelper.ToRadians(90 * tile.Rotation), new Vector2(spriteRec.Value.Width / 2, spriteRec.Value.Height / 2), ((float)_state.TileSize - 10) / spriteRec.Value.Width, SpriteEffects.None, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1642,7 +1634,7 @@ namespace Sledgemapper
|
|||
var endposY = tile.End.Y * _state.TileSize;
|
||||
|
||||
|
||||
var ww = _state.TileSize / _settings.TileDeleteDivider;
|
||||
var ww = _state.TileSize / Settings.Instance.TileDeleteDivider;
|
||||
if (posX == endposX) { endposX += ww; posX -= ww; }
|
||||
if (posY == endposY) { endposY += ww; posY -= ww; }
|
||||
switch (tile.Start.Index)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue