mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00
Code Issues Releases Wiki Activity

[Global <-> Local] Auto switch between local and global map when zoom in/out

Browse source
This commit is contained in:
CedricMocquillon 2020-11-29 22:03:16 +01:00 committed by Cédric Mocquillon
parent 8c87defddf
commit 18f5853279
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwgui/mapwindow.cpp
View file

@ -886,16 +886,18 @@ namespace MWGui
void MapWindow::onMapZoomed(MyGUI::Widget* sender, int rel) void MapWindow::onMapZoomed(MyGUI::Widget* sender, int rel)
{ {
const static int localWidgetSize = Settings::Manager::getInt("local map widget size", "Map"); const static int localWidgetSize = Settings::Manager::getInt("local map widget size", "Map");
const static int globalCellSize = Settings::Manager::getInt("global map cell size", "Map");
const bool zoomOut = rel < 0; const bool zoomOut = rel < 0;
const bool zoomIn = !zoomOut; const bool zoomIn = !zoomOut;
const double speedDiff = zoomOut ? 1.0 / speed : speed; const double speedDiff = zoomOut ? 1.0 / speed : speed;
const float localMapSizeInUnits = localWidgetSize * mNumCells; const float localMapSizeInUnits = localWidgetSize * mNumCells;
const float currentMinLocalMapZoom = std::max( const float currentMinLocalMapZoom = std::max({
(float(globalCellSize) * 4.f) / float(localWidgetSize),
float(mLocalMap->getWidth()) / localMapSizeInUnits, float(mLocalMap->getWidth()) / localMapSizeInUnits,
float(mLocalMap->getHeight()) / localMapSizeInUnits float(mLocalMap->getHeight()) / localMapSizeInUnits
); });
if (mGlobal) if (mGlobal)
{ {
@ -910,6 +912,9 @@ namespace MWGui
if (zoomIn && mGlobalMapZoom > 4.f) if (zoomIn && mGlobalMapZoom > 4.f)
{ {
mGlobalMapZoom = currentGlobalZoom; mGlobalMapZoom = currentGlobalZoom;
mLocalMapZoom = currentMinLocalMapZoom;
onWorldButtonClicked(nullptr);
updateLocalMap();
return; //the zoom in is too big return; //the zoom in is too big
} }
@ -933,7 +938,13 @@ namespace MWGui
if (zoomOut && mLocalMapZoom < currentMinLocalMapZoom) if (zoomOut && mLocalMapZoom < currentMinLocalMapZoom)
{ {
mLocalMapZoom = currentLocalZoom; mLocalMapZoom = currentLocalZoom;
return; //the zoom out is too big
float zoomRatio = 4.f/ mGlobalMapZoom;
mGlobalMapZoom = 4.f;
onWorldButtonClicked(nullptr);
zoomOnCursor(zoomRatio);
return; //the zoom out is too big, we switch to the global map
} }
} }
zoomOnCursor(speedDiff); zoomOnCursor(speedDiff);