Have add new osg::CopyOp which replaces last nights osg::Cloner, the new

class now combines Cloner and DeepCopy into one class. Cloner and DeepCopy
will be removed in next commit.

Also have added osgcopy app to Demos which shows how the CopyOp have be
subclassed to create users own specific handling of copying.

Have fixed copy constructor problems in GeoSet which fix the deep copy
problem experienced yesterday.

include/osg/CopyOp

@@ -0,0 +1,60 @@
+//C++ header - Open Scene Graph - Copyright (C) 1998-2001 Robert Osfield
+//Distributed under the terms of the GNU Library General Public License (LGPL)
+//as published by the Free Software Foundation.
+
+#ifndef OSG_COPYOP
+#define OSG_COPYOP 1
+
+namespace osg {
+
+class Referenced;
+class Object;
+class Image;
+class Texture;
+class StateSet;
+class StateAttribute;
+class Node;
+class Drawable;
+
+/** Copy Op(erator) used to control the whether shallow or deep copy is used
+  * during copy construction and clone operation.*/
+class CopyOp
+{
+
+    public:
+    
+        enum Options
+        {
+            SHALLOW_COPY = 0,
+            DEEP_COPY_OBJECTS = 1,
+            DEEP_COPY_NODES = 2,
+            DEEP_COPY_DRAWABLES = 4,
+            DEEP_COPY_STATESETS = 8,
+            DEEP_COPY_STATEATTRIBUTES = 16,
+            DEEP_COPY_TEXTURES = 32,
+            DEEP_COPY_IMAGES = 64,
+            DEEP_COPY_ALL = 0xffffffff
+        };
+
+        typedef unsigned int CopyFlags;
+
+        inline CopyOp(CopyFlags flags=SHALLOW_COPY):_flags(flags) {}
+        virtual ~CopyOp() {}
+
+        virtual Referenced*     operator() (const Referenced* ref) const;
+        virtual Object*         operator() (const Object* obj) const;
+        virtual Node*           operator() (const Node* node) const;
+        virtual Drawable*       operator() (const Drawable* drawable) const;
+        virtual StateSet*       operator() (const StateSet* stateset) const;
+        virtual StateAttribute* operator() (const StateAttribute* attr) const;
+        virtual Texture*        operator() (const Texture* text) const;
+        virtual Image*          operator() (const Image* image) const;
+
+    protected:
+    
+        CopyFlags _flags;
+};
+
+};
+
+#endif

include/osg/Object

@@ -6,10 +6,13 @@
 #define OSG_OBJECT 1
 
 #include <osg/Referenced>
-#include <osg/ShallowCopy>
+#include <osg/CopyOp>
 
 namespace osg {
 
+typedef CopyOp Cloner;
+typedef CopyOp ShallowCopy;
+
 /** META_Object macro define the standard clone, isSameKindAs and className methods.
   * Use when subclassing from Object to make it more convinient to define 
   * the standard pure virtual clone, isSameKindAs and className methods 
@@ -38,7 +41,7 @@ class SG_EXPORT Object : public Referenced
 
         /** Copy constructor, optional Cloner object can be used to control
           * shallow vs deep copying of dynamic data.*/
-        Object(const Object&,const Cloner& cloner=ShallowCopy());
+        Object(const Object&,const Cloner& cloner=CopyOp::SHALLOW_COPY);
 
         /** Clone the type of an object, with Object* return type.
             Must be defined by derived classes.*/