From de4d820447fc9a64b6b2aabbdb9acb6e4206d41d Mon Sep 17 00:00:00 2001 From: witlock Date: Sun, 6 Oct 2019 15:59:43 +0300 Subject: [PATCH 1/3] removed unused lines --- .../Assets/Tiled/Runtime/TiledRendering.cs | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs b/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs index d704222c4..8f380c23d 100644 --- a/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs +++ b/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs @@ -221,21 +221,19 @@ public static void RenderObjectGroup(TmxObjectGroup objGroup, Batcher batcher, V pos.Y -= size * 0.5f; batcher.DrawPixel(pos, objGroup.Color, (int)size); goto default; - case TmxObjectType.Tile: - var tx = obj.Tile.X * objGroup.Map.TileWidth * scale.X; - var ty = obj.Tile.Y * objGroup.Map.TileHeight * scale.Y; - - var spriteEffects = SpriteEffects.None; - if (obj.Tile.HorizontalFlip) - spriteEffects |= SpriteEffects.FlipHorizontally; - if (obj.Tile.VerticalFlip) - spriteEffects |= SpriteEffects.FlipVertically; - - var tileset = objGroup.Map.GetTilesetForTileGid(obj.Tile.Gid); - var sourceRect = tileset.TileRegions[obj.Tile.Gid]; - batcher.Draw(tileset.Image.Texture, pos, sourceRect, Color.White, 0, Vector2.Zero, scale, spriteEffects, layerDepth); - goto default; - case TmxObjectType.Ellipse: + case TmxObjectType.Tile: + var spriteEffects = SpriteEffects.None; + if (obj.Tile.HorizontalFlip) + spriteEffects |= SpriteEffects.FlipHorizontally; + if (obj.Tile.VerticalFlip) + spriteEffects |= SpriteEffects.FlipVertically; + + var tileset = objGroup.Map.GetTilesetForTileGid(obj.Tile.Gid); + var sourceRect = tileset.TileRegions[obj.Tile.Gid]; + pos.Y -= obj.Tile.TilesetTile.Image.Height; + batcher.Draw(obj.Tile.TilesetTile.Image.Texture, pos, sourceRect, Color.White, 0, Vector2.Zero, scale, spriteEffects, layerDepth); + goto default; + case TmxObjectType.Ellipse: pos = new Vector2(obj.X + obj.Width * 0.5f, obj.Y + obj.Height * 0.5f) * scale; batcher.DrawCircle(pos, obj.Width * 0.5f, objGroup.Color); goto default; From 4a9770de8e3f010e8ffaa80fe0e765417115e4df Mon Sep 17 00:00:00 2001 From: witlock Date: Sun, 6 Oct 2019 15:59:31 +0300 Subject: [PATCH 2/3] format --- .../Assets/Tiled/Runtime/TiledRendering.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs b/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs index 8f380c23d..ee266c7b7 100644 --- a/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs +++ b/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs @@ -221,18 +221,18 @@ public static void RenderObjectGroup(TmxObjectGroup objGroup, Batcher batcher, V pos.Y -= size * 0.5f; batcher.DrawPixel(pos, objGroup.Color, (int)size); goto default; - case TmxObjectType.Tile: - var spriteEffects = SpriteEffects.None; - if (obj.Tile.HorizontalFlip) - spriteEffects |= SpriteEffects.FlipHorizontally; - if (obj.Tile.VerticalFlip) - spriteEffects |= SpriteEffects.FlipVertically; - - var tileset = objGroup.Map.GetTilesetForTileGid(obj.Tile.Gid); - var sourceRect = tileset.TileRegions[obj.Tile.Gid]; - pos.Y -= obj.Tile.TilesetTile.Image.Height; - batcher.Draw(obj.Tile.TilesetTile.Image.Texture, pos, sourceRect, Color.White, 0, Vector2.Zero, scale, spriteEffects, layerDepth); - goto default; + case TmxObjectType.Tile: + var spriteEffects = SpriteEffects.None; + if (obj.Tile.HorizontalFlip) + spriteEffects |= SpriteEffects.FlipHorizontally; + if (obj.Tile.VerticalFlip) + spriteEffects |= SpriteEffects.FlipVertically; + + var tileset = objGroup.Map.GetTilesetForTileGid(obj.Tile.Gid); + var sourceRect = tileset.TileRegions[obj.Tile.Gid]; + pos.Y -= obj.Tile.TilesetTile.Image.Height; + batcher.Draw(obj.Tile.TilesetTile.Image.Texture, pos, sourceRect, Color.White, 0, Vector2.Zero, scale, spriteEffects, layerDepth); + goto default; case TmxObjectType.Ellipse: pos = new Vector2(obj.X + obj.Width * 0.5f, obj.Y + obj.Height * 0.5f) * scale; batcher.DrawCircle(pos, obj.Width * 0.5f, objGroup.Color); From 6946c1205784cb660f0120acf997166900a9d629 Mon Sep 17 00:00:00 2001 From: witlock Date: Sun, 6 Oct 2019 16:05:18 +0300 Subject: [PATCH 3/3] format --- Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs b/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs index ee266c7b7..914fefbfa 100644 --- a/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs +++ b/Nez.Portable/Assets/Tiled/Runtime/TiledRendering.cs @@ -233,7 +233,7 @@ public static void RenderObjectGroup(TmxObjectGroup objGroup, Batcher batcher, V pos.Y -= obj.Tile.TilesetTile.Image.Height; batcher.Draw(obj.Tile.TilesetTile.Image.Texture, pos, sourceRect, Color.White, 0, Vector2.Zero, scale, spriteEffects, layerDepth); goto default; - case TmxObjectType.Ellipse: + case TmxObjectType.Ellipse: pos = new Vector2(obj.X + obj.Width * 0.5f, obj.Y + obj.Height * 0.5f) * scale; batcher.DrawCircle(pos, obj.Width * 0.5f, objGroup.Color); goto default;