From 356ed25ec6552d49714f2581954840f17717a9ce Mon Sep 17 00:00:00 2001
From: Darren Reid <darren.j.reid@gmail.com>
Date: Sat, 26 Sep 2015 17:20:08 +1000
Subject: [PATCH 1/3] First isometric render pass

---
 .../TestData/isometric.tmx                    |  76 ++++++++++++++++++
 .../TestData/isometric_tileset.png            | Bin 0 -> 4599 bytes
 .../TiledMapImporterProcessorTests.cs         |   2 +
 .../Tiled/TiledMapWriter.cs                   |   4 +-
 .../MonoGame.Extended/Maps/Tiled/TiledMap.cs  |  12 +--
 .../Maps/Tiled/TiledMapOrientation.cs         |  14 ++++
 .../Maps/Tiled/TiledMapReader.cs              |   3 +-
 .../Maps/Tiled/TiledTileLayer.cs              |  76 +++++++++++++++---
 .../MonoGame.Extended.csproj                  |   1 +
 Source/Sandbox/Content/Content.mgcb           |  25 ++++--
 Source/Sandbox/Content/isometric.tmx          |  55 +++++++++++++
 Source/Sandbox/Content/isometric_tileset.png  | Bin 0 -> 4599 bytes
 12 files changed, 242 insertions(+), 26 deletions(-)
 create mode 100644 Source/MonoGame.Extended.Content.Pipeline.Tests/TestData/isometric.tmx
 create mode 100644 Source/MonoGame.Extended.Content.Pipeline.Tests/TestData/isometric_tileset.png
 create mode 100644 Source/MonoGame.Extended/Maps/Tiled/TiledMapOrientation.cs
 create mode 100644 Source/Sandbox/Content/isometric.tmx
 create mode 100644 Source/Sandbox/Content/isometric_tileset.png

diff --git a/Source/MonoGame.Extended.Content.Pipeline.Tests/TestData/isometric.tmx b/Source/MonoGame.Extended.Content.Pipeline.Tests/TestData/isometric.tmx
new file mode 100644
index 00000000..3f3168c7
--- /dev/null
+++ b/Source/MonoGame.Extended.Content.Pipeline.Tests/TestData/isometric.tmx
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="isometric" width="40" height="40" tilewidth="64" tileheight="32">
+ <tileset firstgid="1" name="Isometric Tileset" tilewidth="64" tileheight="128">
+  <image source="isometric_tileset.png" width="128" height="128"/>
+  <tile id="0">
+   <properties>
+    <property name="obstacle" value="1"/>
+   </properties>
+  </tile>
+ </tileset>
+ <layer name="Ground" width="40" height="40">
+  <data encoding="csv">
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,1,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,1,1,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,1,2,1,1,2,1,0,0,0,0,0,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,2,2,2,2,1,1,0,0,2,0,0,0,0,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,1,0,0,0,0,0,0,0,0,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,2,2,2,2,2,2,1,0,0,0,0,0,2,0,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,1,2,2,2,2,2,1,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,1,1,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,0,0,1,1,1,2,2,2,0,0,0,0,0,2,0,0,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,0,0,2,1,2,2,2,2,2,0,0,0,0,0,0,0,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,0,2,2,1,1,0,2,2,0,0,0,0,0,0,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,1,2,2,2,1,1,0,2,0,0,0,0,0,0,0,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,2,2,2,2,2,1,2,0,0,0,0,0,0,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,2,2,2,1,2,1,2,2,2,1,1,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,1,2,2,1,1,1,2,2,2,1,1,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,1,0,1,0,1,2,2,2,1,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,1,1,1,0,1,1,2,2,1,1,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,1,1,1,2,1,2,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+0,0,0,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,0,0,1,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,0,1,1,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,1,1,1,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+</data>
+ </layer>
+ <objectgroup color="#ffaa00" name="Objects" width="40" height="40">
+  <object x="1261" y="428" width="141" height="74"/>
+  <object type="npc" x="498" y="35" width="156" height="42"/>
+  <object x="576" y="224" width="448" height="128"/>
+  <object x="2183" y="747" width="228" height="96"/>
+  <object name="fddsadsa" type="warp" x="960" y="416" width="192" height="96"/>
+  <object x="1100" y="556" width="138" height="23"/>
+  <object x="218" y="217">
+   <polyline points="0,0 14,-90 36,3"/>
+  </object>
+  <object x="243" y="174">
+   <polyline points="0,0 -17,0"/>
+  </object>
+  <object x="302" y="219">
+   <polyline points="0,0 -2,-91 -36,-94 28,-91"/>
+  </object>
+  <object x="357" y="125">
+   <polyline points="0,0 7,96 41,98"/>
+  </object>
+ </objectgroup>
+</map>
diff --git a/Source/MonoGame.Extended.Content.Pipeline.Tests/TestData/isometric_tileset.png b/Source/MonoGame.Extended.Content.Pipeline.Tests/TestData/isometric_tileset.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c6f1b4ffc44b24f37fc3e71c00973c8da32df89
GIT binary patch
literal 4599
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
TbLcDdTN&V*kp;Zbz$58@FuAXh

