Added support for shallow and deep copy of nodes, drawables and state, via a
copy constructor which takes an optional Cloner object, and the old osg::Object::clone() has changed so that it now requires a Cloner as paramter. This is passed on to the copy constructor to help control the shallow vs deep copying. The old functionality of clone() which was clone of type has been renamed to cloneType(). Updated all of the OSG to work with these new conventions, implemention all the required copy constructors etc. A couple of areas will do shallow copies by design, a couple of other still need to be updated to do either shallow or deep. Neither of the shallow or deep copy operations have been tested yet, only the old functionality of the OSG has been checked so far, such running the viewer on various demo datasets. Also fixed a problem in osg::Optimize::RemoveRendundentNodesVisitor which was not checking that Group didn't have have any attached StateSet's, Callbacks or UserData. These checks have now been added, which fixes a bug which was revealled by the new osgscribe demo, this related to removal of group acting as state decorator. method
This commit is contained in:
@@ -146,8 +146,16 @@ class SG_EXPORT GeoSet : public Drawable
|
||||
};
|
||||
|
||||
GeoSet();
|
||||
virtual Object* clone() const { return new GeoSet(); }
|
||||
|
||||
/** Copy constructor using Cloner to manage deep vs shallow copy.*/
|
||||
GeoSet(const GeoSet& geoset,const Cloner& cloner=ShallowCopy());
|
||||
|
||||
virtual Object* cloneType() const { return new GeoSet(); }
|
||||
|
||||
virtual Object* clone(const Cloner& cloner) const { return new GeoSet(*this,cloner); }
|
||||
|
||||
virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const GeoSet*>(obj)!=NULL; }
|
||||
|
||||
virtual const char* className() const { return "GeoSet"; }
|
||||
|
||||
|
||||
@@ -165,7 +173,6 @@ class SG_EXPORT GeoSet : public Drawable
|
||||
void computeNumVerts() const;
|
||||
|
||||
/** get the number of coords required by the defined primitives. */
|
||||
// inline const int getNumCoords() const
|
||||
inline const int getNumCoords() const
|
||||
{ if( _numcoords == 0 ) computeNumVerts(); return _numcoords; }
|
||||
/** get a pointer to Vec3 coord array. */
|
||||
|
||||
Reference in New Issue
Block a user