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

Changed the Node::ParentList to be a list of osg::Node rather than osg::Group, and added addChild, removeChild, replaceChild virtual method to Node to enable code

Browse Source 
to user code compile with minimal modifications to account for the new change to the Node ParentList.
This commit is contained in:
Robert Osfield
2014-05-13 08:43:07 +00:00
parent b2c7bacfe9
commit 12a737ae02
6 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/osg/Group
View File

@@ -65,12 +65,7 @@ class OSG_EXPORT Group : public Node
* and do not change the reference count of the Node.
* Note, do not override, only override removeChildren(,) is required.
*/
inline bool removeChild( Node *child )
{
unsigned int pos = getChildIndex(child);
if (pos<_children.size()) return removeChildren(pos,1);
else return false;
}
virtual bool removeChild( Node *child );
/** Remove Node from Group.
* If Node is contained in Group then remove it from the child
@@ -90,14 +85,14 @@ class OSG_EXPORT Group : public Node
* Note, must be override by subclasses of Group which add per child attributes.*/
virtual bool removeChildren(unsigned int pos,unsigned int numChildrenToRemove);
/** Replace specified Node with another Node.
/** Replace specified child Node with another Node.
* Equivalent to setChild(getChildIndex(orignChild),node)
* See docs for setChild for further details on implementation.
*/
virtual bool replaceChild( Node *origChild, Node* newChild );
/** Return the number of children nodes. */
inline unsigned int getNumChildren() const { return static_cast<unsigned int>(_children.size()); }
virtual unsigned int getNumChildren() const;
/** Set child node at position i.
* Return true if set correctly, false on failure (if node==NULL || i is out of range).

26
include/osg/Node
View File

@@ -148,7 +148,7 @@ class OSG_EXPORT Node : public Object
virtual void traverse(NodeVisitor& /*nv*/) {}
/** A vector of osg::Group pointers which is used to store the parent(s) of node.*/
typedef std::vector<Group*> ParentList;
typedef std::vector<Node*> ParentList;
/** Get the parent list of node. */
inline const ParentList& getParents() const { return _parents; }
@@ -157,14 +157,14 @@ class OSG_EXPORT Node : public Object
* prevent modification of the parent list.*/
inline ParentList getParents() { return _parents; }
inline Group* getParent(unsigned int i) { return _parents[i]; }
inline Node* getParent(unsigned int i) { return _parents[i]; }
/**
* Get a single const parent of node.
* @param i index of the parent to get.
* @return the parent i.
*/
inline const Group* getParent(unsigned int i) const { return _parents[i]; }
inline const Node* getParent(unsigned int i) const { return _parents[i]; }
/**
* Get the number of parents of node.
@@ -172,6 +172,22 @@ class OSG_EXPORT Node : public Object
*/
inline unsigned int getNumParents() const { return static_cast<unsigned int>(_parents.size()); }
/** Provide interface for Composite like Group nodes to implement.*/
virtual unsigned int getNumChildren() const { return 0; }
/** Provide interface for Composite like Group nodes to implement.*/
virtual bool addChild( Node* /*child*/ ) { return false; }
/** Provide interface for Composite like Group nodes to implement.*/
virtual bool removeChild( Node* /*child*/ ) { return false; }
/** Provide interface for Composite like Group nodes to implement.*/
virtual bool replaceChild( Node* /*origChild*/, Node* /*newChild*/ ) { return false; }
/** Get the list of node paths parent paths.
* The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specifed node. */
NodePathList getParentalNodePaths(osg::Node* haltTraversalAtNode=0) const;
@@ -451,8 +467,8 @@ class OSG_EXPORT Node : public Object
mutable BoundingSphere _boundingSphere;
mutable bool _boundingSphereComputed;
void addParent(osg::Group* node);
void removeParent(osg::Group* node);
void addParent(osg::Node* node);
void removeParent(osg::Node* node);
ParentList _parents;
friend class osg::Group;