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

don't clear the texture redundantly

Browse Source 
fix missing SetZoom
This commit is contained in:
Glenn Maynard
2006-11-03 07:31:19 +00:00
parent d9a533bf9f
commit e77cf2375f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDisplay.cpp
+6 -2
View File
@@ -373,12 +373,14 @@ void NoteDisplay::DrawHoldTopCap( const TapNote& tn, int iCol, int iRow, bool bI
vector<Sprite*> vpSpr; vector<Sprite*> vpSpr;
Sprite *pSprTopCap = GetHoldSprite( m_HoldTopCap, NotePart_HoldTopCap, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld && !cache->m_bHoldActiveIsAddLayer ); Sprite *pSprTopCap = GetHoldSprite( m_HoldTopCap, NotePart_HoldTopCap, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld && !cache->m_bHoldActiveIsAddLayer );
pSprTopCap->SetZoom( ArrowEffects::GetZoom( m_pPlayerState ) );
vpSpr.push_back( pSprTopCap ); vpSpr.push_back( pSprTopCap );
if( bIsBeingHeld && cache->m_bHoldActiveIsAddLayer ) if( bIsBeingHeld && cache->m_bHoldActiveIsAddLayer )
{ {
Sprite *pSpr = GetHoldSprite( m_HoldTopCap, NotePart_HoldTopCap, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, true ); Sprite *pSpr = GetHoldSprite( m_HoldTopCap, NotePart_HoldTopCap, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, true );
ASSERT( pSpr->GetUnzoomedWidth() == pSprTopCap->GetUnzoomedWidth() ); ASSERT( pSpr->GetUnzoomedWidth() == pSprTopCap->GetUnzoomedWidth() );
ASSERT( pSpr->GetUnzoomedHeight() == pSprTopCap->GetUnzoomedHeight() ); ASSERT( pSpr->GetUnzoomedHeight() == pSprTopCap->GetUnzoomedHeight() );
pSpr->SetZoom( ArrowEffects::GetZoom( m_pPlayerState ) );
vpSpr.push_back( pSpr ); vpSpr.push_back( pSpr );
} }
@@ -483,12 +485,14 @@ void NoteDisplay::DrawHoldBody( const TapNote& tn, int iCol, int iRow, bool bIsB
vector<Sprite*> vpSpr; vector<Sprite*> vpSpr;
Sprite *pSprBody = GetHoldSprite( m_HoldBody, NotePart_HoldBody, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld && !cache->m_bHoldActiveIsAddLayer ); Sprite *pSprBody = GetHoldSprite( m_HoldBody, NotePart_HoldBody, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld && !cache->m_bHoldActiveIsAddLayer );
pSprBody->SetZoom( ArrowEffects::GetZoom( m_pPlayerState ) );
vpSpr.push_back( pSprBody ); vpSpr.push_back( pSprBody );
if( bIsBeingHeld && cache->m_bHoldActiveIsAddLayer ) if( bIsBeingHeld && cache->m_bHoldActiveIsAddLayer )
{ {
Sprite *pSpr = GetHoldSprite( m_HoldBody, NotePart_HoldBody, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, true ); Sprite *pSpr = GetHoldSprite( m_HoldBody, NotePart_HoldBody, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, true );
ASSERT( pSpr->GetUnzoomedWidth() == pSprBody->GetUnzoomedWidth() ); ASSERT( pSpr->GetUnzoomedWidth() == pSprBody->GetUnzoomedWidth() );
ASSERT( pSpr->GetUnzoomedHeight() == pSprBody->GetUnzoomedHeight() ); ASSERT( pSpr->GetUnzoomedHeight() == pSprBody->GetUnzoomedHeight() );
pSpr->SetZoom( ArrowEffects::GetZoom( m_pPlayerState ) );
vpSpr.push_back( pSpr ); vpSpr.push_back( pSpr );
} }
@@ -567,7 +571,6 @@ void NoteDisplay::DrawHoldBody( const TapNote& tn, int iCol, int iRow, bool bIsB
FOREACH( Sprite*, vpSpr, spr ) FOREACH( Sprite*, vpSpr, spr )
{ {
RageTexture* pTexture = (*spr)->GetTexture(); RageTexture* pTexture = (*spr)->GetTexture();
DISPLAY->ClearAllTextures();
DISPLAY->SetTexture( TextureUnit_1, pTexture->GetTexHandle() ); DISPLAY->SetTexture( TextureUnit_1, pTexture->GetTexHandle() );
DISPLAY->SetBlendMode( spr == vpSpr.begin() ? BLEND_NORMAL : BLEND_ADD ); DISPLAY->SetBlendMode( spr == vpSpr.begin() ? BLEND_NORMAL : BLEND_ADD );
DISPLAY->SetCullMode( CULL_NONE ); DISPLAY->SetCullMode( CULL_NONE );
@@ -586,7 +589,6 @@ void NoteDisplay::DrawHoldBody( const TapNote& tn, int iCol, int iRow, bool bIsB
FOREACH( Sprite*, vpSpr, spr ) FOREACH( Sprite*, vpSpr, spr )
{ {
RageTexture* pTexture = (*spr)->GetTexture(); RageTexture* pTexture = (*spr)->GetTexture();
DISPLAY->ClearAllTextures();
DISPLAY->SetTexture( TextureUnit_1, pTexture->GetTexHandle() ); DISPLAY->SetTexture( TextureUnit_1, pTexture->GetTexHandle() );
DISPLAY->SetBlendMode( spr == vpSpr.begin() ? BLEND_NORMAL : BLEND_ADD ); DISPLAY->SetBlendMode( spr == vpSpr.begin() ? BLEND_NORMAL : BLEND_ADD );
DISPLAY->SetCullMode( CULL_NONE ); DISPLAY->SetCullMode( CULL_NONE );
@@ -605,12 +607,14 @@ void NoteDisplay::DrawHoldBottomCap( const TapNote& tn, int iCol, int iRow, bool
vector<Sprite*> vpSpr; vector<Sprite*> vpSpr;
Sprite* pBottomCap = GetHoldSprite( m_HoldBottomCap, NotePart_HoldBottomCap, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld && !cache->m_bHoldActiveIsAddLayer ); Sprite* pBottomCap = GetHoldSprite( m_HoldBottomCap, NotePart_HoldBottomCap, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld && !cache->m_bHoldActiveIsAddLayer );
pBottomCap->SetZoom( ArrowEffects::GetZoom( m_pPlayerState ) );
vpSpr.push_back( pBottomCap ); vpSpr.push_back( pBottomCap );
if( bIsBeingHeld && cache->m_bHoldActiveIsAddLayer ) if( bIsBeingHeld && cache->m_bHoldActiveIsAddLayer )
{ {
Sprite *pSpr = GetHoldSprite( m_HoldBody, NotePart_HoldBody, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, true ); Sprite *pSpr = GetHoldSprite( m_HoldBody, NotePart_HoldBody, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, true );
ASSERT( pSpr->GetUnzoomedWidth() == pBottomCap->GetUnzoomedWidth() ); ASSERT( pSpr->GetUnzoomedWidth() == pBottomCap->GetUnzoomedWidth() );
ASSERT( pSpr->GetUnzoomedHeight() == pBottomCap->GetUnzoomedHeight() ); ASSERT( pSpr->GetUnzoomedHeight() == pBottomCap->GetUnzoomedHeight() );
pSpr->SetZoom( ArrowEffects::GetZoom( m_pPlayerState ) );
vpSpr.push_back( pSpr ); vpSpr.push_back( pSpr );
} }