big checkin - new noteskin format and XY positioning. I probably broke a lot of things.
This commit is contained in:
+11
-11
@@ -17,11 +17,11 @@
|
||||
#include "BitmapText.h"
|
||||
#include "PrefsManager.h"
|
||||
#include "StyleDef.h"
|
||||
#include "ColorNote.h"
|
||||
#include "BitmapText.h"
|
||||
#include "Quad.h"
|
||||
#include "ArrowEffects.h"
|
||||
#include "NoteDataWithScoring.h"
|
||||
#include "NoteDisplay.h"
|
||||
|
||||
|
||||
class NoteField : public NoteDataWithScoring, public ActorFrame
|
||||
@@ -31,22 +31,22 @@ public:
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
|
||||
void Load( NoteData* pNoteData, PlayerNumber pn, int iPixelsToDrawBehind, int iPixelsToDrawAhead );
|
||||
void RemoveTapNoteRow( int iIndex );
|
||||
void Load( NoteData* pNoteData, PlayerNumber pn, int iPixelsToDrawBehind, int iPixelsToDrawAhead );
|
||||
void RemoveTapNoteRow( int iIndex );
|
||||
|
||||
bool m_bIsHoldingHoldNote[MAX_HOLD_NOTES]; // hack: Need this to prevent hold note jitter
|
||||
bool m_bIsHoldingHoldNote[MAX_HOLD_NOTES]; // hack: Need this to know when to "light up" the center of hold notes
|
||||
|
||||
float m_fBeginMarker, m_fEndMarker; // only used with MODE_EDIT
|
||||
|
||||
void FadeToFail();
|
||||
|
||||
protected:
|
||||
inline void CreateTapNoteInstance( ColorNoteInstance &cni, const int iCol, const float fIndex, const bool bUseHoldNoteBeginColor = false );
|
||||
inline void CreateHoldNoteInstance( ColorNoteInstance &cni, const bool bActive, const float fIndex, const HoldNote &hn, const float fHoldNoteLife );
|
||||
inline void DrawMeasureBar( const int iIndex, const int iMeasureNo );
|
||||
inline void DrawMarkerBar( const int iIndex );
|
||||
inline void DrawBPMText( const int iIndex, const float fBPM );
|
||||
inline void DrawFreezeText( const int iIndex, const float fBPM );
|
||||
// inline void CreateTapNoteInstance( ColorNoteInstance &cni, const int iCol, const float fIndex, const bool bUseHoldNoteBeginColor = false );
|
||||
// inline void CreateHoldNoteInstance( ColorNoteInstance &cni, const bool bActive, const float fIndex, const HoldNote &hn, const float fHoldNoteLife );
|
||||
inline void DrawMeasureBar( const int iMeasureIndex );
|
||||
inline void DrawMarkerBar( const float fBeat );
|
||||
inline void DrawBPMText( const float fBeat, const float fBPM );
|
||||
inline void DrawFreezeText( const float fBeat, const float fBPM );
|
||||
|
||||
float m_fPercentFadeToFail; // -1 of not fading to fail
|
||||
|
||||
@@ -55,7 +55,7 @@ protected:
|
||||
int m_iPixelsToDrawAhead;
|
||||
|
||||
// color arrows
|
||||
ColorNote m_ColorNote[MAX_NOTE_TRACKS];
|
||||
NoteDisplay m_NoteDisplay[MAX_NOTE_TRACKS];
|
||||
|
||||
// used in MODE_EDIT
|
||||
Quad m_rectMeasureBar;
|
||||
|
||||
Reference in New Issue
Block a user