literal 0
HcmV?d00001

diff --git a/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs b/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs
index e2146451..e01bd243 100644
--- a/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs
+++ b/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Microsoft.Xna.Framework.Content.Pipeline;
 using MonoGame.Extended.Content.Pipeline.Tiled;
+using MonoGame.Extended.Maps.Tiled;
 using NSubstitute;
 using NUnit.Framework;
 
@@ -28,6 +29,7 @@ namespace MonoGame.Extended.Content.Pipeline.Tests
             Assert.AreEqual("42", map.Properties[0].Value);
             Assert.AreEqual(1, map.Tilesets.Count);
             Assert.AreEqual(3, map.Layers.Count);
+            Assert.AreEqual(TmxOrientation.Orthogonal,map.Orientation);
 
             var tileset = map.Tilesets.First();
             Assert.AreEqual(1, tileset.FirstGid);
diff --git a/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapWriter.cs b/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapWriter.cs
index de68f3fa..6cd0fa90 100644
--- a/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapWriter.cs
+++ b/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapWriter.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using Microsoft.Xna.Framework;
@@ -20,6 +21,7 @@ namespace MonoGame.Extended.Content.Pipeline.Tiled
             writer.Write(map.Height);
             writer.Write(map.TileWidth);
             writer.Write(map.TileHeight);
+            writer.Write(Convert.ToInt32(map.Orientation));
             WriteCustomProperties(writer, map.Properties);
 
             writer.Write(map.Tilesets.Count);
