mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Code Issues Releases Wiki Activity

Do not use the delayed map cells update

Browse source
This commit is contained in:
bzzt 2019-02-28 09:10:22 +04:00 committed by Andrei Kortunov
parent 92bed66e5f
commit c2176945bd
4 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -837,22 +837,13 @@ namespace MWGui
void MapWindow::cellExplored(int x, int y)
{
mQueuedToExplore.push_back(std::make_pair(x,y));
mGlobalMapRender->cleanupCameras();
mGlobalMapRender->exploreCell(x, y, mLocalMapRender->getMapTexture(x, y));
}
void MapWindow::onFrame(float dt)
{
LocalMapBase::onFrame(dt);
mGlobalMapRender->cleanupCameras();
for (CellId& cellId : mQueuedToExplore)
{
mGlobalMapRender->exploreCell(cellId.first, cellId.second, mLocalMapRender->getMapTexture(cellId.first, cellId.second));
}
mQueuedToExplore.clear();
NoDrop::onFrame(dt);
}

4
apps/openmw/mwgui/mapwindow.hpp
View file

@ -261,10 +261,6 @@ namespace MWGui
typedef std::pair<int, int> CellId;
std::set<CellId> mMarkers;
// Cells that should be explored in the next frame (i.e. their map revealed on the global map)
// We can't do this immediately, because the map update is not immediate either (see mNeedMapUpdate in scene.cpp)
std::vector<CellId> mQueuedToExplore;
MyGUI::Button* mEventBoxGlobal;
MyGUI::Button* mEventBoxLocal;

3
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1027,9 +1027,6 @@ namespace MWGui
updateMap();
if (!mMap->isVisible())
mMap->onFrame(frameDuration);
mHud->onFrame(frameDuration);
mDebugWindow->onFrame(frameDuration);

2
apps/openmw/mwrender/globalmap.cpp
View file

@ -293,7 +293,7 @@ namespace MWRender
camera->setViewMatrix(osg::Matrix::identity());
camera->setProjectionMatrix(osg::Matrix::identity());
camera->setProjectionResizePolicy(osg::Camera::FIXED);
camera->setRenderOrder(osg::Camera::PRE_RENDER);
camera->setRenderOrder(osg::Camera::PRE_RENDER, 1); // Make sure the global map is rendered after the local map
y = mHeight - y - height; // convert top-left origin to bottom-left
camera->setViewport(x, y, width, height);