mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-03 13:19:40 +00:00
Fixed crash exiting internal cells. Better starting camera position for external cells.
This commit is contained in:
parent
a161ad3cd5
commit
7836ee9ab6
3 changed files with 16 additions and 2 deletions
|
@ -134,8 +134,22 @@ void CSVRender::PagedWorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CSVRender::PagedWorldspaceWidget::mouseDoubleClickEvent (QMouseEvent *event)
|
||||||
|
{
|
||||||
|
if(event->button() == Qt::RightButton)
|
||||||
|
{
|
||||||
|
std::cout << "double clicked" << std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void CSVRender::PagedWorldspaceWidget::updateOverlay()
|
void CSVRender::PagedWorldspaceWidget::updateOverlay()
|
||||||
{
|
{
|
||||||
|
// better camera position at the start
|
||||||
|
if(getCamera()->getViewport() && getCamera()->getPosition().z < 1)
|
||||||
|
{
|
||||||
|
getCamera()->move(getCamera()->getDirection() * -6000);
|
||||||
|
}
|
||||||
|
|
||||||
Ogre::OverlayManager &overlayMgr = Ogre::OverlayManager::getSingleton();
|
Ogre::OverlayManager &overlayMgr = Ogre::OverlayManager::getSingleton();
|
||||||
Ogre::Overlay* overlay = overlayMgr.getByName("CellIDPanel");
|
Ogre::Overlay* overlay = overlayMgr.getByName("CellIDPanel");
|
||||||
if(overlay && !mTextOverlays.empty())
|
if(overlay && !mTextOverlays.empty())
|
||||||
|
|
|
@ -82,6 +82,8 @@ namespace CSVRender
|
||||||
|
|
||||||
virtual void mouseReleaseEvent (QMouseEvent *event);
|
virtual void mouseReleaseEvent (QMouseEvent *event);
|
||||||
|
|
||||||
|
virtual void mouseDoubleClickEvent (QMouseEvent *event);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|
||||||
void cellSelectionChanged (const CSMWorld::CellSelection& selection);
|
void cellSelectionChanged (const CSMWorld::CellSelection& selection);
|
||||||
|
|
|
@ -166,8 +166,6 @@ namespace CSVRender
|
||||||
{
|
{
|
||||||
if (mSceneMgr)
|
if (mSceneMgr)
|
||||||
mSceneMgr->removeRenderQueueListener (mOverlaySystem);
|
mSceneMgr->removeRenderQueueListener (mOverlaySystem);
|
||||||
|
|
||||||
delete mOverlaySystem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mSceneMgr)
|
if (mSceneMgr)
|
||||||
|
|
Loading…
Reference in a new issue