actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix goofy lifemeter and disappearing HoldNote bodies (z-buffer problems)

Browse Source
This commit is contained in:
Chris Danford
2003-05-15 06:33:08 +00:00
parent 54bedc3eba
commit 6f2ace362f
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBar.cpp
+5 -6
View File
@@ -53,8 +53,10 @@ public:
bool bExtra = GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2(); bool bExtra = GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2();
m_quadMask.SetDiffuse( RageColor(0,0,0,0) ); m_quadMask.SetDiffuse( RageColor(0,0,0,1) );
m_quadMask.SetZ( 1 ); m_quadMask.SetZ( 1 );
m_quadMask.SetBlendMode( BLEND_NO_EFFECT );
m_quadMask.SetUseZBuffer( true );
CString sGraphicPath; CString sGraphicPath;
RageTextureID ID; RageTextureID ID;
@@ -63,10 +65,12 @@ public:
sGraphicPath = ssprintf("LifeMeterBar %snormal", bExtra?"extra ":""); sGraphicPath = ssprintf("LifeMeterBar %snormal", bExtra?"extra ":"");
ID.filename = THEME->GetPathToG(sGraphicPath); ID.filename = THEME->GetPathToG(sGraphicPath);
m_sprStreamNormal.Load( ID ); m_sprStreamNormal.Load( ID );
m_sprStreamNormal.SetUseZBuffer( true );
sGraphicPath = ssprintf("LifeMeterBar %shot", bExtra?"extra ":""); sGraphicPath = ssprintf("LifeMeterBar %shot", bExtra?"extra ":"");
ID.filename = THEME->GetPathToG(sGraphicPath); ID.filename = THEME->GetPathToG(sGraphicPath);
m_sprStreamHot.Load( ID ); m_sprStreamHot.Load( ID );
m_sprStreamHot.SetUseZBuffer( true );
sGraphicPath = ssprintf("LifeMeterBar %sframe", bExtra?"extra ":""); sGraphicPath = ssprintf("LifeMeterBar %sframe", bExtra?"extra ":"");
ID.filename = THEME->GetPathToG(sGraphicPath); ID.filename = THEME->GetPathToG(sGraphicPath);
@@ -116,8 +120,6 @@ public:
void DrawPrimitives() void DrawPrimitives()
{ {
DISPLAY->SetZBuffer( true );
if( GAMESTATE->IsPlayerEnabled(m_PlayerNumber) ) if( GAMESTATE->IsPlayerEnabled(m_PlayerNumber) )
{ {
DrawMask( m_fPercent ); // this is the "right endcap" to the life DrawMask( m_fPercent ); // this is the "right endcap" to the life
@@ -139,8 +141,6 @@ public:
} }
DISPLAY->SetZBuffer( false );
m_sprFrame.Draw(); m_sprFrame.Draw();
} }
@@ -226,7 +226,6 @@ public:
m_quadMask.StretchTo( rect ); m_quadMask.StretchTo( rect );
m_quadMask.Draw(); m_quadMask.Draw();
} }
}; };
stepmania/src/NoteDisplay.cpp
+6
View File
@@ -419,6 +419,8 @@ void NoteDisplay::DrawHold( const HoldNote& hn, const bool bActive, const float
const RectF *pRect = pBottomCap->GetCurrentTextureCoordRect(); const RectF *pRect = pBottomCap->GetCurrentTextureCoordRect();
DISPLAY->SetTexture( pTexture ); DISPLAY->SetTexture( pTexture );
DISPLAY->SetBlendMode( BLEND_NORMAL ); DISPLAY->SetBlendMode( BLEND_NORMAL );
DISPLAY->SetBackfaceCull( false );
DISPLAY->SetZBuffer( false );
if( bDrawGlowOnly ) if( bDrawGlowOnly )
DISPLAY->SetTextureModeGlow(); DISPLAY->SetTextureModeGlow();
else else
@@ -484,6 +486,8 @@ void NoteDisplay::DrawHold( const HoldNote& hn, const bool bActive, const float
const RectF *pRect = pSprBody->GetCurrentTextureCoordRect(); const RectF *pRect = pSprBody->GetCurrentTextureCoordRect();
DISPLAY->SetTexture( pTexture ); DISPLAY->SetTexture( pTexture );
DISPLAY->SetBlendMode( BLEND_NORMAL ); DISPLAY->SetBlendMode( BLEND_NORMAL );
DISPLAY->SetBackfaceCull( false );
DISPLAY->SetZBuffer( false );
if( bDrawGlowOnly ) if( bDrawGlowOnly )
DISPLAY->SetTextureModeGlow(); DISPLAY->SetTextureModeGlow();
else else
@@ -562,6 +566,8 @@ void NoteDisplay::DrawHold( const HoldNote& hn, const bool bActive, const float
const RectF *pRect = pSprTopCap->GetCurrentTextureCoordRect(); const RectF *pRect = pSprTopCap->GetCurrentTextureCoordRect();
DISPLAY->SetTexture( pTexture ); DISPLAY->SetTexture( pTexture );
DISPLAY->SetBlendMode( BLEND_NORMAL ); DISPLAY->SetBlendMode( BLEND_NORMAL );
DISPLAY->SetBackfaceCull( false );
DISPLAY->SetZBuffer( false );
if( bDrawGlowOnly ) if( bDrawGlowOnly )
DISPLAY->SetTextureModeGlow(); DISPLAY->SetTextureModeGlow();
else else