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

105
include/osg/UserDataContainer
View File

@@ -28,9 +28,95 @@ class OSG_EXPORT UserDataContainer : public osg::Object
UserDataContainer();
UserDataContainer(const UserDataContainer& udc, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
META_Object(osg, UserDataContainer)
virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const UserDataContainer*>(obj)!=0; }
/** return the name of the object's library. Must be defined
by derived classes. The OpenSceneGraph convention is that the
namespace of a library is the same as the library name.*/
virtual const char* libraryName() const { return "osg"; }
/** return the name of the object's class type. Must be defined
by derived classes.*/
virtual const char* className() const { return "UserDataContainer"; }
/**
* Set user data, data must be subclassed from Referenced to allow
* automatic memory handling. If your own data isn't directly
* subclassed from Referenced then create an adapter object
* which points to your own object and handles the memory addressing.
*/
virtual void setUserData(Referenced* obj) = 0;
/** Get user data.*/
virtual Referenced* getUserData() = 0;
/** Get const user data.*/
virtual const Referenced* getUserData() const = 0;
/** Add user data object. Returns the index position of object added. */
virtual unsigned int addUserObject(Object* obj) = 0;
/** Add element to list of user data objects.*/
virtual void setUserObject(unsigned int i, Object* obj) = 0;
/** Remove element from the list of user data objects.*/
virtual void removeUserObject(unsigned int i) = 0;
/** Get user data object as specified index position. */
virtual Object* getUserObject(unsigned int i) = 0;
/** Get const user data object as specified index position. */
virtual const Object* getUserObject(unsigned int i) const = 0;
/** Get number of user objects assigned to this object.*/
virtual unsigned int getNumUserObjects() const = 0;
/** Get the index position of specified user data object.*/
virtual unsigned int getUserObjectIndex(const osg::Object* obj, unsigned int startPos=0) const = 0;
/** Get the index position of first user data object that matches specified name.*/
virtual unsigned int getUserObjectIndex(const std::string& name, unsigned int startPos=0) const = 0;
/** Get first user data object with specified name. */
virtual Object* getUserObject(const std::string& name, unsigned int startPos=0);
/** Get first const user data object with specified name. */
virtual const Object* getUserObject(const std::string& name, unsigned int startPos=0) const;
typedef std::vector<std::string> DescriptionList;
/** Set the list of string descriptions.*/
virtual void setDescriptions(const DescriptionList& descriptions) = 0;
/** Get the description list.*/
virtual DescriptionList& getDescriptions() = 0;
/** Get the const description list.*/
virtual const DescriptionList& getDescriptions() const = 0;
/** Get number of description strings.*/
virtual unsigned int getNumDescriptions() const = 0;
/** Add a description string.*/
virtual void addDescription(const std::string& desc) = 0;
protected:
virtual ~UserDataContainer() {}
};
/** Internal structure for storing all user data.*/
class OSG_EXPORT DefaultUserDataContainer : public osg::UserDataContainer
{
public:
DefaultUserDataContainer();
DefaultUserDataContainer(const DefaultUserDataContainer& udc, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
META_Object(osg, DefaultUserDataContainer)
virtual void setThreadSafeRefUnref(bool threadSafe);
/**
@@ -73,18 +159,26 @@ class OSG_EXPORT UserDataContainer : public osg::Object
virtual unsigned int getUserObjectIndex(const std::string& name, unsigned int startPos=0) const;
/** Set the list of string descriptions.*/
virtual void setDescriptions(const DescriptionList& descriptions);
/** Get the description list of the node.*/
/** Get the description list.*/
virtual DescriptionList& getDescriptions();
/** Get the const description list of the const node.*/
/** Get the const description list.*/
virtual const DescriptionList& getDescriptions() const;
/** Get number of description strings.*/
virtual unsigned int getNumDescriptions() const;
protected:
virtual ~UserDataContainer() {}
/** Add a description string.*/
virtual void addDescription(const std::string& desc);
protected:
virtual ~DefaultUserDataContainer() {}
typedef std::vector< osg::ref_ptr<osg::Object> > ObjectList;
@@ -93,7 +187,6 @@ class OSG_EXPORT UserDataContainer : public osg::Object
ObjectList _objectList;
};
}
#endif