From 3963ee850162aa5d6c2cf9a24fe3c72703a25c58 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 25 Apr 2004 18:52:27 +0000 Subject: [PATCH] use same zbias in D3D as OpenGL --- stepmania/src/Model.cpp | 1 - stepmania/src/RageDisplay_D3D.cpp | 2 +- stepmania/src/RageDisplay_OGL.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index 01dcad7d78..27306e6d86 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -488,7 +488,6 @@ void Model::DrawPrimitives() DISPLAY->SetSphereEnironmentMapping( mat.alpha.bSphereMapped ); // UGLY: This overrides the Actor's BlendMode DISPLAY->SetTextureModeAdd(); - //DISPLAY->SetTextureModeModulate(); DISPLAY->SetTextureFiltering( true ); } } diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index 06284b2cde..4ecb3f0f29 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -1030,7 +1030,7 @@ void RageDisplay_D3D::SetBlendMode( BlendMode mode ) /* This is almost exclusively used to draw masks to the Z-buffer. Make sure * masks always win the depth test when drawn at the same position. */ - g_pd3dDevice->SetRenderState( D3DRS_ZBIAS, 1 ); + g_pd3dDevice->SetRenderState( D3DRS_ZBIAS, 30 ); // this bias is bigger than it needs to be to handle the coplanar case break; default: diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index f33d10f69c..b283f20f8e 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -1475,7 +1475,7 @@ void RageDisplay_OGL::SetBlendMode( BlendMode mode ) /* This is almost exclusively used to draw masks to the Z-buffer. Make sure * masks always win the depth test when drawn at the same position. */ - glDepthRange( 0.0, 0.95 ); + glDepthRange( 0.0, 0.95 ); // this bias is bigger than it needs to be to handle the coplanar case break; default: ASSERT(0);