backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

updated ANX.RenderSystem.GL3 to use NuGet for OpenTK dependencies

Browse Source
This commit is contained in:
Glatzemann 2013-07-23 10:58:57 +00:00 committed by Konstantin Koch
parent 1f1055e66f
commit ef034c0cb8
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3.csproj
View File

@ -35,8 +35,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="OpenTK"> <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\..\lib\OpenTK\OpenTK.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\OpenTK.1.1.1160.61462\lib\NET40\OpenTK.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
</ItemGroup> </ItemGroup>
@ -76,6 +77,9 @@
<Name>ANX.Framework</Name> <Name>ANX.Framework</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PreBuildEvent> <PreBuildEvent>

4
RenderSystems/ANX.Framework.GL3/BlendStateGL3.cs
View File

@ -289,13 +289,13 @@ namespace ANX.RenderSystem.GL3
return BlendingFactorDest.DstAlpha; return BlendingFactorDest.DstAlpha;
case Blend.DestinationColor: case Blend.DestinationColor:
return BlendingFactorDest.DstColor; return BlendingFactorDest.ConstantColor; //TODO: check, was .DstColor;
case Blend.InverseDestinationAlpha: case Blend.InverseDestinationAlpha:
return BlendingFactorDest.OneMinusDstAlpha; return BlendingFactorDest.OneMinusDstAlpha;
case Blend.InverseDestinationColor: case Blend.InverseDestinationColor:
return BlendingFactorDest.OneMinusDstColor; return BlendingFactorDest.OneMinusConstantColor; //TODO: check, was .OneMinusDstColor;
case Blend.InverseSourceAlpha: case Blend.InverseSourceAlpha:
return BlendingFactorDest.OneMinusSrcAlpha; return BlendingFactorDest.OneMinusSrcAlpha;

4
RenderSystems/ANX.Framework.GL3/DepthStencilStateGL3.cs
View File

@ -234,12 +234,12 @@ namespace ANX.RenderSystem.GL3
TranslateStencilOp(CounterClockwiseStencilPass)); TranslateStencilOp(CounterClockwiseStencilPass));
ErrorHelper.Check("StencilOpSeparate Back"); ErrorHelper.Check("StencilOpSeparate Back");
GL.StencilFuncSeparate(StencilFace.Front, GL.StencilFuncSeparate((Version20)StencilFace.Front,
TranslateStencilFunction(StencilFunction), TranslateStencilFunction(StencilFunction),
ReferenceStencil, StencilMask); ReferenceStencil, StencilMask);
ErrorHelper.Check("StencilFuncSeparate Front"); ErrorHelper.Check("StencilFuncSeparate Front");
GL.StencilFuncSeparate(StencilFace.Back, GL.StencilFuncSeparate((Version20)StencilFace.Back,
TranslateStencilFunction(CounterClockwiseStencilFunction), TranslateStencilFunction(CounterClockwiseStencilFunction),
ReferenceStencil, StencilMask); ReferenceStencil, StencilMask);
ErrorHelper.Check("StencilFuncSeparate Back"); ErrorHelper.Check("StencilFuncSeparate Back");

6
RenderSystems/ANX.Framework.GL3/Properties/AssemblyInfo.cs
View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ANX.Framework Team")] [assembly: AssemblyCompany("ANX.Framework Team")]
[assembly: AssemblyProduct("ANX.RenderSystem.GL3")] [assembly: AssemblyProduct("ANX.RenderSystem.GL3")]
[assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011 - 2012")] [assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011 - 2013")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.5.15.*")] [assembly: AssemblyVersion("0.5.16.*")]
[assembly: AssemblyFileVersion("0.5.15.0")] [assembly: AssemblyFileVersion("0.5.16.0")]
[assembly: InternalsVisibleTo("ANX.Framework.ContentPipeline")] [assembly: InternalsVisibleTo("ANX.Framework.ContentPipeline")]

4
RenderSystems/ANX.Framework.GL3/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OpenTK" version="1.1.1160.61462" targetFramework="net40" />
</packages>