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

reimplemented NOTE_COLOR

Browse Source
This commit is contained in:
Chris Danford
2003-01-14 05:35:12 +00:00
parent fa75b5200b
commit 1f8f1766e6
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDisplay.cpp
+33 -22
View File
@@ -87,23 +87,6 @@ int NoteDisplay::GetTapFrameNo( const float fNoteBeat )
return iFrameNo; return iFrameNo;
} }
// if( ct == PlayerOptions::COLOR_NOTE )
// {
// RageColor color = GetNoteColorFromBeat( fNoteBeat );
// colorLeadingOut = color;
// colorTrailingOut = color;
//
// // add a little bit of white so the note doesn't look so plain
// colorLeadingOut.r += 0.3f * fabsf( fPercentThroughColorsLeading - 0.5f );
// colorLeadingOut.g += 0.3f * fabsf( fPercentThroughColorsLeading - 0.5f );
// colorLeadingOut.b += 0.3f * fabsf( fPercentThroughColorsLeading - 0.5f );
// colorTrailingOut.r += 0.3f * fabsf( fPercentThroughColorsTrailing - 0.5f );
// colorTrailingOut.g += 0.3f * fabsf( fPercentThroughColorsTrailing - 0.5f );
// colorTrailingOut.b += 0.3f * fabsf( fPercentThroughColorsTrailing - 0.5f );
// return;
// }
void NoteDisplay::DrawHold( const HoldNote& hn, const bool bActive, const float fLife, const float fPercentFadeToFail, bool bDrawGlowOnly ) void NoteDisplay::DrawHold( const HoldNote& hn, const bool bActive, const float fLife, const float fPercentFadeToFail, bool bDrawGlowOnly )
{ {
// bDrawGlowOnly is a little hacky. We need to draw the diffuse part and the glow part one pass at a time to minimize state changes // bDrawGlowOnly is a little hacky. We need to draw the diffuse part and the glow part one pass at a time to minimize state changes
@@ -342,7 +325,18 @@ void NoteDisplay::DrawTap( const int iCol, const float fBeat, const bool bOnSame
const float fGlow = ArrowGetGlow( m_PlayerNumber, fYPos, fPercentFadeToFail ); const float fGlow = ArrowGetGlow( m_PlayerNumber, fYPos, fPercentFadeToFail );
const int iTapFrameNo = GetTapFrameNo( fBeat ); const int iTapFrameNo = GetTapFrameNo( fBeat );
const float fColorScale = SCALE(fLife,0,1,0.2f,1); const float fColorScale = SCALE(fLife,0,1,0.2f,1);
RageColor color = RageColor(fColorScale,fColorScale,fColorScale,fAlpha); RageColor diffuse = RageColor(fColorScale,fColorScale,fColorScale,fAlpha);
RageColor glow = RageColor(1,1,1,fGlow);
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_ColorType == PlayerOptions::COLOR_NOTE )
{
RageColor noteColor = GetNoteColorFromBeat(fBeat);
diffuse.r *= noteColor.r;
diffuse.g *= noteColor.g;
diffuse.b *= noteColor.b;
glow = RageColor(1,1,1,1)*fGlow + noteColor*(1-fGlow)*0.5f;
}
if( bOnSameRowAsHoldStart && g_bDrawHoldHeadForTapsOnSameRow ) if( bOnSameRowAsHoldStart && g_bDrawHoldHeadForTapsOnSameRow )
{ {
@@ -350,8 +344,8 @@ void NoteDisplay::DrawTap( const int iCol, const float fBeat, const bool bOnSame
// draw hold head // draw hold head
// //
m_sprHoldParts.SetXY( fXPos, fYPos ); m_sprHoldParts.SetXY( fXPos, fYPos );
m_sprHoldParts.SetDiffuse( color ); m_sprHoldParts.SetDiffuse( diffuse );
m_sprHoldParts.SetGlow( RageColor(1,1,1,fGlow) ); m_sprHoldParts.SetGlow( glow );
m_sprHoldParts.StopUsingCustomCoords(); m_sprHoldParts.StopUsingCustomCoords();
m_sprHoldParts.SetState( 0 ); m_sprHoldParts.SetState( 0 );
m_sprHoldParts.Draw(); m_sprHoldParts.Draw();
@@ -360,9 +354,26 @@ void NoteDisplay::DrawTap( const int iCol, const float fBeat, const bool bOnSame
{ {
m_sprTap.SetXY( fXPos, fYPos ); m_sprTap.SetXY( fXPos, fYPos );
m_sprTap.SetRotation( fRotation ); m_sprTap.SetRotation( fRotation );
m_sprTap.SetGlow( RageColor(1,1,1,fGlow) ); m_sprTap.SetGlow( glow );
m_sprTap.SetDiffuse( color ); m_sprTap.SetDiffuse( diffuse );
m_sprTap.SetState( iTapFrameNo ); m_sprTap.SetState( iTapFrameNo );
m_sprTap.Draw(); m_sprTap.Draw();
} }
} }
// if( ct == PlayerOptions::COLOR_NOTE )
// {
// RageColor color = GetNoteColorFromBeat( fNoteBeat );
// colorLeadingOut = color;
// colorTrailingOut = color;
//
// // add a little bit of white so the note doesn't look so plain
// colorLeadingOut.r += 0.3f * fabsf( fPercentThroughColorsLeading - 0.5f );
// colorLeadingOut.g += 0.3f * fabsf( fPercentThroughColorsLeading - 0.5f );
// colorLeadingOut.b += 0.3f * fabsf( fPercentThroughColorsLeading - 0.5f );
// colorTrailingOut.r += 0.3f * fabsf( fPercentThroughColorsTrailing - 0.5f );
// colorTrailingOut.g += 0.3f * fabsf( fPercentThroughColorsTrailing - 0.5f );
// colorTrailingOut.b += 0.3f * fabsf( fPercentThroughColorsTrailing - 0.5f );
// return;
// }