mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00
Code Issues Releases Wiki Activity

renamed ObjectHolder into ObjectTag

Browse source
This commit is contained in:
Marc Zinnschlag 2015-09-26 12:05:44 +02:00
parent d46eeb04cd
commit 748b13b45b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
mOutline = new osgFX::Scribe; mOutline = new osgFX::Scribe;
mOutline->addChild(mBaseNode); mOutline->addChild(mBaseNode);
mBaseNode->setUserData(new ObjectHolder(this)); mBaseNode->setUserData(new ObjectTag(this));
parentNode->addChild(mBaseNode); parentNode->addChild(mBaseNode);

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

@ -39,10 +39,10 @@ namespace CSVRender
class Object; class Object;
// An object to attach as user data to the osg::Node, allows us to get an Object back from a Node when we are doing a ray query // An object to attach as user data to the osg::Node, allows us to get an Object back from a Node when we are doing a ray query
class ObjectHolder : public osg::Referenced class ObjectTag : public osg::Referenced
{ {
public: public:
ObjectHolder(Object* obj) ObjectTag (Object* obj)
: mObject(obj) : mObject(obj)
{ {
} }

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

@ -463,7 +463,7 @@ void CSVRender::WorldspaceWidget::mousePressEvent (QMouseEvent *event)
for (std::vector<osg::Node*>::iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it) for (std::vector<osg::Node*>::iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it)
{ {
osg::Node* node = *it; osg::Node* node = *it;
if (CSVRender::ObjectHolder* holder = dynamic_cast<CSVRender::ObjectHolder*>(node->getUserData())) if (CSVRender::ObjectTag* holder = dynamic_cast<CSVRender::ObjectTag *>(node->getUserData()))
{ {
// hit an Object, toggle its selection state // hit an Object, toggle its selection state
CSVRender::Object* obj = holder->mObject; CSVRender::Object* obj = holder->mObject;