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

change z axis (wheeldown) scale to -120..120 to match input from mouse

Browse Source
This commit is contained in:
AJ Kelly
2011-02-15 23:26:32 -06:00
parent 072b7059ff
commit 20b539f652
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/InputHandler/InputHandler_DirectInput.cpp
+2 -5
View File
@@ -405,12 +405,10 @@ void InputHandler_DInput::UpdatePolled( DIDevice &device, const RageTimer &tm )
case DIMOFS_X: case DIMOFS_X:
neg = MOUSE_X_LEFT; pos = MOUSE_X_RIGHT; neg = MOUSE_X_LEFT; pos = MOUSE_X_RIGHT;
val = state.lX; val = state.lX;
LOG->Trace("mouse x: %d",val);
break; break;
case DIMOFS_Y: case DIMOFS_Y:
neg = MOUSE_Y_UP; pos = MOUSE_Y_DOWN; neg = MOUSE_Y_UP; pos = MOUSE_Y_DOWN;
val = state.lY; val = state.lY;
LOG->Trace("mouse y: %d",val);
break; break;
case DIMOFS_Z: case DIMOFS_Z:
neg = MOUSE_WHEELUP; pos = MOUSE_WHEELDOWN; neg = MOUSE_WHEELUP; pos = MOUSE_WHEELDOWN;
@@ -424,8 +422,7 @@ void InputHandler_DInput::UpdatePolled( DIDevice &device, const RageTimer &tm )
if( neg != DeviceButton_Invalid ) if( neg != DeviceButton_Invalid )
{ {
//float l = SCALE( int(val), 0.0f, 100.0f, 0.0f, 1.0f ); float l = SCALE( int(val), 0.0f, 100.0f, 0.0f, 1.0f );
float l = val;
ButtonPressed( DeviceInput(dev, neg, max(-l,0), tm) ); ButtonPressed( DeviceInput(dev, neg, max(-l,0), tm) );
ButtonPressed( DeviceInput(dev, pos, max(+l,0), tm) ); ButtonPressed( DeviceInput(dev, pos, max(+l,0), tm) );
} }
@@ -520,7 +517,7 @@ void InputHandler_DInput::UpdateBuffered( DIDevice &device, const RageTimer &tm
break; break;
case DIMOFS_Z: case DIMOFS_Z:
up = MOUSE_WHEELUP; down = MOUSE_WHEELDOWN; up = MOUSE_WHEELUP; down = MOUSE_WHEELDOWN;
l = SCALE( int(evtbuf[i].dwData), 0.0f, 100.0f, 0.0f, 1.0f ); l = SCALE( int(evtbuf[i].dwData), -120.0f, 120.0f, -1.0f, 1.0f );
ButtonPressed( DeviceInput(dev, up, max(-l,0), tm) ); ButtonPressed( DeviceInput(dev, up, max(-l,0), tm) );
ButtonPressed( DeviceInput(dev, down, max(+l,0), tm) ); ButtonPressed( DeviceInput(dev, down, max(+l,0), tm) );
break; break;