Slowed down camera scroll zoom
This commit is contained in:
parent
653e1addfa
commit
8df34da421
1 changed files with 8 additions and 9 deletions
|
|
@ -213,6 +213,7 @@ void DrawCamera::input_mouse_motion_callback(World& w, const InputManager::Mouse
|
||||||
|
|
||||||
void DrawCamera::input_mouse_wheel_callback(World& w, const InputManager::MouseWheelCallbackArgs& wheel) {
|
void DrawCamera::input_mouse_wheel_callback(World& w, const InputManager::MouseWheelCallbackArgs& wheel) {
|
||||||
if(!smoothMove.occurring && !isTouchTransforming && wheel.tickAmount.y() && !w.main.g.gui.cursor_obstructed()) {
|
if(!smoothMove.occurring && !isTouchTransforming && wheel.tickAmount.y() && !w.main.g.gui.cursor_obstructed()) {
|
||||||
|
// Doesn't take tickAmount magnitude into account, since that results in scrolling that's way too fast on macOS
|
||||||
WorldVec mouseWorldPos = c.from_space(wheel.mousePos);
|
WorldVec mouseWorldPos = c.from_space(wheel.mousePos);
|
||||||
WorldScalar zoomFactor(1.0 + w.main.conf.scrollZoomSpeed);
|
WorldScalar zoomFactor(1.0 + w.main.conf.scrollZoomSpeed);
|
||||||
|
|
||||||
|
|
@ -220,17 +221,15 @@ void DrawCamera::input_mouse_wheel_callback(World& w, const InputManager::MouseW
|
||||||
zoomFactor = WorldScalar(0.000001);
|
zoomFactor = WorldScalar(0.000001);
|
||||||
|
|
||||||
if(zoomFactor != WorldScalar(0)) {
|
if(zoomFactor != WorldScalar(0)) {
|
||||||
if(wheel.tickAmount.y() < 0.0)
|
if(wheel.tickAmount.y() < 0)
|
||||||
zoomFactor = WorldScalar(1) / zoomFactor;
|
zoomFactor = WorldScalar(1) / zoomFactor;
|
||||||
|
|
||||||
for(int i = 0; i < std::abs(wheel.tickAmount.y()); i++) {
|
c.scale(zoomFactor);
|
||||||
c.scale(zoomFactor);
|
if(c.inverseScale < WorldScalar(0.0001))
|
||||||
if(c.inverseScale < WorldScalar(0.0001))
|
c.inverseScale = WorldScalar(0.0001);
|
||||||
c.inverseScale = WorldScalar(0.0001);
|
else {
|
||||||
else {
|
WorldVec mVec = c.pos - mouseWorldPos;
|
||||||
WorldVec mVec = c.pos - mouseWorldPos;
|
c.pos = mouseWorldPos + mVec / zoomFactor;
|
||||||
c.pos = mouseWorldPos + mVec / zoomFactor;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue