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

Filter layer over *BeingPressed in InputFilter, to put odd special cases

Browse Source 
without mussing up RageInput.

Disables the new joystick axes (they're only there for a USB converter
special case that I havn't added yet and will cause problems for others).
This commit is contained in:
Glenn Maynard
2002-09-08 06:10:23 +00:00
parent a0a27e7de3
commit 839d2388a2
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/InputFilter.cpp
+36 -6
View File
@@ -18,7 +18,37 @@
InputFilter* INPUTFILTER = NULL; // global and accessable from anywhere in our program InputFilter* INPUTFILTER = NULL; // global and accessable from anywhere in our program
InputFilter::InputFilter()
{
for( int i=0; i<NUM_INPUT_DEVICES; i++ )
{
for( int j=0; j<NUM_DEVICE_BUTTONS; j++ )
m_fTimeHeld[i][j] = 0;
}
}
bool InputFilter::BeingPressed( DeviceInput di, bool Prev )
{
switch( di.button ) {
case JOY_Z_UP: case JOY_Z_DOWN:
case JOY_Z_ROT_UP: case JOY_Z_ROT_DOWN:
case JOY_HAT_LEFT: case JOY_HAT_RIGHT: case JOY_HAT_UP: case JOY_HAT_DOWN:
/* For now, ignore these. */
return false;
}
return INPUTMAN->BeingPressed(di, Prev);
}
bool InputFilter::WasBeingPressed( DeviceInput di )
{
return BeingPressed(di, true);
}
bool InputFilter::IsBeingPressed( DeviceInput di )
{
return BeingPressed(di, false);
}
void InputFilter::GetInputEvents( InputEventArray &array, float fDeltaTime ) void InputFilter::GetInputEvents( InputEventArray &array, float fDeltaTime )
{ {
@@ -32,9 +62,9 @@ void InputFilter::GetInputEvents( InputEventArray &array, float fDeltaTime )
{ {
const DeviceInput di = DeviceInput(InputDevice(d),b); const DeviceInput di = DeviceInput(InputDevice(d),b);
if( INPUTMAN->WasBeingPressed(di) ) if( WasBeingPressed(di) )
{ {
if( INPUTMAN->IsBeingPressed(di) ) if( IsBeingPressed(di) )
{ {
const float fOldHoldTime = m_fTimeHeld[d][b]; const float fOldHoldTime = m_fTimeHeld[d][b];
m_fTimeHeld[d][b] += fDeltaTime; m_fTimeHeld[d][b] += fDeltaTime;
@@ -58,16 +88,16 @@ void InputFilter::GetInputEvents( InputEventArray &array, float fDeltaTime )
array.Add( InputEvent(di,iet) ); array.Add( InputEvent(di,iet) );
} }
} }
else { // !INPUTMAN->IsBeingPressed(di) else { // !IsBeingPressed(di)
m_fTimeHeld[d][b] = 0; m_fTimeHeld[d][b] = 0;
array.Add( InputEvent(di,IET_RELEASE) ); array.Add( InputEvent(di,IET_RELEASE) );
} }
} }
else // !INPUTMAN->WasBeingPressed(di) else // !WasBeingPressed(di)
{ {
if( INPUTMAN->IsBeingPressed(di) ) if( IsBeingPressed(di) )
array.Add( InputEvent(di,IET_FIRST_PRESS) ); array.Add( InputEvent(di,IET_FIRST_PRESS) );
else // !INPUTMAN->IsBeingPressed(di) else // !IsBeingPressed(di)
; // don't care ; // don't care
} }
} }
stepmania/src/InputFilter.h
+5 -8
View File
@@ -38,14 +38,11 @@ typedef CArray<InputEvent, InputEvent> InputEventArray;
class InputFilter class InputFilter
{ {
public: public:
InputFilter() InputFilter();
{
for( int i=0; i<NUM_INPUT_DEVICES; i++ ) bool BeingPressed( DeviceInput di, bool Prev = false);
{ bool WasBeingPressed( DeviceInput di );
for( int j=0; j<NUM_DEVICE_BUTTONS; j++ ) bool IsBeingPressed( DeviceInput di );
m_fTimeHeld[i][j] = 0;
}
};
void GetInputEvents( InputEventArray &array, float fDeltaTime ); void GetInputEvents( InputEventArray &array, float fDeltaTime );