mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix of crashing when scrolling too fast - add cap of update of scroll callback

Browse Source
This commit is contained in:
Ylva Selling
2021-05-06 15:29:06 +02:00
parent 9514fda861
commit 16e83fdcdd
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/skybrowser/skybrowsermodule.cpp
View File

@@ -195,7 +195,6 @@ SkyBrowserModule::SkyBrowserModule()
double OpenSpaceHorizontalFOV = global::windowDelegate->getHorizFieldOfView();
glm::dvec2 OpenSpaceFOV = glm::dvec2(OpenSpaceHorizontalFOV, OpenSpaceHorizontalFOV * windowRatio);
glm::dvec2 angleResult = WWTFOV * (move / browserDim);
glm::dvec2 OSresult = angleResult / OpenSpaceFOV;
@@ -259,15 +258,19 @@ SkyBrowserModule::SkyBrowserModule()
global::callback::mouseScrollWheel->emplace_back(
[&](double, double scroll) -> bool {
// If mouse is on browser, apply zoom
if (to_browser(_mouseOnObject)) {
to_browser(_mouseOnObject)->scrollZoom(scroll);
return true;
// Cap how often the zoom is allowed to update
std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
if (now - _lastUpdateTime > TimeUpdateInterval) {
// If mouse is on browser or target, apply zoom
if (to_browser(_mouseOnObject)) {
to_browser(_mouseOnObject)->scrollZoom(scroll);
return true;
}
else if (to_target(_mouseOnObject) && to_target(_mouseOnObject)->getSkyBrowser()) {
to_target(_mouseOnObject)->getSkyBrowser()->scrollZoom(scroll);
}
_lastUpdateTime = std::chrono::system_clock::now();
}
else if (to_target(_mouseOnObject) && to_target(_mouseOnObject)->getSkyBrowser()) {
to_target(_mouseOnObject)->getSkyBrowser()->scrollZoom(scroll);
}
return false;
}
);

3
modules/skybrowser/skybrowsermodule.h
View File

@@ -85,6 +85,9 @@ protected:
bool currentlyResizingBrowser;
bool currentlyDraggingObject;
WWTDataHandler* dataHandler;
// For capping the calls to change the zoom from scrolling
constexpr static const std::chrono::milliseconds TimeUpdateInterval{ 50 };
std::chrono::system_clock::time_point _lastUpdateTime;
};
} // namespace openspace