Merge pull request #266 from Pear-231/AudioEditor

General bug fixes and improvements and Audio updates

Author: donkeyProgramming

AssetEditor.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33516.290
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11111.16 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{18424B6A-CB8A-4CE1-935C-72459F31521B}"
 EndProject
@@ -90,6 +90,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.DatabaseEditor", "E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utility.DatabaseSchemaGenerator", "Editors\DatabaseEditor\Utility.DatabaseSchemaGenerator\Utility.DatabaseSchemaGenerator.csproj", "{0298ED36-AE77-4CC3-9A46-40D700A3C225}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Audio", "Audio", "{4D35FFE2-8490-4694-8981-654016F2BD3D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -232,7 +234,7 @@ Global
 		{CAEB33BF-48DF-4388-BE6B-7D7ABBB9414B} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{EAFBC3D8-A146-4BA3-8024-DE4E20D3C884} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{8E55B123-C8E5-4D65-AAAA-C4DC4713CB8E} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
-		{410AC3F4-021C-4993-BCCA-1810D153075D} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
+		{410AC3F4-021C-4993-BCCA-1810D153075D} = {4D35FFE2-8490-4694-8981-654016F2BD3D}
 		{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{F513A090-CC3F-4DB4-8332-50EB3FDA5A37} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{0B14A236-AAE0-4E9B-A41E-4AF9DD976BA7} = {18424B6A-CB8A-4CE1-935C-72459F31521B}
@@ -257,6 +259,7 @@ Global
 		{5A4DFCA4-6884-49D2-BA24-A9C8676A0C77} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{BEE61E8C-B25D-4982-9C42-6131AED41B48} = {5A4DFCA4-6884-49D2-BA24-A9C8676A0C77}
 		{0298ED36-AE77-4CC3-9A46-40D700A3C225} = {5A4DFCA4-6884-49D2-BA24-A9C8676A0C77}
+		{4D35FFE2-8490-4694-8981-654016F2BD3D} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AB5968F3-98ED-4AFF-98EA-0DBEDCACADF2}

AssetEditor/AssetEditor.csproj

@@ -28,6 +28,14 @@
         <ProjectReference Include="..\Shared\SharedUI\Shared.Ui.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <Content Include="..\GameWorld\ContentProject\Content\bin\Windows\Content\**\*.*">
+            <Link>Content\%(RecursiveDir)%(Filename)%(Extension)</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        </Content>
+    </ItemGroup>
+
     <PropertyGroup>
         <DebugType>embedded</DebugType>
         <Authors>AssetEdCommunity</Authors>
@@ -43,22 +51,19 @@
         <None Include="..\.editorconfig" />
     </ItemGroup>
 
-
-
     <ItemGroup>
       <Resource Include="AssetEditorIcon.png" />
     </ItemGroup>
 
     <PropertyGroup>
         <!--
-    Make sure any documentation comments which are included in code get checked for syntax during the build, but do
-    not report warnings for missing comments.
-    CS1573: Parameter 'parameter' has no matching param tag in the XML comment for 'parameter' (but other parameters do)
-    CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member'
-    CS1712: Type parameter 'type_parameter' has no matching typeparam tag in the XML comment on 'type_or_member' (but other type parameters do)
--->
+        Make sure any documentation comments which are included in code get checked for syntax during the build, but do
+        not report warnings for missing comments.
+        CS1573: Parameter 'parameter' has no matching param tag in the XML comment for 'parameter' (but other parameters do)
+        CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member'
+        CS1712: Type parameter 'type_parameter' has no matching typeparam tag in the XML comment on 'type_or_member' (but other type parameters do)
+        -->
         <GenerateDocumentationFile>False</GenerateDocumentationFile>
         <NoWarn>$(NoWarn),1573,1591,1712</NoWarn>
     </PropertyGroup>
-
 </Project>

AssetEditor/ViewModels/SettingsViewModel.cs

@@ -37,12 +37,12 @@ public SettingsViewModel(ApplicationSettingsService settingsService)
             RenderEngineBackgroundColours = new ObservableCollection<BackgroundColour>((BackgroundColour[])Enum.GetValues(typeof(BackgroundColour)));
             CurrentRenderEngineBackgroundColour = _settingsService.CurrentSettings.RenderEngineBackgroundColour;
             StartMaximised = _settingsService.CurrentSettings.StartMaximised;
-            Games = new ObservableCollection<GameTypeEnum>(GameInformationDatabase.Games.OrderBy(g => g.DisplayName).Select(g => g.Type));
+            Games = new ObservableCollection<GameTypeEnum>(GameInformationDatabase.Games.Values.OrderBy(game => game.DisplayName).Select(game => game.Type));
             CurrentGame = _settingsService.CurrentSettings.CurrentGame;
             LoadCaPacksByDefault = _settingsService.CurrentSettings.LoadCaPacksByDefault;
             ShowCAWemFiles = _settingsService.CurrentSettings.ShowCAWemFiles;
             OnlyLoadLod0ForReferenceMeshes = _settingsService.CurrentSettings.OnlyLoadLod0ForReferenceMeshes;
-            foreach (var game in GameInformationDatabase.Games.OrderBy(g => g.DisplayName))
+            foreach (var game in GameInformationDatabase.Games.Values.OrderBy(game => game.DisplayName))
             {
                 GameDirectores.Add(
                     new GamePathItem()
@@ -56,7 +56,8 @@ public SettingsViewModel(ApplicationSettingsService settingsService)
         }
 
 
-        [RelayCommand] private void Save()
+        [RelayCommand]
+        private void Save()
         {
             _settingsService.CurrentSettings.Theme = CurrentTheme;
             _settingsService.CurrentSettings.RenderEngineBackgroundColour = CurrentRenderEngineBackgroundColour;
@@ -73,7 +74,8 @@ [RelayCommand] private void Save()
             MessageBox.Show("Please restart the tool after updating settings!");
         }
 
-        [RelayCommand] private void Browse()
+        [RelayCommand]
+        private void Browse()
         {
             var dialog = new OpenFileDialog();
             dialog.Filter = "Executable files (*.exe)|*.exe";