mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-03 23:26:40 +00:00
Code Issues Releases Wiki Activity

Fix Gcc/MSVC differences with friend class. Invert camera derived direction.

Browse source
This commit is contained in:
cc9cii 2014-11-02 11:41:11 +11:00
parent a21958d007
commit 1eed180a5c
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/view/render/mousestate.cpp
View file

@ -335,6 +335,7 @@ namespace CSVRender
{ {
CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance(); CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
QString coord = userSettings.setting("debug/mouse-reference", QString("screen")); QString coord = userSettings.setting("debug/mouse-reference", QString("screen"));
Ogre::Vector3 derived = getCamera()->getDerivedDirection();
QString wheelDir = userSettings.setting("debug/mouse-wheel", QString("Closer/Further")); QString wheelDir = userSettings.setting("debug/mouse-wheel", QString("Closer/Further"));
if(wheelDir == "Left/Right") if(wheelDir == "Left/Right")
@ -342,7 +343,7 @@ namespace CSVRender
if(coord == "world") if(coord == "world")
return std::make_pair(Ogre::Vector3::UNIT_Y, Ogre::Vector3::UNIT_X); return std::make_pair(Ogre::Vector3::UNIT_Y, Ogre::Vector3::UNIT_X);
else else
return std::make_pair(getCamera()->getDerivedRight(), getCamera()->getDerivedDirection()); return std::make_pair(getCamera()->getDerivedRight(), Ogre::Vector3(-derived.x, -derived.y, -derived.z));
} }
else if(wheelDir == "Up/Down") else if(wheelDir == "Up/Down")
{ {
@ -356,7 +357,7 @@ namespace CSVRender
if(coord == "world") if(coord == "world")
return std::make_pair(Ogre::Vector3::UNIT_X, Ogre::Vector3::UNIT_Y); return std::make_pair(Ogre::Vector3::UNIT_X, Ogre::Vector3::UNIT_Y);
else else
return std::make_pair(getCamera()->getDerivedDirection(), getCamera()->getDerivedRight()); return std::make_pair(Ogre::Vector3(-derived.x, -derived.y, -derived.z), getCamera()->getDerivedRight());
} }
} }

1
apps/opencs/view/render/worldspacewidget.cpp
View file

@ -19,7 +19,6 @@
#include "../world/physicsmanager.hpp" #include "../world/physicsmanager.hpp"
#include "../world/physicssystem.hpp" #include "../world/physicssystem.hpp"
#include "mousestate.hpp"
#include "elements.hpp" #include "elements.hpp"
CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent) CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)

1
apps/opencs/view/render/worldspacewidget.hpp
View file

@ -2,6 +2,7 @@
#define OPENCS_VIEW_WORLDSPACEWIDGET_H #define OPENCS_VIEW_WORLDSPACEWIDGET_H
#include "scenewidget.hpp" #include "scenewidget.hpp"
#include "mousestate.hpp"
#include "navigation1st.hpp" #include "navigation1st.hpp"
#include "navigationfree.hpp" #include "navigationfree.hpp"