teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Map Arrow Correction; now rotate global map arrow to whatever the local map arrow orientation is

Browse source
This commit is contained in:
Ragora 2014-09-12 18:26:38 -04:00
parent 35571bb108
commit 282e7abd16
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -754,10 +754,6 @@ namespace MWGui
void MapWindow::globalMapUpdatePlayer () void MapWindow::globalMapUpdatePlayer ()
{ {
Ogre::Quaternion orient = MWBase::Environment::get().getWorld ()->getPlayerPtr().getRefData ().getBaseNode ()->_getDerivedOrientation ();
Ogre::Vector2 dir (orient.yAxis ().x, orient.yAxis().y);
float globalPlayerArrowAngle = std::atan2(dir.x, dir.y);
// For interiors, position is set by WindowManager via setGlobalMapPlayerPosition // For interiors, position is set by WindowManager via setGlobalMapPlayerPosition
if (MWBase::Environment::get().getWorld ()->isCellExterior ()) if (MWBase::Environment::get().getWorld ()->isCellExterior ())
{ {
@ -775,14 +771,6 @@ namespace MWGui
MyGUI::IntPoint viewoffs(0.5*viewsize.width - worldX, 0.5*viewsize.height - worldY); MyGUI::IntPoint viewoffs(0.5*viewsize.width - worldX, 0.5*viewsize.height - worldY);
mGlobalMap->setViewOffset(viewoffs); mGlobalMap->setViewOffset(viewoffs);
} }
else
globalPlayerArrowAngle -= M_PI/2; // If we're indoors, apparently the angle is +90 degrees off.
// Always rotate the global map compass
MyGUI::ISubWidget* main = mPlayerArrowGlobal->getSubWidgetMain();
MyGUI::RotatingSkin* rotatingSubskin = main->castType<MyGUI::RotatingSkin>();
rotatingSubskin->setCenter(MyGUI::IntPoint(16,16));
rotatingSubskin->setAngle(globalPlayerArrowAngle);
} }
void MapWindow::notifyPlayerUpdate () void MapWindow::notifyPlayerUpdate ()
@ -805,6 +793,15 @@ namespace MWGui
mGlobalMap->setViewOffset(viewoffs); mGlobalMap->setViewOffset(viewoffs);
} }
void MapWindow::setGlobalMapPlayerDir(const float x, const float y)
{
MyGUI::ISubWidget* main = mPlayerArrowGlobal->getSubWidgetMain();
MyGUI::RotatingSkin* rotatingSubskin = main->castType<MyGUI::RotatingSkin>();
rotatingSubskin->setCenter(MyGUI::IntPoint(16,16));
float angle = std::atan2(x,y);
rotatingSubskin->setAngle(angle);
}
void MapWindow::clear() void MapWindow::clear()
{ {
mMarkers.clear(); mMarkers.clear();

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

@ -180,6 +180,7 @@ namespace MWGui
void cellExplored(int x, int y); void cellExplored(int x, int y);
void setGlobalMapPlayerPosition (float worldX, float worldY); void setGlobalMapPlayerPosition (float worldX, float worldY);
void setGlobalMapPlayerDir(const float x, const float y);
virtual void open(); virtual void open();

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

@ -909,6 +909,7 @@ namespace MWGui
void WindowManager::setPlayerDir(const float x, const float y) void WindowManager::setPlayerDir(const float x, const float y)
{ {
mMap->setPlayerDir(x,y); mMap->setPlayerDir(x,y);
mMap->setGlobalMapPlayerDir(x, y);
mHud->setPlayerDir(x,y); mHud->setPlayerDir(x,y);
} }