FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored the UserDataContainer so that the osg::UserDataContainer is now a pure virtual base class,

Browse Source 
with a osg::DefaultUserDataContainer subclassed from this.  The user object access methods have now all
been moved from osg::Object into the UserDataContainer class, except for the set/getUserData() methods
that are left in osg::Object for backwards compatibility, and the description list access methods have
been moved back into osg::Node.

main UserObject access methods are now all def
This commit is contained in:
Robert Osfield
2011-06-09 12:57:14 +00:00
parent 1016092720
commit 22bc0391c7
10 changed files with 317 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/osg/UserDataContainer.cpp
View File

@@ -26,12 +26,35 @@ UserDataContainer::UserDataContainer():
UserDataContainer::UserDataContainer(const UserDataContainer& udc, const osg::CopyOp& copyop):
Object(udc, copyop)
{
}
Object* UserDataContainer::getUserObject(const std::string& name, unsigned int startPos)
{
return getUserObject(getUserObjectIndex(name, startPos));
}
const Object* UserDataContainer::getUserObject(const std::string& name, unsigned int startPos) const
{
return getUserObject(getUserObjectIndex(name, startPos));
}
//////////////////////////////////////////////////////////////////////////////////////////////////
//
// DefaultUserDataContainer
//
DefaultUserDataContainer::DefaultUserDataContainer()
{
}
DefaultUserDataContainer::DefaultUserDataContainer(const DefaultUserDataContainer& udc, const osg::CopyOp& copyop):
UserDataContainer(udc, copyop)
{
_userData = udc._userData;
_descriptionList = udc._descriptionList;
}
void UserDataContainer::setThreadSafeRefUnref(bool threadSafe)
void DefaultUserDataContainer::setThreadSafeRefUnref(bool threadSafe)
{
Object::setThreadSafeRefUnref(threadSafe);
@@ -45,22 +68,22 @@ void UserDataContainer::setThreadSafeRefUnref(bool threadSafe)
}
}
void UserDataContainer::setUserData(Referenced* obj)
void DefaultUserDataContainer::setUserData(Referenced* obj)
{
_userData = obj;
}
Referenced* UserDataContainer::getUserData()
Referenced* DefaultUserDataContainer::getUserData()
{
return _userData.get();
}
const Referenced* UserDataContainer::getUserData() const
const Referenced* DefaultUserDataContainer::getUserData() const
{
return _userData.get();
}
unsigned int UserDataContainer::addUserObject(Object* obj)
unsigned int DefaultUserDataContainer::addUserObject(Object* obj)
{
// make sure that the object isn't already in the container
unsigned int i = getUserObjectIndex(obj);
@@ -78,7 +101,7 @@ unsigned int UserDataContainer::addUserObject(Object* obj)
return pos;
}
void UserDataContainer::removeUserObject(unsigned int i)
void DefaultUserDataContainer::removeUserObject(unsigned int i)
{
if (i<_objectList.size())
{
@@ -86,7 +109,7 @@ void UserDataContainer::removeUserObject(unsigned int i)
}
}
void UserDataContainer::setUserObject(unsigned int i, Object* obj)
void DefaultUserDataContainer::setUserObject(unsigned int i, Object* obj)
{
if (i<_objectList.size())
{
@@ -94,7 +117,7 @@ void UserDataContainer::setUserObject(unsigned int i, Object* obj)
}
}
Object* UserDataContainer::getUserObject(unsigned int i)
Object* DefaultUserDataContainer::getUserObject(unsigned int i)
{
if (i<_objectList.size())
{
@@ -103,7 +126,7 @@ Object* UserDataContainer::getUserObject(unsigned int i)
return 0;
}
const Object* UserDataContainer::getUserObject(unsigned int i) const
const Object* DefaultUserDataContainer::getUserObject(unsigned int i) const
{
if (i<_objectList.size())
{
@@ -112,12 +135,12 @@ const Object* UserDataContainer::getUserObject(unsigned int i) const
return 0;
}
unsigned int UserDataContainer::getNumUserObjects() const
unsigned int DefaultUserDataContainer::getNumUserObjects() const
{
return _objectList.size();
}
unsigned int UserDataContainer::getUserObjectIndex(const osg::Object* obj, unsigned int startPos) const
unsigned int DefaultUserDataContainer::getUserObjectIndex(const osg::Object* obj, unsigned int startPos) const
{
for(unsigned int i = startPos; i < _objectList.size(); ++i)
{
@@ -126,7 +149,7 @@ unsigned int UserDataContainer::getUserObjectIndex(const osg::Object* obj, unsig
return _objectList.size();
}
unsigned int UserDataContainer::getUserObjectIndex(const std::string& name, unsigned int startPos) const
unsigned int DefaultUserDataContainer::getUserObjectIndex(const std::string& name, unsigned int startPos) const
{
for(unsigned int i = startPos; i < _objectList.size(); ++i)
{
@@ -136,21 +159,29 @@ unsigned int UserDataContainer::getUserObjectIndex(const std::string& name, unsi
return _objectList.size();
}
void UserDataContainer::setDescriptions(const DescriptionList& descriptions)
void DefaultUserDataContainer::setDescriptions(const DescriptionList& descriptions)
{
_descriptionList = descriptions;
}
Object::DescriptionList& UserDataContainer::getDescriptions()
UserDataContainer::DescriptionList& DefaultUserDataContainer::getDescriptions()
{
return _descriptionList;
}
const Object::DescriptionList& UserDataContainer::getDescriptions() const
const UserDataContainer::DescriptionList& DefaultUserDataContainer::getDescriptions() const
{
return _descriptionList;
}
unsigned int DefaultUserDataContainer::getNumDescriptions() const
{
return _descriptionList.size();
}
void DefaultUserDataContainer::addDescription(const std::string& desc)
{
_descriptionList.push_back(desc);
}
} // end of namespace osg