remove IET_LEVEL_CHANGED. I didn't end up using it, and it's a clumsy way of handling analog inputs.
This commit is contained in:
@@ -15,7 +15,6 @@ struct ButtonState
|
|||||||
bool m_bLastReportedHeld; // last state reported by Update()
|
bool m_bLastReportedHeld; // last state reported by Update()
|
||||||
RString m_sComment;
|
RString m_sComment;
|
||||||
float m_fSecsHeld;
|
float m_fSecsHeld;
|
||||||
float m_Level, m_LastLevel;
|
|
||||||
|
|
||||||
// Timestamp of m_BeingHeld changing.
|
// Timestamp of m_BeingHeld changing.
|
||||||
RageTimer m_BeingHeldTime;
|
RageTimer m_BeingHeldTime;
|
||||||
@@ -117,7 +116,7 @@ ButtonState::ButtonState():
|
|||||||
{
|
{
|
||||||
m_BeingHeld = false;
|
m_BeingHeld = false;
|
||||||
m_bLastReportedHeld = false;
|
m_bLastReportedHeld = false;
|
||||||
m_fSecsHeld = m_Level = m_LastLevel = 0;
|
m_fSecsHeld = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputFilter::ButtonPressed( const DeviceInput &di, bool Down )
|
void InputFilter::ButtonPressed( const DeviceInput &di, bool Down )
|
||||||
@@ -132,8 +131,6 @@ void InputFilter::ButtonPressed( const DeviceInput &di, bool Down )
|
|||||||
|
|
||||||
ButtonState &bs = GetButtonState( di );
|
ButtonState &bs = GetButtonState( di );
|
||||||
|
|
||||||
bs.m_Level = di.level;
|
|
||||||
|
|
||||||
if( bs.m_BeingHeld != Down )
|
if( bs.m_BeingHeld != Down )
|
||||||
{
|
{
|
||||||
/* Flush any delayed input, like Update() (in case Update() isn't being called). */
|
/* Flush any delayed input, like Update() (in case Update() isn't being called). */
|
||||||
@@ -226,18 +223,10 @@ void InputFilter::Update( float fDeltaTime )
|
|||||||
di.device = b->first.device;
|
di.device = b->first.device;
|
||||||
di.button = b->first.button;
|
di.button = b->first.button;
|
||||||
ButtonState &bs = b->second;
|
ButtonState &bs = b->second;
|
||||||
di.level = bs.m_Level;
|
|
||||||
|
|
||||||
/* Generate IET_FIRST_PRESS and IET_RELEASE events that were delayed. */
|
/* Generate IET_FIRST_PRESS and IET_RELEASE events that were delayed. */
|
||||||
CheckButtonChange( bs, di, now );
|
CheckButtonChange( bs, di, now );
|
||||||
|
|
||||||
/* Generate IET_LEVEL_CHANGED events. */
|
|
||||||
if( bs.m_LastLevel != bs.m_Level && bs.m_Level != -1 )
|
|
||||||
{
|
|
||||||
ReportButtonChange( di, IET_LEVEL_CHANGED );
|
|
||||||
bs.m_LastLevel = bs.m_Level;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Generate IET_FAST_REPEAT and IET_SLOW_REPEAT events. */
|
/* Generate IET_FAST_REPEAT and IET_SLOW_REPEAT events. */
|
||||||
if( !bs.m_bLastReportedHeld )
|
if( !bs.m_bLastReportedHeld )
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user