Make project build on Linux. Fix issue with HairClip shader being com…

…piled for previous MonoGame version.
ethanmoffat · Feb 10, 2022 · adc091b · adc091b
1 parent 794129b
commit adc091b
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 18 deletions.
diff --git a/EOLib.Graphics/EOLib.Graphics.csproj b/EOLib.Graphics/EOLib.Graphics.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\lib\</OutputPath>

diff --git a/EndlessClient/Audio/SoundManager.cs b/EndlessClient/Audio/SoundManager.cs
@@ -2,15 +2,16 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+#if !LINUX
 using System.Windows.Media;
 using System.Windows.Threading;
+#endif
 using Microsoft.Xna.Framework.Audio;
 
 namespace EndlessClient.Audio
 {
     public enum Note
     {
-
     }
 
     public class SoundManager : IDisposable

diff --git a/EndlessClient/Content/IShaderRepository.cs b/EndlessClient/Content/IShaderRepository.cs
@@ -18,6 +18,7 @@ public interface IShaderProvider
     public class ShaderRepository : IShaderProvider, IShaderRepository
     {
         public const string HairClip = "HairClip";
+        public const string HairClipFile = "ContentPipeline/HairClip.mgfx";
 
         IReadOnlyDictionary<string, Effect> IShaderProvider.Shaders => (IReadOnlyDictionary<string, Effect>)Shaders;
 

diff --git a/EndlessClient/ContentPipeline/HairClip.xnb → EndlessClient/ContentPipeline/HairClip.mgfx b/EndlessClient/ContentPipeline/HairClip.xnb → EndlessClient/ContentPipeline/HairClip.mgfx
diff --git a/EndlessClient/EndlessClient.csproj b/EndlessClient/EndlessClient.csproj
@@ -1,24 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
+  <PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Linux'))">
     <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <MonoGamePlatform>Windows</MonoGamePlatform>
-    <MonoGameContentBuilderExe>
-    </MonoGameContentBuilderExe>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+    <TargetFramework>net6.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <DefineConstants>$(DefineConstants);LINUX</DefineConstants>
+    <MonoGamePlatform>Linux</MonoGamePlatform>
+  </PropertyGroup>
+  <PropertyGroup>
     <_ResolveReferenceDependencies>true</_ResolveReferenceDependencies>
     <NoWarn>CS0649;NU1701</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\client</OutputPath>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\Game.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-    <DefineConstants>$(DefineConstants);LINUX</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Remove="ContentPipeline\bin\**" />
     <Compile Remove="ContentPipeline\obj\**" />
@@ -41,8 +44,8 @@
     <ProjectReference Include="..\EOLib\EOLib.csproj" />
   </ItemGroup>
   <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-    <Content Include="ContentPipeline\HairClip.xnb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Include="ContentPipeline\HairClip.mgfx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>

diff --git a/EndlessClient/GameExecution/EndlessGame.cs b/EndlessClient/GameExecution/EndlessGame.cs
@@ -84,13 +84,20 @@ protected override void LoadContent()
             _graphicsDeviceRepository.GraphicsDevice = GraphicsDevice;
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                _shaderRepository.Shaders[ShaderRepository.HairClip] = Content.Load<Effect>(ShaderRepository.HairClip);
+            {
+                if (!File.Exists(ShaderRepository.HairClipFile))
+                {
+                    throw new FileNotFoundException("Missing HairClip shader");
+                }
+
+                var shaderBytes = File.ReadAllBytes(ShaderRepository.HairClipFile);
+                _shaderRepository.Shaders[ShaderRepository.HairClip] = new Effect(GraphicsDevice, shaderBytes);
+            }
 
             base.LoadContent();
         }
 
 #if DEBUG
-
         protected override void Update(GameTime gameTime)
         {
             //todo: this is a debug-only mode launched with the F5 key.

diff --git a/EndlessClient/GameExecution/GameRunnerBase.cs b/EndlessClient/GameExecution/GameRunnerBase.cs
@@ -1,12 +1,15 @@
 using System.Diagnostics;
 using System.IO;
-using System.Windows.Forms;
 using AutomaticTypeMapper;
 using EndlessClient.Initialization;
 using EOLib.Config;
 using EOLib.Graphics;
 using EOLib.Localization;
 
+#if !LINUX
+using System.Windows.Forms;
+#endif
+
 namespace EndlessClient.GameExecution
 {
     public abstract class GameRunnerBase : IGameRunner
@@ -83,7 +86,9 @@ public virtual bool SetupDependencies()
 
         private void ShowErrorMessage(string message, string caption)
         {
+#if !LINUX
             MessageBox.Show(message, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+#endif
         }
 
         public virtual void RunGame()

diff --git a/EndlessClient/GameExecution/ReleaseGameRunner.cs b/EndlessClient/GameExecution/ReleaseGameRunner.cs
@@ -1,5 +1,7 @@
 using System;
+#if !LINUX
 using System.Windows.Forms;
+#endif
 using AutomaticTypeMapper;
 
 namespace EndlessClient.GameExecution
@@ -20,11 +22,13 @@ public override bool SetupDependencies()
             }
             catch (Exception ex)
             {
+#if !LINUX
                 MessageBox.Show(
                     $"Error setting up dependencies for the game! Error message is:\n\n{ex.Message}",
                     "Dependency setup error!",
                     MessageBoxButtons.OK,
                     MessageBoxIcon.Error);
+#endif
                 return false;
             }
         }
@@ -37,10 +41,13 @@ public override void RunGame()
             }
             catch (Exception ex)
             {
+#if !LINUX
                 ShowExceptionDialog(ex);
+#endif
             }
         }
 
+#if !LINUX
         private static void ShowExceptionDialog(Exception ex)
         {
             Application.EnableVisualStyles();
@@ -99,5 +106,6 @@ private static void ShowExceptionDialog(Exception ex)
             exForm.Controls.Add(exLabel1);
             exForm.ShowDialog();
         }
+#endif
     }
 }
diff --git a/EndlessClient/Old/Game.cs b/EndlessClient/Old/Game.cs
@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+#if !LINUX
 using System.Windows.Forms;
+#endif
 using EndlessClient.Audio;
 using EndlessClient.Dialogs;
 using EndlessClient.GameExecution;
@@ -45,7 +47,7 @@ public void ShowLostConnectionDialog()
             if (_backButtonPressed) return;
             EOMessageBox.Show(State == GameStates.PlayingTheGame
                 ? DialogResourceID.CONNECTION_LOST_IN_GAME
-                : DialogResourceID.CONNECTION_LOST_CONNECTION);    
+                : DialogResourceID.CONNECTION_LOST_CONNECTION);
         }
 
         public void ResetWorldElements()
@@ -212,9 +214,11 @@ private bool InitializeSoundManager()
             }
             catch (Exception ex)
             {
+#if !LINUX
                 MessageBox.Show(
                     string.Format("There was an error (type: {2}) initializing the sound manager: {0}\n\nCall Stack:\n {1}", ex.Message,
                         ex.StackTrace, ex.GetType()), "Sound Manager Error");
+#endif
                 Exit();
                 return false;
             }

diff --git a/EndlessClient/Rendering/CharacterProperties/HatRenderer.cs b/EndlessClient/Rendering/CharacterProperties/HatRenderer.cs
@@ -5,7 +5,6 @@
 using EOLib.Domain.Extensions;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace EndlessClient.Rendering.CharacterProperties