From ef034c0cb823a822531bc0bb9e703b988f5b7bda Mon Sep 17 00:00:00 2001
From: Glatzemann <glatzemann@users.noreply.github.com>
Date: Tue, 23 Jul 2013 10:58:57 +0000
Subject: [PATCH] updated ANX.RenderSystem.GL3 to use NuGet for OpenTK
 dependencies

---
 .../ANX.Framework.GL3/ANX.RenderSystem.GL3.csproj         | 8 ++++++--
 RenderSystems/ANX.Framework.GL3/BlendStateGL3.cs          | 4 ++--
 RenderSystems/ANX.Framework.GL3/DepthStencilStateGL3.cs   | 4 ++--
 .../ANX.Framework.GL3/Properties/AssemblyInfo.cs          | 6 +++---
 RenderSystems/ANX.Framework.GL3/packages.config           | 4 ++++
 5 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 RenderSystems/ANX.Framework.GL3/packages.config

diff --git a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3.csproj
index 48044e87..e142f1df 100644
--- a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3.csproj
+++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3.csproj
@@ -35,8 +35,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK">
-      <HintPath>..\..\lib\OpenTK\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\OpenTK.1.1.1160.61462\lib\NET40\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
@@ -76,6 +77,9 @@
       <Name>ANX.Framework</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/RenderSystems/ANX.Framework.GL3/BlendStateGL3.cs b/RenderSystems/ANX.Framework.GL3/BlendStateGL3.cs
index d16b492a..aae031a5 100644
--- a/RenderSystems/ANX.Framework.GL3/BlendStateGL3.cs
+++ b/RenderSystems/ANX.Framework.GL3/BlendStateGL3.cs
@@ -289,13 +289,13 @@ namespace ANX.RenderSystem.GL3
 					return BlendingFactorDest.DstAlpha;
 
 				case Blend.DestinationColor:
-					return BlendingFactorDest.DstColor;
+					return BlendingFactorDest.ConstantColor; //TODO: check, was .DstColor;
 
 				case Blend.InverseDestinationAlpha:
 					return BlendingFactorDest.OneMinusDstAlpha;
 
 				case Blend.InverseDestinationColor:
-					return BlendingFactorDest.OneMinusDstColor;
+					return BlendingFactorDest.OneMinusConstantColor;    //TODO: check, was .OneMinusDstColor;
 
 				case Blend.InverseSourceAlpha:
 					return BlendingFactorDest.OneMinusSrcAlpha;
diff --git a/RenderSystems/ANX.Framework.GL3/DepthStencilStateGL3.cs b/RenderSystems/ANX.Framework.GL3/DepthStencilStateGL3.cs
index 57e77bbe..53f6421d 100644
--- a/RenderSystems/ANX.Framework.GL3/DepthStencilStateGL3.cs
+++ b/RenderSystems/ANX.Framework.GL3/DepthStencilStateGL3.cs
@@ -234,12 +234,12 @@ namespace ANX.RenderSystem.GL3
 					TranslateStencilOp(CounterClockwiseStencilPass));
 				ErrorHelper.Check("StencilOpSeparate Back");
 
-				GL.StencilFuncSeparate(StencilFace.Front,
+				GL.StencilFuncSeparate((Version20)StencilFace.Front,
 					TranslateStencilFunction(StencilFunction),
 					ReferenceStencil, StencilMask);
 				ErrorHelper.Check("StencilFuncSeparate Front");
 
-				GL.StencilFuncSeparate(StencilFace.Back,
+				GL.StencilFuncSeparate((Version20)StencilFace.Back,
 					TranslateStencilFunction(CounterClockwiseStencilFunction),
 					ReferenceStencil, StencilMask);
 				ErrorHelper.Check("StencilFuncSeparate Back");
diff --git a/RenderSystems/ANX.Framework.GL3/Properties/AssemblyInfo.cs b/RenderSystems/ANX.Framework.GL3/Properties/AssemblyInfo.cs
index ab1faa04..5474cb6f 100644
--- a/RenderSystems/ANX.Framework.GL3/Properties/AssemblyInfo.cs
+++ b/RenderSystems/ANX.Framework.GL3/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ANX.Framework Team")]
 [assembly: AssemblyProduct("ANX.RenderSystem.GL3")]
-[assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011 - 2012")]
+[assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011 - 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.15.*")]
-[assembly: AssemblyFileVersion("0.5.15.0")]
+[assembly: AssemblyVersion("0.5.16.*")]
+[assembly: AssemblyFileVersion("0.5.16.0")]
 
 [assembly: InternalsVisibleTo("ANX.Framework.ContentPipeline")]
diff --git a/RenderSystems/ANX.Framework.GL3/packages.config b/RenderSystems/ANX.Framework.GL3/packages.config
new file mode 100644
index 00000000..871e2d42
--- /dev/null
+++ b/RenderSystems/ANX.Framework.GL3/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="OpenTK" version="1.1.1160.61462" targetFramework="net40" />
+</packages>
\ No newline at end of file