mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-22 01:11:32 +00:00
Code Issues Releases Wiki Activity

Minor tweaks.

Browse source
This commit is contained in:
cc9cii 2014-11-02 15:03:26 +11:00
parent 1eed180a5c
commit e174428cc5
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -207,21 +207,21 @@ namespace CSVRender
mMouseState = Mouse_Edit; mMouseState = Mouse_Edit;
mCurrentObj = result.first; mCurrentObj = result.first;
// print some debug info }
if(isDebug()) // print some debug info
if(isDebug())
{
std::string referenceId = mPhysics->sceneNodeToRefId(result.first);
std::cout << "ReferenceId: " << referenceId << std::endl;
const CSMWorld::RefCollection& references = mParent->mDocument.getData().getReferences();
int index = references.searchId(referenceId);
if (index != -1)
{ {
std::string referenceId = mPhysics->sceneNodeToRefId(result.first); int columnIndex =
std::cout << "ReferenceId: " << referenceId << std::endl; references.findColumnIndex(CSMWorld::Columns::ColumnId_ReferenceableId);
const CSMWorld::RefCollection& references = mParent->mDocument.getData().getReferences(); std::cout << " index: " + QString::number(index).toStdString()
int index = references.searchId(referenceId); +", column index: " + QString::number(columnIndex).toStdString()
if (index != -1) << std::endl;
{
int columnIndex =
references.findColumnIndex(CSMWorld::Columns::ColumnId_ReferenceableId);
std::cout << " index: " + QString::number(index).toStdString()
+", column index: " + QString::number(columnIndex).toStdString()
<< std::endl;
}
} }
} }
} }
@ -335,29 +335,29 @@ 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(); Ogre::Vector3 dir = 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")
{ {
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_Z);
else else
return std::make_pair(getCamera()->getDerivedRight(), Ogre::Vector3(-derived.x, -derived.y, -derived.z)); return std::make_pair(getCamera()->getDerivedRight(), getCamera()->getDerivedUp());
} }
else if(wheelDir == "Up/Down") else if(wheelDir == "Up/Down")
{ {
if(coord == "world") if(coord == "world")
return std::make_pair(Ogre::Vector3::UNIT_Z, Ogre::Vector3::UNIT_Y); return std::make_pair(Ogre::Vector3::UNIT_Z, Ogre::Vector3::UNIT_X);
else else
return std::make_pair(getCamera()->getDerivedUp(), getCamera()->getDerivedRight()); return std::make_pair(getCamera()->getDerivedUp(), Ogre::Vector3(-dir.x, -dir.y, -dir.z));
} }
else else
{ {
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(Ogre::Vector3(-derived.x, -derived.y, -derived.z), getCamera()->getDerivedRight()); return std::make_pair(Ogre::Vector3(-dir.x, -dir.y, -dir.z), getCamera()->getDerivedRight());
} }
} }