diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp index 3308ba36ab..ddb2f482a1 100755 --- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp +++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp @@ -25,6 +25,9 @@ void KeyboardMouseDevice::pluginUpdate(float deltaTime, const controller::InputC auto userInputMapper = DependencyManager::get(); userInputMapper->withLock([&, this]() { _inputDevice->update(deltaTime, inputCalibrationData); + + _inputDevice->_axisStateMap[MOUSE_AXIS_X] = _lastCursor.x(); + _inputDevice->_axisStateMap[MOUSE_AXIS_Y] = _lastCursor.y(); }); // For touch event, we need to check that the last event is not too long ago @@ -249,6 +252,9 @@ controller::Input::NamedVector KeyboardMouseDevice::InputDevice::getAvailableInp availableInputs.append(Input::NamedPair(makeInput(MOUSE_AXIS_Y_POS), "MouseMoveUp")); availableInputs.append(Input::NamedPair(makeInput(MOUSE_AXIS_Y_NEG), "MouseMoveDown")); + availableInputs.append(Input::NamedPair(makeInput(MOUSE_AXIS_X), "MouseX")); + availableInputs.append(Input::NamedPair(makeInput(MOUSE_AXIS_Y), "MouseY")); + availableInputs.append(Input::NamedPair(makeInput(MOUSE_AXIS_WHEEL_Y_POS), "MouseWheelRight")); availableInputs.append(Input::NamedPair(makeInput(MOUSE_AXIS_WHEEL_Y_NEG), "MouseWheelLeft")); availableInputs.append(Input::NamedPair(makeInput(MOUSE_AXIS_WHEEL_X_POS), "MouseWheelUp")); diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h index f38b43c107..3570ec7193 100644 --- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h +++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h @@ -47,6 +47,8 @@ public: MOUSE_AXIS_X_NEG, MOUSE_AXIS_Y_POS, MOUSE_AXIS_Y_NEG, + MOUSE_AXIS_X, + MOUSE_AXIS_Y, MOUSE_AXIS_WHEEL_Y_POS, MOUSE_AXIS_WHEEL_Y_NEG, MOUSE_AXIS_WHEEL_X_POS,