From 33bf6b2a0bbb9a763fa819f594dca875fe6e2637 Mon Sep 17 00:00:00 2001 From: William Moorehouse Date: Thu, 18 Jun 2015 17:23:50 -0400 Subject: [PATCH 1/4] Fixed building on Windows --- TrueCraft.Client/Program.cs | 7 ++++++- TrueCraft.Launcher/TrueCraft.Launcher.csproj | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) 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.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj index edde273..22c83b1 100644 --- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj +++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj @@ -110,6 +110,9 @@ - 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 && 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 From fc7f52b61953e3eec37fd4d1060a23f27f8f8697 Mon Sep 17 00:00:00 2001 From: William Moorehouse Date: Thu, 18 Jun 2015 17:35:44 -0400 Subject: [PATCH 2/4] Slight optimization thanks to @UnknownShadow200 --- TrueCraft.Client/TrueCraftGame.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/TrueCraft.Client/TrueCraftGame.cs b/TrueCraft.Client/TrueCraftGame.cs index bddf20d..e71824c 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.None }; protected override void Draw(GameTime gameTime) From 833c1027259c5c6e9ab15b930a45a7e28fc67129 Mon Sep 17 00:00:00 2001 From: William Moorehouse Date: Thu, 18 Jun 2015 17:45:27 -0400 Subject: [PATCH 3/4] Fixed duplicates --- TrueCraft.Launcher/TrueCraft.Launcher.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj index 22c83b1..a1c8fc9 100644 --- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj +++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj @@ -109,8 +109,6 @@ 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 && 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 From 7046a0f53c1933b2404f9763d575f2d09c496fdb Mon Sep 17 00:00:00 2001 From: William Moorehouse Date: Thu, 18 Jun 2015 17:51:47 -0400 Subject: [PATCH 4/4] :zzz: --- TrueCraft.Client/TrueCraftGame.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TrueCraft.Client/TrueCraftGame.cs b/TrueCraft.Client/TrueCraftGame.cs index e71824c..61844e4 100644 --- a/TrueCraft.Client/TrueCraftGame.cs +++ b/TrueCraft.Client/TrueCraftGame.cs @@ -340,7 +340,7 @@ namespace TrueCraft.Client private static readonly BlendState ColorWriteDisable = new BlendState() { - ColorWriteChannels.None + ColorWriteChannels = ColorWriteChannels.None }; protected override void Draw(GameTime gameTime)