diff --git a/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs b/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs
index bae3f11b..45721d44 100644
--- a/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs
+++ b/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs
@@ -9,7 +9,7 @@ namespace MonoGame.Extended.Maps.Tiled
 {
     public class TiledMap
     {
-        public TiledMap(GraphicsDevice graphicsDevice, int width, int height, int tileWidth, int tileHeight)
+        public TiledMap(GraphicsDevice graphicsDevice, int width, int height, int tileWidth, int tileHeight, TiledMapOrientation orientation)
         {
             Width = width;
             Height = height;
@@ -20,19 +20,21 @@ namespace MonoGame.Extended.Maps.Tiled
             _graphicsDevice = graphicsDevice;
             _layers = new List<TiledLayer>();
             _tilesets = new List<TiledTileset>();
+            Orientation = orientation;
         }
         
         private readonly List<TiledTileset> _tilesets;
         private readonly GraphicsDevice _graphicsDevice;
         private readonly List<TiledLayer> _layers;
         
-        public int Width { get; private set; }
-        public int Height { get; private set; }
-        public int TileWidth { get; private set; }
-        public int TileHeight { get; private set; }
+        public int Width { get; }
+        public int Height { get; }
+        public int TileWidth { get; }
+        public int TileHeight { get; }
         public Color? BackgroundColor { get; set; }
         public TiledRenderOrder RenderOrder { get; set; }
         public TiledProperties Properties { get; private set; }
+        public TiledMapOrientation Orientation { get; }
 
         public IEnumerable<TiledLayer> Layers
         {
diff --git a/Source/MonoGame.Extended/Maps/Tiled/TiledMapOrientation.cs b/Source/MonoGame.Extended/Maps/Tiled/TiledMapOrientation.cs
new file mode 100644
index 00000000..b877c4c5
--- /dev/null
+++ b/Source/MonoGame.Extended/Maps/Tiled/TiledMapOrientation.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MonoGame.Extended.Maps.Tiled
+{
+    public enum TiledMapOrientation
+    {
+        Orthogonal = 1,
+        Isometric = 2,
+        Staggered = 3
+    }
+}
diff --git a/Source/MonoGame.Extended/Maps/Tiled/TiledMapReader.cs b/Source/MonoGame.Extended/Maps/Tiled/TiledMapReader.cs
index ce9c2641..8b3e3933 100644
--- a/Source/MonoGame.Extended/Maps/Tiled/TiledMapReader.cs
+++ b/Source/MonoGame.Extended/Maps/Tiled/TiledMapReader.cs
@@ -16,7 +16,8 @@ namespace MonoGame.Extended.Maps.Tiled
                 width: reader.ReadInt32(),
                 height: reader.ReadInt32(),
                 tileWidth: reader.ReadInt32(),
-                tileHeight: reader.ReadInt32())
+                tileHeight: reader.ReadInt32(),
+                orientation: (TiledMapOrientation)reader.ReadInt32())
             {
                 BackgroundColor = backgroundColor,
                 RenderOrder = renderOrder
diff --git a/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs b/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs
index 32a5e85a..f2f1620e 100644
--- a/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs
+++ b/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs
@@ -54,22 +54,76 @@ namespace MonoGame.Extended.Maps.Tiled
             {
                 var region = _map.GetTileRegion(tile.Id);
 
-                if (region != null)
-                {
-                    // not exactly sure why we need to compensate 1 pixel here. Could be a bug in MonoGame?
-                    var tx = tile.X * (_map.TileWidth - 1);
-                    var ty = tile.Y * (_map.TileHeight - 1);
-                        
-                    _spriteBatch.Draw(region, new Rectangle(tx, ty, region.Width, region.Height), Color.White);
-                }
+                if(region == null) continue;
+
+                RenderLayer(_map, tile, region);
             }
 
             _spriteBatch.End();
         }
-        
+
+        private void RenderLayer(TiledMap map, TiledTile tile, TextureRegion2D region)
+        {
+            switch (map.Orientation)
+            {
+                case TiledMapOrientation.Orthogonal:
+                    RenderOrthogonal(tile,region);
+                    break;
+                case TiledMapOrientation.Isometric:
+                    RenderIsometric(tile, region);
+                    break;
+                case TiledMapOrientation.Staggered:
+                    throw new NotImplementedException("Staggered maps are currently not supported");
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        private void RenderOrthogonal(TiledTile tile, TextureRegion2D region)
+        {
+            // not exactly sure why we need to compensate 1 pixel here. Could be a bug in MonoGame?
+            var tx = tile.X*(_map.TileWidth - 1);
+            var ty = tile.Y*(_map.TileHeight - 1);
+
+            _spriteBatch.Draw(region, new Rectangle(tx, ty, region.Width, region.Height), Color.White);
+        }
+
+        private void RenderIsometric(TiledTile tile, TextureRegion2D region)
+        {
+            //drawPos.X = ((mapObject.Bounds.X) - (Camera.Position.X)) * Camera.Zoom;
+            //drawPos.Y = ((mapObject.Bounds.Y) - (Camera.Position.Y)) * Camera.Zoom;
+
+            ////Currently changing position and rotation when just rotating
+            //float rotation = 0;//MathHelper.ToRadians(mapObject.Rotation); 
+            //Texture2D texture = tileSet.Texture;
+            //Rectangle source = tile.Source;
+            //Color renderColor = mapObjectLayer.OpacityColor;
+            //Vector2 origin = tile.Origin;
+            //var effect = SpriteEffects.None;
+            //SpriteBatch.Draw(texture, drawPos, source, renderColor, rotation, origin, Camera.Zoom,
+            //    effect, 1.0f);
+
+            //nPos.X = ((tile.Bounds.X + tileSet.TileOffsetX + (map.TileWidth / 2)) - (Camera.Position.X)) * Camera.Zoom;
+            //nPos.Y = ((tile.Bounds.Y + tileSet.TileOffsetY + (map.TileHeight / 2)) - (Camera.Position.Y)) * Camera.Zoom;
+
+            //var tx = (tile.X + (_map.TileWidth/2));
+            //var ty = (tile.Y + (_map.TileHeight/2));
+
+            var tx = (tile.X*(_map.TileWidth/2)) - (tile.Y*(_map.TileWidth/2));
+            var ty = (tile.Y*(_map.TileHeight/2)) + (tile.X*(_map.TileHeight/2));
+
+            //var result = new Vector2
+            //{
+            //    X = (mapPosition.X * (map.TileWidth / 2)) - (mapPosition.Y * (map.TileWidth / 2)),
+            //    Y = (mapPosition.Y * (map.TileHeight / 2)) + (mapPosition.X * (map.TileHeight / 2)) - (map.TileHeight / 2)
+            //};
+            _spriteBatch.Draw(region, new Rectangle(tx, ty, region.Width, region.Height), Color.White);
+        }
+
         public TiledTile GetTile(int x, int y)
         {
-            return _tiles[x + y * Width];
+            return _tiles[x + y*Width];
         }
 
         private Func<IEnumerable<TiledTile>> GetRenderOrderFunction()
@@ -115,7 +169,7 @@ namespace MonoGame.Extended.Maps.Tiled
                     yield return GetTile(x, y);
             }
         }
-        
+
         private IEnumerable<TiledTile> GetTilesLeftUp()
         {
             for (var y = Height - 1; y >= 0; y--)
diff --git a/Source/MonoGame.Extended/MonoGame.Extended.csproj b/Source/MonoGame.Extended/MonoGame.Extended.csproj
index 95fcbb28..d8724924 100644
--- a/Source/MonoGame.Extended/MonoGame.Extended.csproj
+++ b/Source/MonoGame.Extended/MonoGame.Extended.csproj
@@ -55,6 +55,7 @@
     <Compile Include="InputListeners\TouchListener.cs" />
     <Compile Include="InputListeners\InputListenerManager.cs" />
     <Compile Include="InputListeners\TouchListenerSettings.cs" />
+    <Compile Include="Maps\Tiled\TiledMapOrientation.cs" />
     <Compile Include="Shapes\Circle.cs" />
     <Compile Include="Sprites\SpriteExtensions.cs" />
     <Compile Include="TextureAtlases\TextureAtlas.cs" />
diff --git a/Source/Sandbox/Content/Content.mgcb b/Source/Sandbox/Content/Content.mgcb
index fdfb056d..feb35e0c 100644
--- a/Source/Sandbox/Content/Content.mgcb
+++ b/Source/Sandbox/Content/Content.mgcb
@@ -6,6 +6,7 @@
 /platform:Windows
 /config:
 /profile:Reach
+/compress:False
 
 #-------------------------------- References --------------------------------#
 
@@ -21,7 +22,6 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:hills.png
 
@@ -36,7 +36,6 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:tmw_desert_spacing.png
 
@@ -48,7 +47,6 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:free-tileset.png
 
@@ -65,7 +63,6 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:test-tileset.png
 
@@ -82,7 +79,6 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:stump.png
 
@@ -119,7 +115,6 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:fireball.png
 
@@ -136,7 +131,6 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:zombie.png
 
@@ -153,7 +147,22 @@
 /processorParam:GenerateMipmaps=False
 /processorParam:PremultiplyAlpha=True
 /processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:Fonts/courier-new-32_0.png
 
+#begin isometric.tmx
+/importer:TiledMapImporter
+/processor:TiledMapProcessor
+/build:isometric.tmx
+
+#begin isometric_tileset.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:TextureFormat=Color
+/build:isometric_tileset.png
+
diff --git a/Source/Sandbox/Content/isometric.tmx b/Source/Sandbox/Content/isometric.tmx
new file mode 100644
index 00000000..00f5ad3f
--- /dev/null
+++ b/Source/Sandbox/Content/isometric.tmx
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="isometric" renderorder="right-down" width="40" height="40" tilewidth="64" tileheight="32" nextobjectid="11">
+ <tileset firstgid="1" name="Isometric Tileset" tilewidth="64" tileheight="128" tilecount="2">
+  <image source="isometric_tileset.png" width="128" height="128"/>
+  <tile id="0">
+   <properties>
+    <property name="obstacle" value="1"/>
+   </properties>
+  </tile>
+ </tileset>
+ <layer name="Ground" width="40" height="40">
+  <data encoding="csv">
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,1,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,2,1,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,1,1,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,1,1,2,1,1,2,1,0,0,0,0,0,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,2,2,2,2,1,1,0,0,2,0,0,0,0,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,1,0,0,0,0,0,0,0,0,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,2,2,2,2,2,2,1,0,0,0,0,0,2,0,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,1,2,2,2,2,2,1,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,1,1,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,0,0,1,1,1,2,2,2,0,0,0,0,0,2,0,0,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,1,0,0,2,1,2,2,2,2,2,0,0,0,0,0,0,0,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,0,2,2,1,1,0,2,2,0,0,0,0,0,0,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,1,1,2,2,2,1,1,0,2,0,0,0,0,0,0,0,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,2,2,2,2,2,1,2,0,0,0,0,0,0,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,2,2,2,1,2,1,2,2,2,1,1,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+1,1,1,2,2,1,1,1,2,2,2,1,1,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,1,1,0,1,0,1,2,2,2,1,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,1,1,1,1,0,1,1,2,2,1,1,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,1,1,1,2,1,2,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+0,0,0,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,0,0,1,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,0,1,1,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,1,1,1,1,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+</data>
+ </layer>
+</map>
diff --git a/Source/Sandbox/Content/isometric_tileset.png b/Source/Sandbox/Content/isometric_tileset.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c6f1b4ffc44b24f37fc3e71c00973c8da32df89
GIT binary patch
literal 4599
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
TbLcDdTN&V*kp;Zbz$58@FuAXh

literal 0
HcmV?d00001


From 2c844cc2b95565c42eb6ac50ae892d9d700d5dd9 Mon Sep 17 00:00:00 2001
From: Darren Reid <darren.j.reid@gmail.com>
Date: Sat, 26 Sep 2015 18:15:55 +1000
Subject: [PATCH 2/3] Fix rendering to match what is seen in Tiled

---
 .../MonoGame.Extended/Maps/Tiled/TiledMap.cs  |  7 +++-
 .../Maps/Tiled/TiledTileLayer.cs              | 35 +++++--------------
 Source/Sandbox/Content/isometric.tmx          |  3 ++
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs b/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs
index 45721d44..78a62672 100644
--- a/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs
+++ b/Source/MonoGame.Extended/Maps/Tiled/TiledMap.cs
@@ -9,7 +9,12 @@ namespace MonoGame.Extended.Maps.Tiled
 {
     public class TiledMap
     {
-        public TiledMap(GraphicsDevice graphicsDevice, int width, int height, int tileWidth, int tileHeight, TiledMapOrientation orientation)
+        public TiledMap(GraphicsDevice graphicsDevice, 
+            int width, 
+            int height, 
+            int tileWidth, 
+            int tileHeight, 
+            TiledMapOrientation orientation = TiledMapOrientation.Orthogonal)
         {
             Width = width;
             Height = height;
diff --git a/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs b/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs
index f2f1620e..43412a2c 100644
--- a/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs
+++ b/Source/MonoGame.Extended/Maps/Tiled/TiledTileLayer.cs
@@ -91,33 +91,16 @@ namespace MonoGame.Extended.Maps.Tiled
 
         private void RenderIsometric(TiledTile tile, TextureRegion2D region)
         {
-            //drawPos.X = ((mapObject.Bounds.X) - (Camera.Position.X)) * Camera.Zoom;
-            //drawPos.Y = ((mapObject.Bounds.Y) - (Camera.Position.Y)) * Camera.Zoom;
+            var tx = (tile.X*(_map.TileWidth / 2)) - (tile.Y*(_map.TileWidth / 2)) 
+                //Center
+                + (_map.Width * (_map.TileWidth/2)) 
+                //Compensate Bug?
+                - (_map.TileWidth / 2);
+                
+            var ty = (tile.Y*(_map.TileHeight/2)) + (tile.X*(_map.TileHeight/2)) 
+                //Compensate Bug?
+                - (_map.TileWidth + _map.TileHeight);
 
-            ////Currently changing position and rotation when just rotating
-            //float rotation = 0;//MathHelper.ToRadians(mapObject.Rotation); 
-            //Texture2D texture = tileSet.Texture;
-            //Rectangle source = tile.Source;
-            //Color renderColor = mapObjectLayer.OpacityColor;
-            //Vector2 origin = tile.Origin;
-            //var effect = SpriteEffects.None;
-            //SpriteBatch.Draw(texture, drawPos, source, renderColor, rotation, origin, Camera.Zoom,
-            //    effect, 1.0f);
-
-            //nPos.X = ((tile.Bounds.X + tileSet.TileOffsetX + (map.TileWidth / 2)) - (Camera.Position.X)) * Camera.Zoom;
-            //nPos.Y = ((tile.Bounds.Y + tileSet.TileOffsetY + (map.TileHeight / 2)) - (Camera.Position.Y)) * Camera.Zoom;
-
-            //var tx = (tile.X + (_map.TileWidth/2));
-            //var ty = (tile.Y + (_map.TileHeight/2));
-
-            var tx = (tile.X*(_map.TileWidth/2)) - (tile.Y*(_map.TileWidth/2));
-            var ty = (tile.Y*(_map.TileHeight/2)) + (tile.X*(_map.TileHeight/2));
-
-            //var result = new Vector2
-            //{
-            //    X = (mapPosition.X * (map.TileWidth / 2)) - (mapPosition.Y * (map.TileWidth / 2)),
-            //    Y = (mapPosition.Y * (map.TileHeight / 2)) + (mapPosition.X * (map.TileHeight / 2)) - (map.TileHeight / 2)
-            //};
             _spriteBatch.Draw(region, new Rectangle(tx, ty, region.Width, region.Height), Color.White);
         }
 
diff --git a/Source/Sandbox/Content/isometric.tmx b/Source/Sandbox/Content/isometric.tmx
index 00f5ad3f..452b2440 100644
--- a/Source/Sandbox/Content/isometric.tmx
+++ b/Source/Sandbox/Content/isometric.tmx
@@ -8,6 +8,9 @@
    </properties>
   </tile>
  </tileset>
+ <imagelayer name="Background">
+  <image source="hills.png"/>
+ </imagelayer>
  <layer name="Ground" width="40" height="40">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,

From 197db4e529e0041602a3ed402f7b884d90a82381 Mon Sep 17 00:00:00 2001
From: Darren Reid <darren.j.reid@gmail.com>
Date: Sat, 26 Sep 2015 18:20:56 +1000
Subject: [PATCH 3/3] Fix formatting

---
 .../TiledMapImporterProcessorTests.cs                          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs b/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs
index e01bd243..92d15ad2 100644
--- a/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs
+++ b/Source/MonoGame.Extended.Content.Pipeline.Tests/TiledMapImporterProcessorTests.cs
@@ -73,7 +73,8 @@ namespace MonoGame.Extended.Content.Pipeline.Tests
             Assert.AreEqual("1", tileLayer1.Properties[0].Value);
 
             Assert.AreEqual("customlayerprop2", tileLayer1.Properties[1].Name);
-            Assert.AreEqual("2", tileLayer1.Properties[1].Value);}
+            Assert.AreEqual("2", tileLayer1.Properties[1].Value);
+        }
 
         [Test]
         public void TiledMapImporter_Xml_Test()