remove NoteData dependency
This commit is contained in:
@@ -8,7 +8,6 @@
|
|||||||
#include "InputMapper.h"
|
#include "InputMapper.h"
|
||||||
#include "Game.h"
|
#include "Game.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
#include "NoteData.h"
|
|
||||||
#include "Actor.h"
|
#include "Actor.h"
|
||||||
|
|
||||||
#include "arch/arch.h"
|
#include "arch/arch.h"
|
||||||
@@ -75,34 +74,6 @@ void LightsManager::BlinkActorLight( CabinetLight cl )
|
|||||||
g_fCabinetLightDuration[cl] = g_fLightEffectRiseSeconds;
|
g_fCabinetLightDuration[cl] = g_fLightEffectRiseSeconds;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Using data from pLightData, blink actor lights (eg. "effectclock,MarqueeLrRight")
|
|
||||||
* within [iStart,iEnd). This is available even if no light driver is active.
|
|
||||||
*/
|
|
||||||
void LightsManager::BlinkActorLightsBetween( int iStart, int iEnd, const NoteData *pLightData )
|
|
||||||
{
|
|
||||||
if( iStart >= iEnd )
|
|
||||||
return;
|
|
||||||
|
|
||||||
FOREACH_CabinetLight( cl )
|
|
||||||
{
|
|
||||||
bool bBlinkCabinetLight = false;
|
|
||||||
|
|
||||||
// for each index we crossed since the last update:
|
|
||||||
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( *pLightData, cl, r, iStart, iEnd )
|
|
||||||
{
|
|
||||||
if( pLightData->GetTapNote( cl, r ).type != TapNote::empty )
|
|
||||||
bBlinkCabinetLight |= true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( pLightData->IsHoldNoteAtBeat( cl, iEnd ) )
|
|
||||||
bBlinkCabinetLight |= true;
|
|
||||||
|
|
||||||
if( bBlinkCabinetLight )
|
|
||||||
g_fCabinetLightDuration[cl] = g_fLightEffectRiseSeconds;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
float LightsManager::GetActorLightLatencySeconds() const
|
float LightsManager::GetActorLightLatencySeconds() const
|
||||||
{
|
{
|
||||||
return g_fLightEffectRiseSeconds;
|
return g_fLightEffectRiseSeconds;
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ struct LightsState
|
|||||||
};
|
};
|
||||||
|
|
||||||
class LightsDriver;
|
class LightsDriver;
|
||||||
class NoteData;
|
|
||||||
|
|
||||||
class LightsManager
|
class LightsManager
|
||||||
{
|
{
|
||||||
@@ -62,7 +61,6 @@ public:
|
|||||||
void BlinkCabinetLight( CabinetLight cl );
|
void BlinkCabinetLight( CabinetLight cl );
|
||||||
void BlinkGameButton( GameInput gi );
|
void BlinkGameButton( GameInput gi );
|
||||||
void BlinkActorLight( CabinetLight cl );
|
void BlinkActorLight( CabinetLight cl );
|
||||||
void BlinkActorLightsBetween( int iStart, int iEnd, const NoteData *pLightData );
|
|
||||||
float GetActorLightLatencySeconds() const;
|
float GetActorLightLatencySeconds() const;
|
||||||
|
|
||||||
void SetLightsMode( LightsMode lm );
|
void SetLightsMode( LightsMode lm );
|
||||||
|
|||||||
Reference in New Issue
Block a user