From 575fc9e3b03cf8c7f4c4ee034bf640dacec58267 Mon Sep 17 00:00:00 2001
From: Niclas Thobaben <NiclasThobaben@Mac-3c15c2e44558.lan>
Date: Thu, 4 May 2017 23:59:32 +0200
Subject: [PATCH] Merge

---
 nhengine.sln                                  | 29 ++++++++++++-------
 .../org.niclasundharald.engine.csproj         | 22 +-------------
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/nhengine.sln b/nhengine.sln
index 226eb9d..40f32e0 100644
--- a/nhengine.sln
+++ b/nhengine.sln
@@ -5,30 +5,39 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nhengine", "NHEngine\nhengi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.niclasundharald.engine", "org.niclasundharald.engine\org.niclasundharald.engine.csproj", "{3E812F66-D5F3-4599-8360-97F355B6CC1B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{9BA2E63F-E39C-465C-AC48-45B30B532A0C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp", "ImageSharp\ImageSharp.csproj", "{4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nhengine.Audio", "..\nhengine.Audio\nhengine.Audio\nhengine.Audio.csproj", "{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|x86.Build.0 = Debug|Any CPU
+		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|x86.ActiveCfg = Release|Any CPU
+		{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|x86.Build.0 = Release|Any CPU
 		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0} = {9BA2E63F-E39C-465C-AC48-45B30B532A0C}
+		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|x86.Build.0 = Release|Any CPU
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Debug|Any CPU.Build.0 = Debug|x86
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Release|Any CPU.ActiveCfg = Release|x86
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Release|Any CPU.Build.0 = Release|x86
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Debug|x86.ActiveCfg = Debug|x86
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Debug|x86.Build.0 = Debug|x86
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Release|x86.ActiveCfg = Release|x86
+		{DEFC64FA-45BC-4DA2-A884-66AFA99D34B4}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 EndGlobal
diff --git a/org.niclasundharald.engine/org.niclasundharald.engine.csproj b/org.niclasundharald.engine/org.niclasundharald.engine.csproj
index 1882432..e6340b1 100644
--- a/org.niclasundharald.engine/org.niclasundharald.engine.csproj
+++ b/org.niclasundharald.engine/org.niclasundharald.engine.csproj
@@ -34,15 +34,6 @@
     <Reference Include="OpenTK.GLControl">
       <HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
     </Reference>
-    <Reference Include="ImageSharp">
-      <HintPath>contrib\ImageSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Buffers">
-      <HintPath>..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -60,14 +51,6 @@
     <Compile Include="graphics\Model3D.cs" />
     <Compile Include="graphics\ModelManager.cs" />
     <Compile Include="FileHelper.cs" />
-    <Compile Include="graphics\Texture.cs" />
-    <Compile Include="graphics\LoadedModel.cs" />
-    <Compile Include="Actor.cs" />
-    <Compile Include="ActorAction.cs" />
-    <Compile Include="BallisticActor.cs" />
-    <Compile Include="Physics.cs" />
-    <Compile Include="graphics\SquaredMap.cs" />
-    <Compile Include="exceptions\OutOfWorldException.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="OpenTK.dll.config" />
@@ -77,10 +60,7 @@
   <ItemGroup>
     <Folder Include="graphics\" />
     <Folder Include="graphics\primitives\" />
-    <Folder Include="contrib\" />
-    <Folder Include="contrib\ImageSharp.dll">
-    </Folder>
-    <Folder Include="exceptions\" />
+    <Folder Include="audio\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file