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

Fix warnings

Browse Source
This commit is contained in:
Glenn Maynard
2003-08-18 17:19:34 +00:00
parent b8cd130fdb
commit 6acf190929
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteField.cpp
+11 -11
View File
@@ -49,12 +49,12 @@ NoteField::NoteField()
} }
void NoteField::Load( NoteData* pNoteData, PlayerNumber pn, int iFirstPixelToDraw, int iLastPixelToDraw, int iYReverseOffsetPixels ) void NoteField::Load( NoteData* pNoteData, PlayerNumber pn, int iFirstPixelToDraw, int iLastPixelToDraw, float fYReverseOffsetPixels )
{ {
m_PlayerNumber = pn; m_PlayerNumber = pn;
m_iStartDrawingPixel = iFirstPixelToDraw; m_iStartDrawingPixel = iFirstPixelToDraw;
m_iEndDrawingPixel = iLastPixelToDraw; m_iEndDrawingPixel = iLastPixelToDraw;
m_iYReverseOffsetPixels = iYReverseOffsetPixels; m_fYReverseOffsetPixels = fYReverseOffsetPixels;
m_fPercentFadeToFail = -1; m_fPercentFadeToFail = -1;
@@ -107,7 +107,7 @@ void NoteField::DrawBeatBar( const float fBeat )
NoteType nt = BeatToNoteType( fBeat ); NoteType nt = BeatToNoteType( fBeat );
const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat ); const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat );
const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_iYReverseOffsetPixels ); const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_fYReverseOffsetPixels );
float fAlpha; float fAlpha;
int iState; int iState;
@@ -156,7 +156,7 @@ void NoteField::DrawBeatBar( const float fBeat )
void NoteField::DrawMarkerBar( const float fBeat ) void NoteField::DrawMarkerBar( const float fBeat )
{ {
const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat ); const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat );
const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_iYReverseOffsetPixels ); const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_fYReverseOffsetPixels );
m_rectMarkerBar.StretchTo( RectF(-GetWidth()/2, fYPos-ARROW_SIZE/2, GetWidth()/2, fYPos+ARROW_SIZE/2) ); m_rectMarkerBar.StretchTo( RectF(-GetWidth()/2, fYPos-ARROW_SIZE/2, GetWidth()/2, fYPos+ARROW_SIZE/2) );
@@ -166,9 +166,9 @@ void NoteField::DrawMarkerBar( const float fBeat )
void NoteField::DrawAreaHighlight( const float fStartBeat, const float fEndBeat ) void NoteField::DrawAreaHighlight( const float fStartBeat, const float fEndBeat )
{ {
float fYStartOffset = ArrowGetYOffset( m_PlayerNumber, 0, fStartBeat ); float fYStartOffset = ArrowGetYOffset( m_PlayerNumber, 0, fStartBeat );
float fYStartPos = ArrowGetYPos( m_PlayerNumber, 0, fYStartOffset, m_iYReverseOffsetPixels ); float fYStartPos = ArrowGetYPos( m_PlayerNumber, 0, fYStartOffset, m_fYReverseOffsetPixels );
float fYEndOffset = ArrowGetYOffset( m_PlayerNumber, 0, fEndBeat ); float fYEndOffset = ArrowGetYOffset( m_PlayerNumber, 0, fEndBeat );
float fYEndPos = ArrowGetYPos( m_PlayerNumber, 0, fYEndOffset, m_iYReverseOffsetPixels ); float fYEndPos = ArrowGetYPos( m_PlayerNumber, 0, fYEndOffset, m_fYReverseOffsetPixels );
// Something in OpenGL crashes if this is values are too large. Strange. -Chris // Something in OpenGL crashes if this is values are too large. Strange. -Chris
fYStartPos = max( fYStartPos, -1000 ); fYStartPos = max( fYStartPos, -1000 );
@@ -184,7 +184,7 @@ void NoteField::DrawAreaHighlight( const float fStartBeat, const float fEndBeat
void NoteField::DrawBPMText( const float fBeat, const float fBPM ) void NoteField::DrawBPMText( const float fBeat, const float fBPM )
{ {
const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat ); const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat );
const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_iYReverseOffsetPixels ); const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_fYReverseOffsetPixels );
m_textMeasureNumber.SetHorizAlign( Actor::align_right ); m_textMeasureNumber.SetHorizAlign( Actor::align_right );
m_textMeasureNumber.SetDiffuse( RageColor(1,0,0,1) ); m_textMeasureNumber.SetDiffuse( RageColor(1,0,0,1) );
@@ -197,7 +197,7 @@ void NoteField::DrawBPMText( const float fBeat, const float fBPM )
void NoteField::DrawFreezeText( const float fBeat, const float fSecs ) void NoteField::DrawFreezeText( const float fBeat, const float fSecs )
{ {
const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat ); const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat );
const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_iYReverseOffsetPixels ); const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_fYReverseOffsetPixels );
m_textMeasureNumber.SetHorizAlign( Actor::align_right ); m_textMeasureNumber.SetHorizAlign( Actor::align_right );
m_textMeasureNumber.SetDiffuse( RageColor(0.8f,0.8f,0,1) ); m_textMeasureNumber.SetDiffuse( RageColor(0.8f,0.8f,0,1) );
@@ -210,7 +210,7 @@ void NoteField::DrawFreezeText( const float fBeat, const float fSecs )
void NoteField::DrawBGChangeText( const float fBeat, const CString sNewBGName ) void NoteField::DrawBGChangeText( const float fBeat, const CString sNewBGName )
{ {
const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat ); const float fYOffset = ArrowGetYOffset( m_PlayerNumber, 0, fBeat );
const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_iYReverseOffsetPixels ); const float fYPos = ArrowGetYPos( m_PlayerNumber, 0, fYOffset, m_fYReverseOffsetPixels );
m_textMeasureNumber.SetHorizAlign( Actor::align_left ); m_textMeasureNumber.SetHorizAlign( Actor::align_left );
m_textMeasureNumber.SetDiffuse( RageColor(0,1,0,1) ); m_textMeasureNumber.SetDiffuse( RageColor(0,1,0,1) );
@@ -396,7 +396,7 @@ void NoteField::DrawPrimitives()
if( m_fBeginMarker!=-1 && m_fEndMarker!=-1 ) if( m_fBeginMarker!=-1 && m_fEndMarker!=-1 )
bIsInSelectionRange = m_fBeginMarker<=hn.fStartBeat && hn.fStartBeat<=m_fEndMarker && m_fBeginMarker<=hn.fEndBeat && hn.fEndBeat<=m_fEndMarker; bIsInSelectionRange = m_fBeginMarker<=hn.fStartBeat && hn.fStartBeat<=m_fEndMarker && m_fBeginMarker<=hn.fEndBeat && hn.fEndBeat<=m_fEndMarker;
m_NoteDisplay[c].DrawHold( hn, bIsHoldingNote, fLife, bIsInSelectionRange ? fSelectedRangeGlow : m_fPercentFadeToFail, false, m_iYReverseOffsetPixels ); m_NoteDisplay[c].DrawHold( hn, bIsHoldingNote, fLife, bIsInSelectionRange ? fSelectedRangeGlow : m_fPercentFadeToFail, false, m_fYReverseOffsetPixels );
} }
@@ -444,7 +444,7 @@ void NoteField::DrawPrimitives()
bool bIsAddition = (tn == TAP_ADDITION); bool bIsAddition = (tn == TAP_ADDITION);
bool bIsMine = (tn == TAP_MINE); bool bIsMine = (tn == TAP_MINE);
m_NoteDisplay[c].DrawTap( c, NoteRowToBeat(i), bHoldNoteBeginsOnThisBeat, bIsAddition, bIsMine, bIsInSelectionRange ? fSelectedRangeGlow : m_fPercentFadeToFail, 1, m_iYReverseOffsetPixels ); m_NoteDisplay[c].DrawTap( c, NoteRowToBeat(i), bHoldNoteBeginsOnThisBeat, bIsAddition, bIsMine, bIsInSelectionRange ? fSelectedRangeGlow : m_fPercentFadeToFail, 1, m_fYReverseOffsetPixels );
} }
g_NoteFieldMode[m_PlayerNumber].EndDrawTrack(c); g_NoteFieldMode[m_PlayerNumber].EndDrawTrack(c);
stepmania/src/NoteField.h
+2 -3
View File
@@ -33,7 +33,7 @@ public:
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
virtual void DrawPrimitives(); virtual void DrawPrimitives();
virtual void Load( NoteData* pNoteData, PlayerNumber pn, int iStartDrawingPixel, int iEndDrawingPixel, int iYReverseOffsetPixels ); virtual void Load( NoteData* pNoteData, PlayerNumber pn, int iStartDrawingPixel, int iEndDrawingPixel, float fYReverseOffsetPixels );
void RemoveTapNoteRow( int iIndex ); void RemoveTapNoteRow( int iIndex );
vector<bool> m_bIsHoldingHoldNote; // hack: Need this to know when to "light up" the center of hold notes vector<bool> m_bIsHoldingHoldNote; // hack: Need this to know when to "light up" the center of hold notes
@@ -58,8 +58,7 @@ protected:
PlayerNumber m_PlayerNumber; PlayerNumber m_PlayerNumber;
int m_iStartDrawingPixel; // this should be a negative number int m_iStartDrawingPixel; // this should be a negative number
int m_iEndDrawingPixel; // this should be a positive number int m_iEndDrawingPixel; // this should be a positive number
int m_iYPosNormal; float m_fYReverseOffsetPixels;
int m_iYReverseOffsetPixels;
// color arrows // color arrows
NoteDisplay m_NoteDisplay[MAX_NOTE_TRACKS]; NoteDisplay m_NoteDisplay[MAX_NOTE_TRACKS];
stepmania/src/NoteFieldPlus.cpp
+3 -3
View File
@@ -20,9 +20,9 @@ NoteFieldPlus::NoteFieldPlus()
{ {
} }
void NoteFieldPlus::Load( NoteData* pNoteData, PlayerNumber pn, int iFirstPixelToDraw, int iLastPixelToDraw, int iYReverseOffset ) void NoteFieldPlus::Load( NoteData* pNoteData, PlayerNumber pn, int iFirstPixelToDraw, int iLastPixelToDraw, float fYReverseOffset )
{ {
NoteField::Load( pNoteData, pn, iFirstPixelToDraw, iLastPixelToDraw, iYReverseOffset ); NoteField::Load( pNoteData, pn, iFirstPixelToDraw, iLastPixelToDraw, fYReverseOffset );
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
m_iNumCols = pStyleDef->m_iColsPerPlayer; m_iNumCols = pStyleDef->m_iColsPerPlayer;
@@ -83,7 +83,7 @@ void NoteFieldPlus::Update( float fDelta )
for( int c=0; c<m_iNumCols; c++ ) for( int c=0; c<m_iNumCols; c++ )
{ {
float fX = ArrowGetXPos( m_PlayerNumber, c, 0 ); float fX = ArrowGetXPos( m_PlayerNumber, c, 0 );
float fY = ArrowGetYPos( m_PlayerNumber, c, 0, (float) m_iYReverseOffsetPixels ); float fY = ArrowGetYPos( m_PlayerNumber, c, 0, m_fYReverseOffsetPixels );
float fZ = ArrowGetZPos( m_PlayerNumber, c, 0 ); float fZ = ArrowGetZPos( m_PlayerNumber, c, 0 );
m_GrayArrow[c].Update( fDelta ); m_GrayArrow[c].Update( fDelta );
stepmania/src/NoteFieldPlus.h
+1 -1
View File
@@ -22,7 +22,7 @@ class NoteFieldPlus : public NoteField
public: public:
NoteFieldPlus(); NoteFieldPlus();
virtual void Load( NoteData* pNoteData, PlayerNumber pn, int iFirstPixelToDraw, int iLastPixelToDraw, int iYReverseOffset ); virtual void Load( NoteData* pNoteData, PlayerNumber pn, int iFirstPixelToDraw, int iLastPixelToDraw, float fYReverseOffset );
virtual void Update( float fDelta ); virtual void Update( float fDelta );
virtual void DrawPrimitives(); virtual void DrawPrimitives();
stepmania/src/Player.cpp
+3 -3
View File
@@ -138,7 +138,7 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, Combine
m_ArrowBackdrop.LoadFromAniDir( THEME->GetPathToB( BackdropName ) ); m_ArrowBackdrop.LoadFromAniDir( THEME->GetPathToB( BackdropName ) );
m_NoteField.SetY( GRAY_ARROWS_Y_STANDARD ); m_NoteField.SetY( GRAY_ARROWS_Y_STANDARD );
m_NoteField.Load( (NoteData*)this, pn, iStartDrawingAtPixels, iStopDrawingAtPixels, int(GRAY_ARROWS_Y_REVERSE-GRAY_ARROWS_Y_STANDARD) ); m_NoteField.Load( (NoteData*)this, pn, iStartDrawingAtPixels, iStopDrawingAtPixels, GRAY_ARROWS_Y_REVERSE-GRAY_ARROWS_Y_STANDARD );
m_ArrowBackdrop.SetPlayer( pn ); m_ArrowBackdrop.SetPlayer( pn );
const bool bReverse = GAMESTATE->m_PlayerOptions[pn].GetReversePercentForColumn(0) == 1; const bool bReverse = GAMESTATE->m_PlayerOptions[pn].GetReversePercentForColumn(0) == 1;
@@ -330,11 +330,11 @@ void Player::Update( float fDeltaTime )
// Start beat needs to be far enough ahead to be off screen so that // Start beat needs to be far enough ahead to be off screen so that
// addition arrows don't suddenly pop on. // addition arrows don't suddenly pop on.
float fStartBeat = GAMESTATE->m_fSongBeat + BEATS_PER_MEASURE*2; float fStartBeat = GAMESTATE->m_fSongBeat + BEATS_PER_MEASURE*2;
fStartBeat = ((int)fStartBeat)+1; fStartBeat = truncf(fStartBeat)+1;
float fStartSeconds = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( fStartBeat ); float fStartSeconds = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( fStartBeat );
float fEndSeconds = fStartSeconds+10; float fEndSeconds = fStartSeconds+10;
float fEndBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fEndSeconds ); float fEndBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fEndSeconds );
fEndBeat = ((int)fEndBeat)+1; fEndBeat = truncf(fEndBeat)+1;
LOG->Trace( "Applying transform from %f to %f", fStartBeat, fEndBeat ); LOG->Trace( "Applying transform from %f to %f", fStartBeat, fEndBeat );