diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10.csproj
index 37091d00..f7cb5673 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10.csproj
@@ -35,25 +35,26 @@
true
-
+
False
- ..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.dll
+ ..\..\packages\SharpDX.2.4.2\lib\net40\SharpDX.dll
-
+
False
- ..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.D3DCompiler.dll
+ ..\..\packages\SharpDX.D3DCompiler.2.4.2\lib\net40\SharpDX.D3DCompiler.dll
-
+
False
- ..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.Direct3D10.dll
+ ..\..\packages\SharpDX.Direct3D10.2.4.2\lib\net40\SharpDX.Direct3D10.dll
-
+
False
- ..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.DXGI.dll
+ ..\..\packages\SharpDX.DXGI.2.4.2\lib\net40\SharpDX.DXGI.dll
+
@@ -90,6 +91,9 @@
ANX.Framework
+
+
+
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/GraphicsDeviceDX.cs b/RenderSystems/ANX.RenderSystem.Windows.DX10/GraphicsDeviceDX.cs
index c60e3373..d0b17712 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX10/GraphicsDeviceDX.cs
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/GraphicsDeviceDX.cs
@@ -415,10 +415,10 @@ namespace ANX.RenderSystem.Windows.DX10
#region SetViewport
protected void SetViewport(int x, int y, int width, int height, float minDepth, float maxDepth)
{
- nativeDevice.Rasterizer.SetViewports(new Dx10.Viewport(x, y, width, height, minDepth, maxDepth));
+ nativeDevice.Rasterizer.SetViewports(new SharpDX.Viewport(x, y, width, height, minDepth, maxDepth));
}
- protected void SetViewport(params Dx10.Viewport[] viewports)
+ protected void SetViewport(params SharpDX.Viewport[] viewports)
{
nativeDevice.Rasterizer.SetViewports(viewports);
}
@@ -494,7 +494,7 @@ namespace ANX.RenderSystem.Windows.DX10
CreateDepthStencilBuffer(this.depthStencilBuffer.Description.Format, this.backBuffer.Description.Width, this.backBuffer.Description.Height, false);
nativeDevice.OutputMerger.SetRenderTargets(1, new Dx10.RenderTargetView[] { this.renderView }, this.depthStencilView); //TODO: necessary?
nativeDevice.OutputMerger.SetTargets(this.depthStencilView, this.renderView);
- nativeDevice.Rasterizer.SetViewports(new Dx10.Viewport(0, 0, this.backBuffer.Description.Width, this.backBuffer.Description.Height));
+ nativeDevice.Rasterizer.SetViewports(new SharpDX.Viewport(0, 0, this.backBuffer.Description.Width, this.backBuffer.Description.Height));
// dispose the old views
for (int i = 0; i < renderTargetView.Length; i++)
@@ -511,7 +511,7 @@ namespace ANX.RenderSystem.Windows.DX10
int renderTargetCount = renderTargets.Length;
RenderTargetView[] renderTargetsToDelete = new RenderTargetView[renderTargetView.Length];
Array.Copy(renderTargetView, renderTargetsToDelete, renderTargetView.Length);
- Dx10.Viewport[] rtViewports = new Dx10.Viewport[renderTargetCount];
+ SharpDX.Viewport[] rtViewports = new SharpDX.Viewport[renderTargetCount];
if (this.renderTargetView.Length != renderTargetCount)
{
@@ -539,7 +539,7 @@ namespace ANX.RenderSystem.Windows.DX10
}
renderTargetView[i] = new Dx10.RenderTargetView(nativeDevice, ((DxTexture2D)nativeRenderTarget).NativeShaderResourceView.Resource);
- rtViewports[i] = new Dx10.Viewport(0, 0, width, height);
+ rtViewports[i] = new SharpDX.Viewport(0, 0, width, height);
}
}
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs b/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs
index adad6e21..4b9accee 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ANX Developer Team")]
[assembly: AssemblyProduct("ANX.RenderSystem.Windows.DX10")]
-[assembly: AssemblyCopyright("Copyright © ANX Developer Team 2011-2012")]
+[assembly: AssemblyCopyright("Copyright © ANX Developer 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.7.27.*")]
-[assembly: AssemblyFileVersion("0.7.27.0")]
+[assembly: AssemblyVersion("0.7.28.*")]
+[assembly: AssemblyFileVersion("0.7.28.0")]
[assembly: InternalsVisibleTo("ANX.Framework.ContentPipeline")]
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/packages.config b/RenderSystems/ANX.RenderSystem.Windows.DX10/packages.config
new file mode 100644
index 00000000..231b606a
--- /dev/null
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/packages.config
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file