merged from develop

This commit is contained in:
Dylan Wilson
2018-05-23 22:51:45 +10:00
6 changed files with 11 additions and 8 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ site/
# Cake
tools/
# NuGet Package
# NuGet Packages
artifacts/
# Rider
+4
View File
@@ -0,0 +1,4 @@
mode: ContinuousDeployment
branches: {}
ignore:
sha: []
@@ -44,8 +44,8 @@ namespace MonoGame.Extended.Content.Pipeline.Tiled
{
var reciprocalWidth = 1f / ImageSize.Width;
var reciprocalHeight = 1f / ImageSize.Height;
texelLeft = (sourceRectangle1.X + 0.5f) * reciprocalWidth;
texelTop = (sourceRectangle1.Y + 0.5f) * reciprocalHeight;
texelLeft = sourceRectangle1.X * reciprocalWidth;
texelTop = sourceRectangle1.Y * reciprocalHeight;
texelRight = (sourceRectangle1.X + sourceRectangle1.Width) * reciprocalWidth;
texelBottom = (sourceRectangle1.Y + sourceRectangle1.Height) * reciprocalHeight;
}
@@ -228,7 +228,6 @@ namespace MonoGame.Extended.Entities
internal void MarkEntityToBeRemoved(Entity entity)
{
Debug.Assert(entity != null);
Debug.Assert(entity != null);
entity.WaitingToBeRemoved = true;
@@ -26,8 +26,8 @@ namespace MonoGame.Extended.Graphics.Geometry
if (sourceRectangle.Width > 0)
{
texelLeft = (sourceRectangle.X + 0.5f) / texture.Width;
texelTop = (sourceRectangle.Y + 0.5f) / texture.Height;
texelLeft = sourceRectangle.X / texture.Width;
texelTop = sourceRectangle.Y / texture.Height;
texelRight = (sourceRectangle.X + sourceRectangle.Width) / (float)texture.Width;
texelBottom = (sourceRectangle.Y + sourceRectangle.Height) / (float)texture.Height;
}
@@ -21,8 +21,8 @@ namespace MonoGame.Extended.Tiled
{
var sourceRectangle = tileset.GetTileRegion(LocalTileIdentifier);
var texture = tileset.Texture;
var texelLeft = (sourceRectangle.X + 0.5f) / texture.Width;
var texelTop = (sourceRectangle.Y + 0.5f) / texture.Height;
var texelLeft = sourceRectangle.X / texture.Width;
var texelTop = sourceRectangle.Y / texture.Height;
var texelRight = (sourceRectangle.X + sourceRectangle.Width) / (float)texture.Width;
var texelBottom = (sourceRectangle.Y + sourceRectangle.Height) / (float)texture.Height;