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

more changes to mousewheel code; still not working properly

Browse Source
This commit is contained in:
AJ Kelly
2011-05-15 00:33:39 -05:00
parent 84e93b0bbd
commit 376ab3d66f
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/InputHandler/InputHandler_DirectInput.cpp
+15 -4
View File
@@ -536,20 +536,31 @@ void InputHandler_DInput::UpdateBuffered( DIDevice &device, const RageTimer &tm
INPUTFILTER->UpdateMouseWheel(l); INPUTFILTER->UpdateMouseWheel(l);
{ {
up = MOUSE_WHEELUP; down = MOUSE_WHEELDOWN; up = MOUSE_WHEELUP; down = MOUSE_WHEELDOWN;
float fWheelDelta = l;
//l = SCALE( int(evtbuf[i].dwData), -WHEEL_DELTA, WHEEL_DELTA, 1.0f, -1.0f ); //l = SCALE( int(evtbuf[i].dwData), -WHEEL_DELTA, WHEEL_DELTA, 1.0f, -1.0f );
if( int(evtbuf[i].dwData) > 0 ) if( l > 0 )
{ {
DeviceInput diUp = DeviceInput(dev, up, 1.0f, tm); DeviceInput diUp = DeviceInput(dev, up, 1.0f, tm);
ButtonPressed( diUp );
DeviceInput diDown = DeviceInput(dev, down, 0.0f, tm); DeviceInput diDown = DeviceInput(dev, down, 0.0f, tm);
while( fWheelDelta >= WHEEL_DELTA )
{
ButtonPressed( diUp );
ButtonPressed( diDown ); ButtonPressed( diDown );
INPUTFILTER->UpdateMouseWheel(fWheelDelta);
fWheelDelta -= WHEEL_DELTA;
} }
else if( int(evtbuf[i].dwData) < 0 ) }
else if( l < 0 )
{ {
DeviceInput diDown = DeviceInput(dev, down, 1.0f, tm); DeviceInput diDown = DeviceInput(dev, down, 1.0f, tm);
ButtonPressed( diDown );
DeviceInput diUp = DeviceInput(dev, up, 0.0f, tm); DeviceInput diUp = DeviceInput(dev, up, 0.0f, tm);
while( fWheelDelta <= -WHEEL_DELTA )
{
ButtonPressed( diDown );
ButtonPressed( diUp ); ButtonPressed( diUp );
INPUTFILTER->UpdateMouseWheel(fWheelDelta);
fWheelDelta += WHEEL_DELTA;
}
} }
else else
{ {