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

consider scale and orientation when previewing reference

Browse source
This commit is contained in:
Marc Zinnschlag 2014-03-16 17:06:45 +01:00
parent 48ea93d890
commit 6b11265fbc
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
apps/opencs/view/render/previewwidget.cpp
View file

@ -23,15 +23,42 @@ void CSVRender::PreviewWidget::setup (const std::string& id)
if (model.empty()) if (model.empty())
return; return;
Ogre::SceneNode* node = getSceneManager()->getRootSceneNode()->createChildSceneNode(); mNode = getSceneManager()->getRootSceneNode()->createChildSceneNode();
node->setPosition (Ogre::Vector3 (0, 0, 0)); mNode->setPosition (Ogre::Vector3 (0, 0, 0));
mObject = NifOgre::Loader::createObjects (node, "Meshes\\" + model); mObject = NifOgre::Loader::createObjects (mNode, "Meshes\\" + model);
}
void CSVRender::PreviewWidget::adjust (const std::string& id)
{
if (mNode)
{
int row = mData.getReferences().getIndex (id);
float scale = mData.getReferences().getData (row, mData.getReferences().
findColumnIndex (CSMWorld::Columns::ColumnId_Scale)).toFloat();
float rotX = mData.getReferences().getData (row, mData.getReferences().
findColumnIndex (CSMWorld::Columns::ColumnId_PositionXRot)).toFloat();
float rotY = mData.getReferences().getData (row, mData.getReferences().
findColumnIndex (CSMWorld::Columns::ColumnId_PositionYRot)).toFloat();
float rotZ = mData.getReferences().getData (row, mData.getReferences().
findColumnIndex (CSMWorld::Columns::ColumnId_PositionZRot)).toFloat();
mNode->setScale (scale, scale, scale);
Ogre::Quaternion xr (Ogre::Radian(-rotX), Ogre::Vector3::UNIT_X);
Ogre::Quaternion yr (Ogre::Radian(-rotY), Ogre::Vector3::UNIT_Y);
Ogre::Quaternion zr (Ogre::Radian(-rotZ), Ogre::Vector3::UNIT_Z);
mNode->setOrientation (xr*yr*zr);
}
} }
CSVRender::PreviewWidget::PreviewWidget (const CSMWorld::Data& data, CSVRender::PreviewWidget::PreviewWidget (const CSMWorld::Data& data,
const std::string& referenceableId, QWidget *parent) const std::string& referenceableId, QWidget *parent)
: SceneWidget (parent), mData (data) : SceneWidget (parent), mData (data), mNode (0)
{ {
setup (referenceableId); setup (referenceableId);
} }
@ -41,5 +68,5 @@ CSVRender::PreviewWidget::PreviewWidget (const CSMWorld::Data& data,
: SceneWidget (parent), mData (data) : SceneWidget (parent), mData (data)
{ {
setup (referenceableId); setup (referenceableId);
/// \todo apply reference modifications (scale, rotation) adjust (referenceId);
} }

4
apps/opencs/view/render/previewwidget.hpp
View file

@ -21,10 +21,14 @@ namespace CSVRender
const CSMWorld::Data& mData; const CSMWorld::Data& mData;
CSVRender::NavigationOrbit mOrbit; CSVRender::NavigationOrbit mOrbit;
NifOgre::ObjectScenePtr mObject; NifOgre::ObjectScenePtr mObject;
Ogre::SceneNode *mNode;
void setup (const std::string& id); void setup (const std::string& id);
///< \param id ID of the referenceable to be viewed ///< \param id ID of the referenceable to be viewed
void adjust (const std::string& id);
///< \param id ID of the reference to be viewed
public: public:
PreviewWidget (const CSMWorld::Data& data, const std::string& referenceableId, PreviewWidget (const CSMWorld::Data& data, const std::string& referenceableId,