diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..1ff0c423 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/Samples/DemoGame.Extended/DemoGame.Extended.sln b/Samples/DemoGame.Extended/DemoGame.Extended.sln new file mode 100644 index 00000000..64949851 --- /dev/null +++ b/Samples/DemoGame.Extended/DemoGame.Extended.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoGame.Extended", "DemoGame.Extended\DemoGame.Extended.csproj", "{48B3FAA2-1CD9-40DF-8893-2B496675B6CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {48B3FAA2-1CD9-40DF-8893-2B496675B6CA}.Debug|x86.ActiveCfg = Debug|x86 + {48B3FAA2-1CD9-40DF-8893-2B496675B6CA}.Debug|x86.Build.0 = Debug|x86 + {48B3FAA2-1CD9-40DF-8893-2B496675B6CA}.Release|x86.ActiveCfg = Release|x86 + {48B3FAA2-1CD9-40DF-8893-2B496675B6CA}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/Content/Content.mgcb b/Samples/DemoGame.Extended/DemoGame.Extended/Content/Content.mgcb new file mode 100644 index 00000000..9e24897b --- /dev/null +++ b/Samples/DemoGame.Extended/DemoGame.Extended/Content/Content.mgcb @@ -0,0 +1,26 @@ + +#----------------------------- Global Properties ----------------------------# + +/outputDir:bin/Windows +/intermediateDir:obj/Windows +/platform:Windows +/config: +/profile:Reach +/compress:False + +#-------------------------------- References --------------------------------# + +#---------------------------------- Content ---------------------------------# + +#begin hills.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:hills.png + diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/Content/hills.png b/Samples/DemoGame.Extended/DemoGame.Extended/Content/hills.png new file mode 100644 index 00000000..a5bfba65 Binary files /dev/null and b/Samples/DemoGame.Extended/DemoGame.Extended/Content/hills.png differ diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/DemoGame.Extended.csproj b/Samples/DemoGame.Extended/DemoGame.Extended/DemoGame.Extended.csproj new file mode 100644 index 00000000..e32dadcf --- /dev/null +++ b/Samples/DemoGame.Extended/DemoGame.Extended/DemoGame.Extended.csproj @@ -0,0 +1,74 @@ + + + + Debug + x86 + 8.0.30703 + 2.0 + {48B3FAA2-1CD9-40DF-8893-2B496675B6CA} + WinExe + Properties + DemoGame.Extended + DemoGame.Extended + 512 + Windows + + + + + x86 + true + full + false + bin\Windows\Debug\ + DEBUG;TRACE;WINDOWS + prompt + 4 + + + x86 + pdbonly + true + bin\Windows\Release\ + TRACE;WINDOWS + prompt + 4 + + + Icon.ico + + + + + + + + + ..\packages\MonoGame.Extended.0.1.1-alpha\lib\net40\MonoGame.Extended.dll + True + + + $(MSBuildProgramFiles32)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/Game1.cs b/Samples/DemoGame.Extended/DemoGame.Extended/Game1.cs new file mode 100644 index 00000000..888b60fc --- /dev/null +++ b/Samples/DemoGame.Extended/DemoGame.Extended/Game1.cs @@ -0,0 +1,62 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using Microsoft.Xna.Framework.Input; +using MonoGame.Extended.Graphics; + +namespace DemoGame.Extended +{ + public class Game1 : Game + { + private GraphicsDeviceManager _graphicsDeviceManager; + private SpriteBatch _spriteBatch; + private Texture2D _texture; + private Camera2D _camera; + + public Game1() + { + _graphicsDeviceManager = new GraphicsDeviceManager(this); + Content.RootDirectory = "Content"; + IsMouseVisible = true; + } + + protected override void Initialize() + { + base.Initialize(); + + _camera = new Camera2D(GraphicsDevice) + { + Zoom = 0.5f, + Position = new Vector2(400, 440) + }; + } + + protected override void LoadContent() + { + _spriteBatch = new SpriteBatch(GraphicsDevice); + _texture = Content.Load("hills"); + } + + protected override void UnloadContent() + { + } + + protected override void Update(GameTime gameTime) + { + if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed || Keyboard.GetState().IsKeyDown(Keys.Escape)) + Exit(); + + base.Update(gameTime); + } + + protected override void Draw(GameTime gameTime) + { + GraphicsDevice.Clear(Color.CornflowerBlue); + + _spriteBatch.Begin(transformMatrix: _camera.GetViewMatrix()); + _spriteBatch.Draw(_texture, Vector2.Zero, Color.White); + _spriteBatch.End(); + + base.Draw(gameTime); + } + } +} diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/Icon.ico b/Samples/DemoGame.Extended/DemoGame.Extended/Icon.ico new file mode 100644 index 00000000..7d9dec18 Binary files /dev/null and b/Samples/DemoGame.Extended/DemoGame.Extended/Icon.ico differ diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/Program.cs b/Samples/DemoGame.Extended/DemoGame.Extended/Program.cs new file mode 100644 index 00000000..3b07e8b0 --- /dev/null +++ b/Samples/DemoGame.Extended/DemoGame.Extended/Program.cs @@ -0,0 +1,22 @@ +using System; + +namespace DemoGame.Extended +{ +#if WINDOWS || LINUX + /// + /// The main class. + /// + public static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + using (var game = new Game1()) + game.Run(); + } + } +#endif +} diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/Properties/AssemblyInfo.cs b/Samples/DemoGame.Extended/DemoGame.Extended/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..15364363 --- /dev/null +++ b/Samples/DemoGame.Extended/DemoGame.Extended/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("DemoGame.Extended")] +[assembly: AssemblyProduct("DemoGame.Extended")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("50f9a6e1-798e-4a04-aad0-0d8fe90622ba")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("3.5.0.498")] +[assembly: AssemblyFileVersion("3.5.0.498")] diff --git a/Samples/DemoGame.Extended/DemoGame.Extended/packages.config b/Samples/DemoGame.Extended/DemoGame.Extended/packages.config new file mode 100644 index 00000000..0c8e90b8 --- /dev/null +++ b/Samples/DemoGame.Extended/DemoGame.Extended/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Source/MonoGame.Extended/MonoGame.Extended.nuspec b/Source/MonoGame.Extended.nuspec similarity index 57% rename from Source/MonoGame.Extended/MonoGame.Extended.nuspec rename to Source/MonoGame.Extended.nuspec index 3a8f7e3e..4f24f543 100644 --- a/Source/MonoGame.Extended/MonoGame.Extended.nuspec +++ b/Source/MonoGame.Extended.nuspec @@ -2,7 +2,7 @@ MonoGame.Extended - 0.1.0.0 + 0.2.0.0 MonoGame.Extended Dylan Wilson Craftwork Games @@ -12,11 +12,15 @@ Makes MonoGame more awesome. Copyright 2015 - Craftwork Games - monogame + monogame pipeline bmfont tiled + + + + + - - - + +