From de5b4e495b2b8e1704da2f899a6dab95a092220a Mon Sep 17 00:00:00 2001 From: Dylan Wilson Date: Thu, 17 Nov 2016 20:20:52 +1000 Subject: [PATCH] split collisions into a separate project (#308) --- .../Demo.SpriteSheetAnimatons.csproj | 4 ++ .../CollisionActor.cs | 0 .../CollisionGrid.cs | 0 .../CollisionGridCell.cs | 0 .../CollisionGridCellFlag.cs | 0 .../CollisionInfo.cs | 0 .../CollisionWorld.cs | 0 .../CollisionWorldExtensions.cs | 4 +- .../IActorTarget.cs | 0 .../MonoGame.Extended.Collisions.csproj | 66 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 30 +++++++++ Source/MonoGame.Extended.sln | 10 +++ .../MonoGame.Extended.csproj | 9 +-- 13 files changed, 113 insertions(+), 10 deletions(-) rename Source/{MonoGame.Extended/Collisions => MonoGame.Extended.Collisions}/CollisionActor.cs (100%) rename Source/{MonoGame.Extended/Collisions => MonoGame.Extended.Collisions}/CollisionGrid.cs (100%) rename Source/{MonoGame.Extended/Collisions => MonoGame.Extended.Collisions}/CollisionGridCell.cs (100%) rename Source/{MonoGame.Extended/Collisions => MonoGame.Extended.Collisions}/CollisionGridCellFlag.cs (100%) rename Source/{MonoGame.Extended/Collisions => MonoGame.Extended.Collisions}/CollisionInfo.cs (100%) rename Source/{MonoGame.Extended/Collisions => MonoGame.Extended.Collisions}/CollisionWorld.cs (100%) rename Source/{MonoGame.Extended/Maps/Tiled => MonoGame.Extended.Collisions}/CollisionWorldExtensions.cs (85%) rename Source/{MonoGame.Extended/Collisions => MonoGame.Extended.Collisions}/IActorTarget.cs (100%) create mode 100644 Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj create mode 100644 Source/MonoGame.Extended.Collisions/Properties/AssemblyInfo.cs diff --git a/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj b/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj index fa02688a..a214cfb1 100644 --- a/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj +++ b/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj @@ -94,6 +94,10 @@ + + {02562c6f-5bfb-467e-8a95-68b6ce2d635a} + MonoGame.Extended.Collisions + {41724c52-3d50-45bb-81eb-3c8a247eafd1} MonoGame.Extended diff --git a/Source/MonoGame.Extended/Collisions/CollisionActor.cs b/Source/MonoGame.Extended.Collisions/CollisionActor.cs similarity index 100% rename from Source/MonoGame.Extended/Collisions/CollisionActor.cs rename to Source/MonoGame.Extended.Collisions/CollisionActor.cs diff --git a/Source/MonoGame.Extended/Collisions/CollisionGrid.cs b/Source/MonoGame.Extended.Collisions/CollisionGrid.cs similarity index 100% rename from Source/MonoGame.Extended/Collisions/CollisionGrid.cs rename to Source/MonoGame.Extended.Collisions/CollisionGrid.cs diff --git a/Source/MonoGame.Extended/Collisions/CollisionGridCell.cs b/Source/MonoGame.Extended.Collisions/CollisionGridCell.cs similarity index 100% rename from Source/MonoGame.Extended/Collisions/CollisionGridCell.cs rename to Source/MonoGame.Extended.Collisions/CollisionGridCell.cs diff --git a/Source/MonoGame.Extended/Collisions/CollisionGridCellFlag.cs b/Source/MonoGame.Extended.Collisions/CollisionGridCellFlag.cs similarity index 100% rename from Source/MonoGame.Extended/Collisions/CollisionGridCellFlag.cs rename to Source/MonoGame.Extended.Collisions/CollisionGridCellFlag.cs diff --git a/Source/MonoGame.Extended/Collisions/CollisionInfo.cs b/Source/MonoGame.Extended.Collisions/CollisionInfo.cs similarity index 100% rename from Source/MonoGame.Extended/Collisions/CollisionInfo.cs rename to Source/MonoGame.Extended.Collisions/CollisionInfo.cs diff --git a/Source/MonoGame.Extended/Collisions/CollisionWorld.cs b/Source/MonoGame.Extended.Collisions/CollisionWorld.cs similarity index 100% rename from Source/MonoGame.Extended/Collisions/CollisionWorld.cs rename to Source/MonoGame.Extended.Collisions/CollisionWorld.cs diff --git a/Source/MonoGame.Extended/Maps/Tiled/CollisionWorldExtensions.cs b/Source/MonoGame.Extended.Collisions/CollisionWorldExtensions.cs similarity index 85% rename from Source/MonoGame.Extended/Maps/Tiled/CollisionWorldExtensions.cs rename to Source/MonoGame.Extended.Collisions/CollisionWorldExtensions.cs index d2dbdc0a..1ef5ba22 100644 --- a/Source/MonoGame.Extended/Maps/Tiled/CollisionWorldExtensions.cs +++ b/Source/MonoGame.Extended.Collisions/CollisionWorldExtensions.cs @@ -1,7 +1,7 @@ using System.Linq; -using MonoGame.Extended.Collisions; +using MonoGame.Extended.Maps.Tiled; -namespace MonoGame.Extended.Maps.Tiled +namespace MonoGame.Extended.Collisions { public static class CollisionWorldExtensions { diff --git a/Source/MonoGame.Extended/Collisions/IActorTarget.cs b/Source/MonoGame.Extended.Collisions/IActorTarget.cs similarity index 100% rename from Source/MonoGame.Extended/Collisions/IActorTarget.cs rename to Source/MonoGame.Extended.Collisions/IActorTarget.cs diff --git a/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj new file mode 100644 index 00000000..26141dc7 --- /dev/null +++ b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj @@ -0,0 +1,66 @@ + + + + + 10.0 + Debug + AnyCPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A} + Library + Properties + MonoGame.Extended.Collisions + MonoGame.Extended.Collisions + en-US + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Profile7 + v4.5 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + ..\..\Dependencies\MonoGame.Framework.dll + + + + + {41724c52-3d50-45bb-81eb-3c8a247eafd1} + MonoGame.Extended + + + + + \ No newline at end of file diff --git a/Source/MonoGame.Extended.Collisions/Properties/AssemblyInfo.cs b/Source/MonoGame.Extended.Collisions/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..adbac64e --- /dev/null +++ b/Source/MonoGame.Extended.Collisions/Properties/AssemblyInfo.cs @@ -0,0 +1,30 @@ +using System.Resources; +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("MonoGame.Extended.Collisions")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("MonoGame.Extended.Collisions")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: NeutralResourcesLanguage("en")] + +// 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("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/MonoGame.Extended.sln b/Source/MonoGame.Extended.sln index 59b46608..299d469e 100644 --- a/Source/MonoGame.Extended.sln +++ b/Source/MonoGame.Extended.sln @@ -100,6 +100,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Batching", "Demos\Demo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.NuclexGui", "Demos\Demo.NuclexGui\Demo.NuclexGui.csproj", "{8003BA78-CB44-46B5-85A2-2A6440C3EFDC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Collisions", "MonoGame.Extended.Collisions\MonoGame.Extended.Collisions.csproj", "{02562C6F-5BFB-467E-8A95-68B6CE2D635A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -276,6 +278,14 @@ Global {8003BA78-CB44-46B5-85A2-2A6440C3EFDC}.Release|Any CPU.Build.0 = Release|Any CPU {8003BA78-CB44-46B5-85A2-2A6440C3EFDC}.Release|x86.ActiveCfg = Release|Any CPU {8003BA78-CB44-46B5-85A2-2A6440C3EFDC}.Release|x86.Build.0 = Release|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Debug|x86.ActiveCfg = Debug|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Debug|x86.Build.0 = Debug|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Release|Any CPU.Build.0 = Release|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Release|x86.ActiveCfg = Release|Any CPU + {02562C6F-5BFB-467E-8A95-68B6CE2D635A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/MonoGame.Extended/MonoGame.Extended.csproj b/Source/MonoGame.Extended/MonoGame.Extended.csproj index e5730821..4f2d9853 100644 --- a/Source/MonoGame.Extended/MonoGame.Extended.csproj +++ b/Source/MonoGame.Extended/MonoGame.Extended.csproj @@ -197,13 +197,6 @@ - - - - - - - @@ -230,7 +223,6 @@ - @@ -354,6 +346,7 @@ +