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

Merge remote-tracking branch 'rcutmore/bug-3484'

Browse source
This commit is contained in:
Marc Zinnschlag 2017-04-07 10:38:16 +02:00
commit 9d5c46027d
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/view/render/cameracontroller.cpp
View file

@ -632,7 +632,7 @@ namespace CSVRender
getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix()); getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
} }
void OrbitCameraController::onActivate() void OrbitCameraController::reset()
{ {
mInitialized = false; mInitialized = false;
} }

7
apps/opencs/view/render/cameracontroller.hpp
View file

@ -63,8 +63,6 @@ namespace CSVRender
protected: protected:
virtual void onActivate(){}
void addShortcut(CSMPrefs::Shortcut* shortcut); void addShortcut(CSMPrefs::Shortcut* shortcut);
private: private:
@ -159,9 +157,10 @@ namespace CSVRender
void update(double dt); void update(double dt);
private: /// \brief Flag controller to be re-initialized.
void reset();
void onActivate(); private:
void initialize(); void initialize();

3
apps/opencs/view/render/unpagedworldspacewidget.cpp
View file

@ -15,6 +15,7 @@
#include "../widget/scenetooltoggle.hpp" #include "../widget/scenetooltoggle.hpp"
#include "../widget/scenetooltoggle2.hpp" #include "../widget/scenetooltoggle2.hpp"
#include "cameracontroller.hpp"
#include "mask.hpp" #include "mask.hpp"
#include "tagbase.hpp" #include "tagbase.hpp"
@ -92,6 +93,8 @@ bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld:
mCellId = universalIdData.begin()->getId(); mCellId = universalIdData.begin()->getId();
mCell.reset (new Cell (getDocument().getData(), mRootNode, mCellId)); mCell.reset (new Cell (getDocument().getData(), mRootNode, mCellId));
mCamPositionSet = false;
mOrbitCamControl->reset();
update(); update();
emit cellChanged(*universalIdData.begin()); emit cellChanged(*universalIdData.begin());