From 330d6f020d20bd8274d97bf7c22a0da34a12eaa1 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 16 Mar 2011 16:36:10 -0500 Subject: [PATCH] more mousewheel stuff --- .../InputHandler/InputHandler_DirectInput.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/arch/InputHandler/InputHandler_DirectInput.cpp b/src/arch/InputHandler/InputHandler_DirectInput.cpp index 941bfde39d..58ad89800b 100644 --- a/src/arch/InputHandler/InputHandler_DirectInput.cpp +++ b/src/arch/InputHandler/InputHandler_DirectInput.cpp @@ -509,18 +509,21 @@ void InputHandler_DInput::UpdateBuffered( DIDevice &device, const RageTimer &tm switch(in.ofs) { case DIMOFS_X: - up = MOUSE_X_LEFT; down = MOUSE_X_RIGHT; INPUTFILTER->UpdateCursorLocation((float)cursorPos.x,(float)cursorPos.y); break; case DIMOFS_Y: - up = MOUSE_Y_UP; down = MOUSE_Y_DOWN; INPUTFILTER->UpdateCursorLocation((float)cursorPos.x,(float)cursorPos.y); break; case DIMOFS_Z: - up = MOUSE_WHEELUP; down = MOUSE_WHEELDOWN; - 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, down, max(+l,0), tm) ); + INPUTFILTER->UpdateMouseWheel(l); + { + up = MOUSE_WHEELUP; down = MOUSE_WHEELDOWN; + l = SCALE( int(evtbuf[i].dwData), -120.0f, 120.0f, 1.0f, -1.0f ); + DeviceInput diUp = DeviceInput(dev, up, max(-l,0), tm); + DeviceInput diDown = DeviceInput(dev, down, max(+l,0), tm); + ButtonPressed( diUp ); + ButtonPressed( diDown ); + } break; default: LOG->MapLog( "unknown input", "Mouse '%s' is returning an unknown mouse offset [axis], %i", @@ -552,6 +555,7 @@ void InputHandler_DInput::UpdateBuffered( DIDevice &device, const RageTimer &tm } break; } + case in.HAT: { const int pos = TranslatePOV( evtbuf[i].dwData );