diff --git a/TrueCraft.Client/Program.cs b/TrueCraft.Client/Program.cs index e314a36..d9840c8 100644 --- a/TrueCraft.Client/Program.cs +++ b/TrueCraft.Client/Program.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Net; using System.Linq; using System.Net.Sockets; @@ -28,7 +29,11 @@ namespace TrueCraft.Client if (RuntimeInfo.IsLinux) return Assembly.LoadFile("MonoGame.Framework.Linux.dll"); if (RuntimeInfo.IsWindows) - return Assembly.LoadFile("MonoGame.Framework.Windows.dll"); + { + // MS.NET needs the absolute path to an assembly to load it. + var fileInfo = new FileInfo("MonoGame.Framework.Windows.dll"); + return Assembly.LoadFile(fileInfo.FullName); + } // TODO: OSX support return null; } diff --git a/TrueCraft.Client/TrueCraftGame.cs b/TrueCraft.Client/TrueCraftGame.cs index bddf20d..61844e4 100644 --- a/TrueCraft.Client/TrueCraftGame.cs +++ b/TrueCraft.Client/TrueCraftGame.cs @@ -338,13 +338,9 @@ namespace TrueCraft.Client Camera.ApplyTo(TransparentEffect); } - // Used for faking the disabling of color buffer writing. private static readonly BlendState ColorWriteDisable = new BlendState() { - ColorSourceBlend = Blend.Zero, - AlphaSourceBlend = Blend.Zero, - ColorDestinationBlend = Blend.One, - AlphaDestinationBlend = Blend.One + ColorWriteChannels = ColorWriteChannels.None }; protected override void Draw(GameTime gameTime) diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj index edde273..a1c8fc9 100644 --- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj +++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj @@ -109,7 +109,8 @@ rm $(TargetDir)/MonoGame.Framework.dll && cp $(SolutionDir)/packages/MonoGame.Framework.Linux.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Linux.dll && cp $(SolutionDir)/packages/MonoGame.Framework.WindowsGL.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Windows.dll - - rm $(TargetDir)/MonoGame.Framework.dll && cp $(SolutionDir)/packages/MonoGame.Framework.Linux.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Linux.dll && cp $(SolutionDir)/packages/MonoGame.Framework.WindowsGL.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Windows.dll + del $(TargetDir)MonoGame.Framework.dll +copy $(SolutionDir)packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\MonoGame.Framework.dll $(TargetDir)MonoGame.Framework.Linux.dll +copy $(SolutionDir)packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\MonoGame.Framework.dll $(TargetDir)MonoGame.Framework.Windows.dll - + \ No newline at end of file