diff --git a/Dependencies/MonoGame.Framework.dll b/Dependencies/MonoGame.Framework.dll deleted file mode 100644 index deb93c46..00000000 Binary files a/Dependencies/MonoGame.Framework.dll and /dev/null differ diff --git a/Source/Demos/Demo.Animations/Demo.Animations.csproj b/Source/Demos/Demo.Animations/Demo.Animations.csproj index 2e86d0b4..5b7bdb1d 100644 --- a/Source/Demos/Demo.Animations/Demo.Animations.csproj +++ b/Source/Demos/Demo.Animations/Demo.Animations.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -63,6 +55,7 @@ + diff --git a/Source/Demos/Demo.Animations/MonoGame.Framework.dll.config b/Source/Demos/Demo.Animations/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Animations/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Animations/packages.config b/Source/Demos/Demo.Animations/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.Animations/packages.config +++ b/Source/Demos/Demo.Animations/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.Batching/Content/Content.mgcb b/Source/Demos/Demo.Batching/Content/Content.mgcb index 1c7cbe53..8ac0f99e 100644 --- a/Source/Demos/Demo.Batching/Content/Content.mgcb +++ b/Source/Demos/Demo.Batching/Content/Content.mgcb @@ -51,6 +51,6 @@ /processorParam:GenerateMipmaps=False /processorParam:PremultiplyAlpha=True /processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False /processorParam:TextureFormat=Color -/build:montserrat-32_0.png - +/build:montserrat-32_0.png \ No newline at end of file diff --git a/Source/Demos/Demo.Batching/Demo.Batching.csproj b/Source/Demos/Demo.Batching/Demo.Batching.csproj index d7359488..7a7dfee8 100644 --- a/Source/Demos/Demo.Batching/Demo.Batching.csproj +++ b/Source/Demos/Demo.Batching/Demo.Batching.csproj @@ -45,16 +45,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -65,6 +57,8 @@ + + @@ -81,7 +75,6 @@ - diff --git a/Source/Demos/Demo.Batching/Game1.cs b/Source/Demos/Demo.Batching/Game1.cs index ef0f01e2..51026027 100644 --- a/Source/Demos/Demo.Batching/Game1.cs +++ b/Source/Demos/Demo.Batching/Game1.cs @@ -1,5 +1,4 @@ using System; -using System.Text; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; @@ -25,13 +24,13 @@ namespace Demo.Batching private readonly GraphicsDeviceManager _graphicsDeviceManager; private Batcher2D _batcher; - private readonly StringBuilder _stringBuilder = new StringBuilder(); private SpriteBatch _spriteBatch; private BitmapFont _bitmapFont; private Texture2D _spriteTexture1; private Texture2D _spriteTexture2; private Vector2 _spriteOrigin; - private DefaultEffect2D _effect; + private Vector2 _spriteScale; + private DefaultEffect _effect; private readonly Random _random = new Random(); private readonly FramesPerSecondCounter _fpsCounter = new FramesPerSecondCounter(); @@ -52,8 +51,8 @@ namespace Demo.Batching { // also disable v-sync so max frames can be measured otherwise draw frames would be capped to the screen's refresh rate SynchronizeWithVerticalRetrace = false, - PreferredBackBufferWidth = 1024, - PreferredBackBufferHeight = 768 + PreferredBackBufferWidth = 800, + PreferredBackBufferHeight = 600 }; } @@ -61,7 +60,11 @@ namespace Demo.Batching { var graphicsDevice = GraphicsDevice; - _effect = new DefaultEffect2D(graphicsDevice); + _effect = new DefaultEffect(graphicsDevice) + { + TextureEnabled = true, + VertexColorEnabled = true + }; _batcher = new Batcher2D(graphicsDevice); _spriteBatch = new SpriteBatch(graphicsDevice); _bitmapFont = Content.Load("montserrat-32"); @@ -70,6 +73,7 @@ namespace Demo.Batching _spriteTexture1 = Content.Load("logo-square-128"); _spriteTexture2 = Content.Load("logo-square-128-copy"); _spriteOrigin = new Vector2(_spriteTexture1.Width * 0.5f, _spriteTexture1.Height * 0.5f); + _spriteScale = new Vector2(0.5f); var viewport = GraphicsDevice.Viewport; @@ -99,13 +103,13 @@ namespace Demo.Batching var sprite = _sprites[index]; if (index % 2 == 0) - sprite.Rotation = (sprite.Rotation + MathHelper.ToRadians(1)) % MathHelper.TwoPi; + sprite.Rotation = (sprite.Rotation + MathHelper.ToRadians(0.5f)) % MathHelper.TwoPi; else - sprite.Rotation = (sprite.Rotation - MathHelper.ToRadians(1) + MathHelper.TwoPi) % MathHelper.TwoPi; + sprite.Rotation = (sprite.Rotation - MathHelper.ToRadians(0.5f) + MathHelper.TwoPi) % MathHelper.TwoPi; sprite.Color = ColorHelper.FromHsl(sprite.Rotation / MathHelper.TwoPi, 0.5f, 0.3f); - sprite.TransformMatrix = Matrix2D.CreateFrom(sprite.Position, sprite.Rotation, null, _spriteOrigin); + sprite.TransformMatrix = Matrix2D.CreateFrom(sprite.Position, sprite.Rotation, _spriteScale, _spriteOrigin); _sprites[index] = sprite; } @@ -117,9 +121,11 @@ namespace Demo.Batching protected override void Draw(GameTime gameTime) { + Window.Title = _fpsCounter.FramesPerSecond.ToString(); + var graphicsDevice = GraphicsDevice; - graphicsDevice.Clear(Color.Black); + graphicsDevice.Clear(Color.CornflowerBlue); // update the matrices _worldMatrix = Matrix.Identity; @@ -131,21 +137,6 @@ namespace Demo.Batching DrawSpritesWithBatcher2D(); //DrawSpritesWithSpriteBatch(); - //_batcher.Begin(viewMatrix: _viewMatrix, projectionMatrix: _projectionMatrix); - - //// use StringBuilder to prevent garbage - //_stringBuilder.Clear(); - //_stringBuilder.Append("FPS: "); - //_stringBuilder.Append(_fpsCounter.FramesPerSecond); // but, this StringBulder method causes a small amount of garbage... - //_batcher.DrawString(_bitmapFont, _stringBuilder, Vector2.Zero); - - //_stringBuilder.Clear(); - //_stringBuilder.Append("Draw Calls: "); - //_stringBuilder.Append(GraphicsDevice.Metrics.DrawCount); - //_batcher.DrawString(_bitmapFont, _stringBuilder, new Vector2(0, _bitmapFont.LineHeight)); - - //_batcher.End(); - base.Draw(gameTime); _fpsCounter.Draw(gameTime); @@ -153,7 +144,7 @@ namespace Demo.Batching private void DrawSpritesWithBatcher2D() { - _batcher.Begin(viewMatrix: _viewMatrix, projectionMatrix: _projectionMatrix); + _batcher.Begin(_viewMatrix, _projectionMatrix, effect: _effect); // ReSharper disable once ForCanBeConvertedToForeach for (var index = 0; index < _sprites.Length; index++) @@ -175,7 +166,7 @@ namespace Demo.Batching for (var index = 0; index < _sprites.Length; index++) { var sprite = _sprites[index]; - _spriteBatch.Draw(sprite.Texture, sprite.Position, rotation: sprite.Rotation, origin: _spriteOrigin, color: sprite.Color); + _spriteBatch.Draw(sprite.Texture, sprite.Position, null, sprite.Color, sprite.Rotation, _spriteOrigin, _spriteScale, SpriteEffects.None, 0); } _spriteBatch.End(); diff --git a/Source/Demos/Demo.Batching/MonoGame.Framework.dll.config b/Source/Demos/Demo.Batching/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Batching/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Batching/packages.config b/Source/Demos/Demo.Batching/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.Batching/packages.config +++ b/Source/Demos/Demo.Batching/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj b/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj index 8fdcb4c8..52d18083 100644 --- a/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj +++ b/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj @@ -41,16 +41,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -65,9 +57,9 @@ - + @@ -82,6 +74,10 @@ + + {9B3AB8A1-78AA-471A-AFD0-B10B932115BC} + MonoGame.Extended.Graphics + {41724c52-3d50-45bb-81eb-3c8a247eafd1} MonoGame.Extended diff --git a/Source/Demos/Demo.BitmapFonts/Game2.cs b/Source/Demos/Demo.BitmapFonts/Game2.cs index b3566b68..18c00552 100644 --- a/Source/Demos/Demo.BitmapFonts/Game2.cs +++ b/Source/Demos/Demo.BitmapFonts/Game2.cs @@ -3,6 +3,7 @@ using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; using MonoGame.Extended; using MonoGame.Extended.BitmapFonts; +using MonoGame.Extended.Graphics.Effects; using MonoGame.Extended.Shapes; using MonoGame.Extended.ViewportAdapters; diff --git a/Source/Demos/Demo.BitmapFonts/MonoGame.Framework.dll.config b/Source/Demos/Demo.BitmapFonts/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.BitmapFonts/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.BitmapFonts/packages.config b/Source/Demos/Demo.BitmapFonts/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.BitmapFonts/packages.config +++ b/Source/Demos/Demo.BitmapFonts/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.Camera/Demo.Camera.csproj b/Source/Demos/Demo.Camera/Demo.Camera.csproj index c997a46b..1acce489 100644 --- a/Source/Demos/Demo.Camera/Demo.Camera.csproj +++ b/Source/Demos/Demo.Camera/Demo.Camera.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -72,6 +64,7 @@ + diff --git a/Source/Demos/Demo.Camera/MonoGame.Framework.dll.config b/Source/Demos/Demo.Camera/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Camera/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Camera/packages.config b/Source/Demos/Demo.Camera/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.Camera/packages.config +++ b/Source/Demos/Demo.Camera/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj b/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj index 7d3f5ab2..17305714 100644 --- a/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj +++ b/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -64,6 +56,7 @@ + diff --git a/Source/Demos/Demo.EntityComponentSystem/MonoGame.Framework.dll.config b/Source/Demos/Demo.EntityComponentSystem/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.EntityComponentSystem/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.EntityComponentSystem/packages.config b/Source/Demos/Demo.EntityComponentSystem/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.EntityComponentSystem/packages.config +++ b/Source/Demos/Demo.EntityComponentSystem/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.Gui/Demo.Gui.csproj b/Source/Demos/Demo.Gui/Demo.Gui.csproj index c085e1bd..0de58b49 100644 --- a/Source/Demos/Demo.Gui/Demo.Gui.csproj +++ b/Source/Demos/Demo.Gui/Demo.Gui.csproj @@ -42,22 +42,14 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll - True - @@ -93,6 +85,7 @@ PreserveNewest + diff --git a/Source/Demos/Demo.Gui/MonoGame.Framework.dll.config b/Source/Demos/Demo.Gui/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Gui/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Gui/packages.config b/Source/Demos/Demo.Gui/packages.config index fe377356..e6cd2b7c 100644 --- a/Source/Demos/Demo.Gui/packages.config +++ b/Source/Demos/Demo.Gui/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj b/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj index 63bdc30e..b760e356 100644 --- a/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj +++ b/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -66,6 +58,7 @@ + diff --git a/Source/Demos/Demo.InputListeners/MonoGame.Framework.dll.config b/Source/Demos/Demo.InputListeners/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.InputListeners/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.InputListeners/packages.config b/Source/Demos/Demo.InputListeners/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.InputListeners/packages.config +++ b/Source/Demos/Demo.InputListeners/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj b/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj index 82a089d0..d7227235 100644 --- a/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj +++ b/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -66,6 +58,7 @@ + diff --git a/Source/Demos/Demo.NuclexGui/MonoGame.Framework.dll.config b/Source/Demos/Demo.NuclexGui/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.NuclexGui/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.NuclexGui/packages.config b/Source/Demos/Demo.NuclexGui/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.NuclexGui/packages.config +++ b/Source/Demos/Demo.NuclexGui/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.Particles/Demo.Particles.csproj b/Source/Demos/Demo.Particles/Demo.Particles.csproj index d34619cb..4fa393f6 100644 --- a/Source/Demos/Demo.Particles/Demo.Particles.csproj +++ b/Source/Demos/Demo.Particles/Demo.Particles.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -63,6 +55,7 @@ + diff --git a/Source/Demos/Demo.Particles/MonoGame.Framework.dll.config b/Source/Demos/Demo.Particles/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Particles/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Particles/packages.config b/Source/Demos/Demo.Particles/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.Particles/packages.config +++ b/Source/Demos/Demo.Particles/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.Platformer/Demo.Platformer.csproj b/Source/Demos/Demo.Platformer/Demo.Platformer.csproj index 72727bd8..0ea46680 100644 --- a/Source/Demos/Demo.Platformer/Demo.Platformer.csproj +++ b/Source/Demos/Demo.Platformer/Demo.Platformer.csproj @@ -55,16 +55,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -80,6 +72,7 @@ + diff --git a/Source/Demos/Demo.Platformer/MonoGame.Framework.dll.config b/Source/Demos/Demo.Platformer/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Platformer/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Platformer/Screens/GameScreen.cs b/Source/Demos/Demo.Platformer/Screens/GameScreen.cs index 2d30cb58..899b822e 100644 --- a/Source/Demos/Demo.Platformer/Screens/GameScreen.cs +++ b/Source/Demos/Demo.Platformer/Screens/GameScreen.cs @@ -11,7 +11,7 @@ using MonoGame.Extended.Entities; using MonoGame.Extended.Entities.Systems; using MonoGame.Extended.Screens; using MonoGame.Extended.Tiled; -using MonoGame.Extended.Tiled.Graphics; +using MonoGame.Extended.Graphics; using MonoGame.Extended.ViewportAdapters; namespace Demo.Platformer.Screens diff --git a/Source/Demos/Demo.Platformer/packages.config b/Source/Demos/Demo.Platformer/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.Platformer/packages.config +++ b/Source/Demos/Demo.Platformer/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj b/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj index aba8bc36..6da4b964 100644 --- a/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj +++ b/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -67,6 +59,7 @@ + diff --git a/Source/Demos/Demo.SceneGraphs/MonoGame.Framework.dll.config b/Source/Demos/Demo.SceneGraphs/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.SceneGraphs/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.SceneGraphs/packages.config b/Source/Demos/Demo.SceneGraphs/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.SceneGraphs/packages.config +++ b/Source/Demos/Demo.SceneGraphs/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.Screens/Demo.Screens.csproj b/Source/Demos/Demo.Screens/Demo.Screens.csproj index dd30b4bf..6ca1df45 100644 --- a/Source/Demos/Demo.Screens/Demo.Screens.csproj +++ b/Source/Demos/Demo.Screens/Demo.Screens.csproj @@ -51,16 +51,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -69,6 +61,7 @@ + diff --git a/Source/Demos/Demo.Screens/MonoGame.Framework.dll.config b/Source/Demos/Demo.Screens/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Screens/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Screens/packages.config b/Source/Demos/Demo.Screens/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.Screens/packages.config +++ b/Source/Demos/Demo.Screens/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj b/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj index 2d7db977..e871773d 100644 --- a/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj +++ b/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj @@ -50,16 +50,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -68,6 +60,8 @@ + + @@ -92,7 +86,6 @@ - diff --git a/Source/Demos/Demo.SpaceGame/MonoGame.Framework.dll.config b/Source/Demos/Demo.SpaceGame/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.SpaceGame/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.SpaceGame/packages.config b/Source/Demos/Demo.SpaceGame/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.SpaceGame/packages.config +++ b/Source/Demos/Demo.SpaceGame/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj b/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj index 69ed85ed..c91c35fb 100644 --- a/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj +++ b/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj @@ -43,16 +43,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -75,6 +67,7 @@ + diff --git a/Source/Demos/Demo.SpriteSheetAnimations/Game1.cs b/Source/Demos/Demo.SpriteSheetAnimations/Game1.cs index 10042d03..c6899520 100644 --- a/Source/Demos/Demo.SpriteSheetAnimations/Game1.cs +++ b/Source/Demos/Demo.SpriteSheetAnimations/Game1.cs @@ -9,7 +9,7 @@ using MonoGame.Extended.Collisions; using MonoGame.Extended.Sprites; using MonoGame.Extended.TextureAtlases; using MonoGame.Extended.Tiled; -using MonoGame.Extended.Tiled.Graphics; +using MonoGame.Extended.Graphics; using MonoGame.Extended.ViewportAdapters; namespace Demo.SpriteSheetAnimations diff --git a/Source/Demos/Demo.SpriteSheetAnimations/MonoGame.Framework.dll.config b/Source/Demos/Demo.SpriteSheetAnimations/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.SpriteSheetAnimations/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.SpriteSheetAnimations/packages.config b/Source/Demos/Demo.SpriteSheetAnimations/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.SpriteSheetAnimations/packages.config +++ b/Source/Demos/Demo.SpriteSheetAnimations/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.Sprites/Demo.Sprites.csproj b/Source/Demos/Demo.Sprites/Demo.Sprites.csproj index 75ac4638..6839aef4 100644 --- a/Source/Demos/Demo.Sprites/Demo.Sprites.csproj +++ b/Source/Demos/Demo.Sprites/Demo.Sprites.csproj @@ -42,16 +42,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -68,6 +60,7 @@ + diff --git a/Source/Demos/Demo.Sprites/MonoGame.Framework.dll.config b/Source/Demos/Demo.Sprites/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.Sprites/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.Sprites/packages.config b/Source/Demos/Demo.Sprites/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.Sprites/packages.config +++ b/Source/Demos/Demo.Sprites/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.TiledMaps/CustomEffect.cs b/Source/Demos/Demo.TiledMaps/CustomEffect.cs new file mode 100644 index 00000000..e4dd73b1 --- /dev/null +++ b/Source/Demos/Demo.TiledMaps/CustomEffect.cs @@ -0,0 +1,24 @@ +using Microsoft.Xna.Framework.Graphics; +using MonoGame.Extended.Graphics.Effects; + +namespace Demo.TiledMaps +{ + public class CustomEffect : DefaultEffect, ITiledMapEffect + { + public CustomEffect(GraphicsDevice graphicsDevice) + : base(graphicsDevice) + { + } + + public CustomEffect(GraphicsDevice graphicsDevice, byte[] byteCode) + : base(graphicsDevice, byteCode) + { + + } + + public CustomEffect(Effect cloneSource) + : base(cloneSource) + { + } + } +} diff --git a/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj b/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj index 6bd081d9..5e0bc988 100644 --- a/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj +++ b/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj @@ -37,21 +37,14 @@ Icon.ico + - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -83,6 +76,7 @@ + diff --git a/Source/Demos/Demo.TiledMaps/Game1.cs b/Source/Demos/Demo.TiledMaps/Game1.cs index c3d8c4cf..ce657a18 100644 --- a/Source/Demos/Demo.TiledMaps/Game1.cs +++ b/Source/Demos/Demo.TiledMaps/Game1.cs @@ -5,9 +5,10 @@ using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; using MonoGame.Extended; using MonoGame.Extended.BitmapFonts; +using MonoGame.Extended.Graphics; +using MonoGame.Extended.Graphics.Effects; using MonoGame.Extended.Sprites; using MonoGame.Extended.Tiled; -using MonoGame.Extended.Tiled.Graphics; using MonoGame.Extended.ViewportAdapters; namespace Demo.TiledMaps @@ -27,6 +28,7 @@ namespace Demo.TiledMaps private KeyboardState _previousKeyboardState = Keyboard.GetState(); private bool _showHelp; private TiledMap _map; + private Effect _customEffect; private Queue _availableMaps; @@ -34,13 +36,13 @@ namespace Demo.TiledMaps { _graphicsDeviceManager = new GraphicsDeviceManager(this) { - SynchronizeWithVerticalRetrace = true, + SynchronizeWithVerticalRetrace = false, PreferredBackBufferWidth = 1024, PreferredBackBufferHeight = 768 }; Content.RootDirectory = "Content"; IsMouseVisible = true; - IsFixedTimeStep = true; + IsFixedTimeStep = false; } protected override void Initialize() @@ -50,7 +52,6 @@ namespace Demo.TiledMaps _mapRenderer = new TiledMapRenderer(GraphicsDevice); Window.AllowUserResizing = true; - Window.Position = Point.Zero; _fpsCounter = new FramesPerSecondCounter(); @@ -69,6 +70,15 @@ namespace Demo.TiledMaps _map = LoadNextMap(); _camera.LookAt(new Vector2(_map.WidthInPixels, _map.HeightInPixels) * 0.5f); + + var effect = new CustomEffect(GraphicsDevice) + { + Alpha = 0.5f, + TextureEnabled = true, + VertexColorEnabled = false + }; + + _customEffect = effect; } private TiledMap LoadNextMap() @@ -178,7 +188,7 @@ namespace Demo.TiledMaps var viewMatrix = _camera.GetViewMatrix(); var projectionMatrix = Matrix.CreateOrthographicOffCenter(0, GraphicsDevice.Viewport.Width, GraphicsDevice.Viewport.Height, 0, 0f, -1f); - _mapRenderer.Draw(_map, ref viewMatrix, ref projectionMatrix); + _mapRenderer.Draw(_map, ref viewMatrix, ref projectionMatrix, _customEffect); DrawText(); diff --git a/Source/Demos/Demo.TiledMaps/MonoGame.Framework.dll.config b/Source/Demos/Demo.TiledMaps/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.TiledMaps/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.TiledMaps/packages.config b/Source/Demos/Demo.TiledMaps/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.TiledMaps/packages.config +++ b/Source/Demos/Demo.TiledMaps/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj b/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj index c35f7ce1..812464dc 100644 --- a/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj +++ b/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj @@ -43,16 +43,8 @@ - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll - True - - - ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll True @@ -66,6 +58,7 @@ + diff --git a/Source/Demos/Demo.ViewportAdapters/MonoGame.Framework.dll.config b/Source/Demos/Demo.ViewportAdapters/MonoGame.Framework.dll.config new file mode 100644 index 00000000..09710ae4 --- /dev/null +++ b/Source/Demos/Demo.ViewportAdapters/MonoGame.Framework.dll.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Source/Demos/Demo.ViewportAdapters/packages.config b/Source/Demos/Demo.ViewportAdapters/packages.config index 777c5e44..9b38dcf7 100644 --- a/Source/Demos/Demo.ViewportAdapters/packages.config +++ b/Source/Demos/Demo.ViewportAdapters/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj index e0dd9d95..4e03c217 100644 --- a/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj +++ b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj @@ -45,11 +45,6 @@ - - - ..\..\Dependencies\MonoGame.Framework.dll - - {07B2ADE2-73E3-41C4-AEA1-D5566A5AB902} @@ -60,6 +55,14 @@ MonoGame.Extended + + + ..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll + + + + + - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - ..\..\Dependencies\MonoGame.Framework.dll - + @@ -70,6 +69,11 @@ MonoGame.Extended + + + ..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll + + + + {9b3ab8a1-78aa-471a-afd0-b10b932115bc} + MonoGame.Extended.Graphics + {41724c52-3d50-45bb-81eb-3c8a247eafd1} MonoGame.Extended - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - ..\..\Dependencies\MonoGame.Framework.dll + + + + + ..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll diff --git a/Source/MonoGame.Extended.Tiled/ContentReaderExtensions.cs b/Source/MonoGame.Extended.Tiled/Tiled/ContentReaderExtensions.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/ContentReaderExtensions.cs rename to Source/MonoGame.Extended.Tiled/Tiled/ContentReaderExtensions.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMap.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMap.cs similarity index 99% rename from Source/MonoGame.Extended.Tiled/TiledMap.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMap.cs index 4a6474ec..7c552756 100644 --- a/Source/MonoGame.Extended.Tiled/TiledMap.cs +++ b/Source/MonoGame.Extended.Tiled/Tiled/TiledMap.cs @@ -4,7 +4,6 @@ using System.Collections.ObjectModel; using System.Linq; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using MonoGame.Extended.Tiled.Graphics; namespace MonoGame.Extended.Tiled { diff --git a/Source/MonoGame.Extended.Tiled/TiledMapEllipseObject.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapEllipseObject.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapEllipseObject.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapEllipseObject.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapHelper..cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapHelper.cs similarity index 59% rename from Source/MonoGame.Extended.Tiled/TiledMapHelper..cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapHelper.cs index 019c06b6..a397bc1a 100644 --- a/Source/MonoGame.Extended.Tiled/TiledMapHelper..cs +++ b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapHelper.cs @@ -4,6 +4,20 @@ namespace MonoGame.Extended.Tiled { internal static class TiledMapHelper { + // 4 vertices per tile + public const int VerticesPerTile = 4; + // 2 triangles per tile (mesh), with each triangle indexing 3 out of 4 vertices, so 6 vertices + public const int IndicesPerTile = 6; + // by using ushort type for indices we are limited to indexing vertices from 0 to 65535 + // this limits us on how many vertices can fit inside a single vertex buffer (65536 vertices) + public const int MaximumVerticesPerModel = ushort.MaxValue + 1; + // and thus, we know how many tiles we can fit inside a vertex or index buffer (16384 tiles) + public const int MaximumTilesPerGeometryContent = MaximumVerticesPerModel / VerticesPerTile; + // and thus, we also know the maximum number of indices we can fit inside a single index buffer (98304 indices) + public const int MaximumIndicesPerModel = MaximumTilesPerGeometryContent * IndicesPerTile; + // these optimal maximum numbers of course are not considering texture bindings which would practically lower the actual number of tiles per vertex / index buffer + // thus, the reason why it is a good to have ONE giant tileset (at least per layer) + internal static Rectangle GetTileSourceRectangle(int localTileIdentifier, int tileWidth, int tileHeight, int columns, int margin, int spacing) { diff --git a/Source/MonoGame.Extended.Tiled/TiledMapImageLayer.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapImageLayer.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapImageLayer.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapImageLayer.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapLayer.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapLayer.cs similarity index 97% rename from Source/MonoGame.Extended.Tiled/TiledMapLayer.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapLayer.cs index 637c18ec..0a136edf 100644 --- a/Source/MonoGame.Extended.Tiled/TiledMapLayer.cs +++ b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapLayer.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Microsoft.Xna.Framework.Content; -using MonoGame.Extended.Tiled.Graphics; +using MonoGame.Extended.Graphics; namespace MonoGame.Extended.Tiled { diff --git a/Source/MonoGame.Extended.Tiled/TiledMapLayerType.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapLayerType.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapLayerType.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapLayerType.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapObject.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapObject.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapObject.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapObject.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapObjectDrawOrder.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapObjectDrawOrder.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapObjectDrawOrder.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapObjectDrawOrder.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapObjectLayer.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapObjectLayer.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapObjectLayer.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapObjectLayer.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapObjectType.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapObjectType.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapObjectType.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapObjectType.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapOrientation.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapOrientation.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapOrientation.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapOrientation.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapPolygonObject.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapPolygonObject.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapPolygonObject.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapPolygonObject.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapPolylineObject.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapPolylineObject.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapPolylineObject.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapPolylineObject.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapProperties.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapProperties.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapProperties.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapProperties.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapReader.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapReader.cs similarity index 98% rename from Source/MonoGame.Extended.Tiled/TiledMapReader.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapReader.cs index dcb7975e..b5367437 100644 --- a/Source/MonoGame.Extended.Tiled/TiledMapReader.cs +++ b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapReader.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Xna.Framework.Content; -using MonoGame.Extended.Tiled.Graphics; +using MonoGame.Extended.Graphics; namespace MonoGame.Extended.Tiled { diff --git a/Source/MonoGame.Extended.Tiled/TiledMapRectangleObject.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapRectangleObject.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapRectangleObject.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapRectangleObject.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTile.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTile.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTile.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTile.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTileDrawOrder.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileDrawOrder.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTileDrawOrder.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileDrawOrder.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTileFlipFlags.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileFlipFlags.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTileFlipFlags.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileFlipFlags.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTileLayer.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileLayer.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTileLayer.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileLayer.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTileObject.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileObject.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTileObject.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileObject.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTileset.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileset.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTileset.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTileset.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTilesetAnimatedTile.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTilesetAnimatedTile.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTilesetAnimatedTile.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTilesetAnimatedTile.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTilesetTile.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTilesetTile.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTilesetTile.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTilesetTile.cs diff --git a/Source/MonoGame.Extended.Tiled/TiledMapTilesetTileAnimationFrame.cs b/Source/MonoGame.Extended.Tiled/Tiled/TiledMapTilesetTileAnimationFrame.cs similarity index 100% rename from Source/MonoGame.Extended.Tiled/TiledMapTilesetTileAnimationFrame.cs rename to Source/MonoGame.Extended.Tiled/Tiled/TiledMapTilesetTileAnimationFrame.cs diff --git a/Source/MonoGame.Extended.Tiled/packages.config b/Source/MonoGame.Extended.Tiled/packages.config new file mode 100644 index 00000000..28c01444 --- /dev/null +++ b/Source/MonoGame.Extended.Tiled/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Source/MonoGame.Extended/MonoGame.Extended.csproj b/Source/MonoGame.Extended/MonoGame.Extended.csproj index 5d0c4648..111fcbfd 100644 --- a/Source/MonoGame.Extended/MonoGame.Extended.csproj +++ b/Source/MonoGame.Extended/MonoGame.Extended.csproj @@ -261,15 +261,15 @@ + + ..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll + ..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True - - ..\..\Dependencies\MonoGame.Framework.dll - diff --git a/Source/MonoGame.Extended/packages.config b/Source/MonoGame.Extended/packages.config index d59cc888..43f6cc68 100644 --- a/Source/MonoGame.Extended/packages.config +++ b/Source/MonoGame.Extended/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/Source/Tests/MonoGame.Extended.Tests/MockGameWindow.cs b/Source/Tests/MonoGame.Extended.Tests/MockGameWindow.cs index 38ac5153..df49ef62 100644 --- a/Source/Tests/MonoGame.Extended.Tests/MockGameWindow.cs +++ b/Source/Tests/MonoGame.Extended.Tests/MockGameWindow.cs @@ -8,9 +8,24 @@ namespace MonoGame.Extended.Tests { public class MockGameWindow : GameWindow { - public void RaiseOnClientSizeChangedEvent() + public override bool AllowUserResizing { get; set; } + public override Rectangle ClientBounds { get; } + public override DisplayOrientation CurrentOrientation { get; } + public override IntPtr Handle { get; } + public override string ScreenDeviceName { get; } + + public MockGameWindow() { - OnClientSizeChanged(); + this.ClientSizeChanged += OnClientSizeChanged; + } + + private void OnClientSizeChanged(object sender, EventArgs eventArgs) + { + } + + internal void RaiseOnClientSizeChangedEvent() + { + OnClientSizeChanged(this, EventArgs.Empty); } public override void BeginScreenDeviceChange(bool willBeFullScreen) @@ -29,13 +44,6 @@ namespace MonoGame.Extended.Tests { } - public override bool AllowUserResizing { get; set; } - public override Rectangle ClientBounds { get; } - public override Point Position { get; set; } - public override DisplayOrientation CurrentOrientation { get; } - public override IntPtr Handle { get; } - public override string ScreenDeviceName { get; } - #if __MonoCS__ public override Icon Icon { get; set; } #endif