From 8248ecdeac1e7acf564427cfa3cdf020bbbbef3c Mon Sep 17 00:00:00 2001 From: Areloch Date: Wed, 5 Aug 2015 17:44:55 -0500 Subject: [PATCH] Looks like WHEEL_DELTA is defined for win and osx, but not linux. Retooling to utilize a $pref instead, as that will let the scroll speed be modifiable for any projects that need it. --- Engine/source/windowManager/sdl/sdlWindow.cpp | 2 +- Templates/Empty/game/core/scripts/client/defaults.cs | 1 + Templates/Full/game/core/scripts/client/defaults.cs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Engine/source/windowManager/sdl/sdlWindow.cpp b/Engine/source/windowManager/sdl/sdlWindow.cpp index 10f4cce4a..1d92c6f2e 100644 --- a/Engine/source/windowManager/sdl/sdlWindow.cpp +++ b/Engine/source/windowManager/sdl/sdlWindow.cpp @@ -434,7 +434,7 @@ void PlatformWindowSDL::_triggerMouseLocationNotify(const SDL_Event& evt) void PlatformWindowSDL::_triggerMouseWheelNotify(const SDL_Event& evt) { - wheelEvent.trigger(getWindowId(), 0, evt.wheel.x, evt.wheel.y * WHEEL_DELTA); + wheelEvent.trigger(getWindowId(), 0, evt.wheel.x, evt.wheel.y * Con::getIntVariable("$pref::Input::MouseWheelSpeed")); } void PlatformWindowSDL::_triggerMouseButtonNotify(const SDL_Event& event) diff --git a/Templates/Empty/game/core/scripts/client/defaults.cs b/Templates/Empty/game/core/scripts/client/defaults.cs index 87a77b295..0142a9410 100644 --- a/Templates/Empty/game/core/scripts/client/defaults.cs +++ b/Templates/Empty/game/core/scripts/client/defaults.cs @@ -41,6 +41,7 @@ $pref::Input::KeyboardEnabled = 1; $pref::Input::MouseEnabled = 1; $pref::Input::JoystickEnabled = 0; $pref::Input::KeyboardTurnSpeed = 0.1; +$pref::Input::MouseWheelSpeed = 120; $sceneLighting::cacheSize = 20000; $sceneLighting::purgeMethod = "lastCreated"; diff --git a/Templates/Full/game/core/scripts/client/defaults.cs b/Templates/Full/game/core/scripts/client/defaults.cs index 87a77b295..0142a9410 100644 --- a/Templates/Full/game/core/scripts/client/defaults.cs +++ b/Templates/Full/game/core/scripts/client/defaults.cs @@ -41,6 +41,7 @@ $pref::Input::KeyboardEnabled = 1; $pref::Input::MouseEnabled = 1; $pref::Input::JoystickEnabled = 0; $pref::Input::KeyboardTurnSpeed = 0.1; +$pref::Input::MouseWheelSpeed = 120; $sceneLighting::cacheSize = 20000; $sceneLighting::purgeMethod = "lastCreated";