From 85867cb8e68718bda19a5aca9c569990c98c216b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 7 Jan 2007 02:47:28 +0000 Subject: [PATCH] remove DrawHoldHeadTail --- stepmania/src/NoteDisplay.cpp | 54 ----------------------------------- stepmania/src/NoteDisplay.h | 2 -- 2 files changed, 56 deletions(-) diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp index e1997e7ff5..021b152d6f 100644 --- a/stepmania/src/NoteDisplay.cpp +++ b/stepmania/src/NoteDisplay.cpp @@ -548,60 +548,6 @@ void NoteDisplay::DrawHoldBody( const TapNote& tn, int iCol, float fBeat, bool b bFlipHeadAndTail ); } -void NoteDisplay::DrawHoldHeadTail( const TapNote& tn, Actor* pActor, NotePart part, int iCol, float fBeat, float fYOffset, bool bIsAddition, float fPercentFadeToFail, float fReverseOffsetPixels, float fColorScale, - bool bUseLighting, float fDrawDistanceAfterTargetsPixels, float fDrawDistanceBeforeTargetsPixels, float fFadeInPercentOfDrawFar ) -{ - if( fYOffset < fDrawDistanceAfterTargetsPixels || fYOffset > fDrawDistanceBeforeTargetsPixels ) - return; - const float fY = ArrowEffects::GetYPos( m_pPlayerState, iCol, fYOffset, fReverseOffsetPixels ); - const float fX = ArrowEffects::GetXPos( m_pPlayerState, iCol, fYOffset ); - const float fZ = ArrowEffects::GetZPos( m_pPlayerState, iCol, fYOffset ); - const float fAlpha = ArrowEffects::GetAlpha( m_pPlayerState, iCol, fYOffset, fPercentFadeToFail, m_fYReverseOffsetPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); - const float fGlow = ArrowEffects::GetGlow( m_pPlayerState, iCol, fYOffset, fPercentFadeToFail, m_fYReverseOffsetPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); - const RageColor diffuse = RageColor(fColorScale,fColorScale,fColorScale,fAlpha); - const RageColor glow = RageColor(1,1,1,fGlow); - - pActor->SetRotationZ( 0 ); - pActor->SetXY( fX, fY ); - pActor->SetZ( fZ ); - pActor->SetDiffuse( diffuse ); - pActor->SetGlow( glow ); - pActor->SetZoom( ArrowEffects::GetZoom(m_pPlayerState) ); - - bool bNeedsTranslate = (bIsAddition && !IsVectorZero(cache->m_fAdditionTextureCoordOffset[part])) || !IsVectorZero(cache->m_fNoteColorTextureCoordSpacing[part]); - if( bNeedsTranslate ) - { - DISPLAY->TexturePushMatrix(); - NoteType nt = BeatToNoteType( fBeat ); - ENUM_CLAMP( nt, (NoteType)0, MAX_DISPLAY_NOTE_TYPE ); - DISPLAY->TextureTranslate( (bIsAddition ? cache->m_fAdditionTextureCoordOffset[part] : RageVector2(0,0)) + cache->m_fNoteColorTextureCoordSpacing[part]*(float)nt ); - } - - if( bUseLighting ) - { - DISPLAY->SetLighting( true ); - DISPLAY->SetLightDirectional( - 0, - RageColor(1,1,1,1), - RageColor(1,1,1,1), - RageColor(1,1,1,1), - RageVector3(1, 0, +1) ); - } - - pActor->Draw(); - - if( bUseLighting ) - { - DISPLAY->SetLightOff( 0 ); - DISPLAY->SetLighting( false ); - } - - if( bNeedsTranslate ) - { - DISPLAY->TexturePopMatrix(); - } -} - void NoteDisplay::DrawHold( const TapNote &tn, int iCol, int iRow, bool bIsBeingHeld, const HoldNoteResult &Result, bool bIsAddition, float fPercentFadeToFail, float fReverseOffsetPixels, float fDrawDistanceAfterTargetsPixels, float fDrawDistanceBeforeTargetsPixels, float fDrawDistanceBeforeTargetsPixels2, float fFadeInPercentOfDrawFar ) { diff --git a/stepmania/src/NoteDisplay.h b/stepmania/src/NoteDisplay.h index f2353a0395..afb87515b3 100644 --- a/stepmania/src/NoteDisplay.h +++ b/stepmania/src/NoteDisplay.h @@ -96,8 +96,6 @@ private: void DrawHoldBody( const TapNote& tn, int iCol, float fBeat, bool bIsBeingHeld, float fYHead, float fYTail, bool bIsAddition, float fPercentFadeToFail, float fColorScale, bool bGlow, float fDrawDistanceAfterTargetsPixels, float fDrawDistanceBeforeTargetsPixels, float fFadeInPercentOfDrawFar ); - void DrawHoldHeadTail( const TapNote& tn, Actor* pActor, NotePart part, int iCol, float fBeat, float fYOffset, bool bIsAddition, float fPercentFadeToFail, float fReverseOffsetPixels, float fColorScale, - bool bUseLighting, float fDrawDistanceAfterTargetsPixels, float fDrawDistanceBeforeTargetsPixels, float fFadeInPercentOfDrawFar ); void DrawHoldPart( vector &vpSpr, int iCol, int fYStep, float fPercentFadeToFail, float fColorScale, bool bGlow, float fDrawDistanceAfterTargetsPixels, float fDrawDistanceBeforeTargetsPixels, float fFadeInPercentOfDrawFar, float fYTop, float fYBottom, float fYStartPos, float fYEndPos, bool bWrapping, bool bAnchorToBottom );