From 2b293df71352347ed49b9fbeeb089e7b83b6ad62 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 29 Jun 2006 11:00:08 +0000
Subject: [PATCH] Updated wrappers.

---
 src/osgWrappers/osg/GNUmakefile               |  1 -
 src/osgWrappers/osg/Group.cpp                 | 93 +++----------------
 src/osgWrappers/osg/Node.cpp                  |  2 +-
 src/osgWrappers/osg/NodeVisitor.cpp           |  2 +-
 src/osgWrappers/osgDB/DatabasePager.cpp       |  2 +-
 src/osgWrappers/osgGA/EventVisitor.cpp        |  2 +-
 .../osgProducer/OsgCameraGroup.cpp            |  2 +-
 .../osgSim/InsertImpostorsVisitor.cpp         |  2 +-
 .../osgSim/OpenFlightOptimizer.cpp            |  2 +-
 src/osgWrappers/osgUtil/CullVisitor.cpp       |  2 +-
 src/osgWrappers/osgUtil/IntersectVisitor.cpp  |  2 +-
 src/osgWrappers/osgUtil/Optimizer.cpp         |  2 +-
 src/osgWrappers/osgUtil/UpdateVisitor.cpp     |  2 +-
 13 files changed, 24 insertions(+), 92 deletions(-)

diff --git a/src/osgWrappers/osg/GNUmakefile b/src/osgWrappers/osg/GNUmakefile
index a76bbcdca..d404b00a1 100644
--- a/src/osgWrappers/osg/GNUmakefile
+++ b/src/osgWrappers/osg/GNUmakefile
@@ -49,7 +49,6 @@ CXXFILES =\
 	GraphicsContext.cpp\
 	GraphicsThread.cpp\
 	Group.cpp\
-	Group.cpp\
 	Image.cpp\
 	ImageStream.cpp\
 	LOD.cpp\
diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp
index 9b65d5dba..3636fe84d 100644
--- a/src/osgWrappers/osg/Group.cpp
+++ b/src/osgWrappers/osg/Group.cpp
@@ -11,7 +11,7 @@
 
 #include <osg/BoundingSphere>
 #include <osg/CopyOp>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/Object>
@@ -26,7 +26,6 @@
 #endif
 
 BEGIN_OBJECT_REFLECTOR(osg::Group)
-	I_BaseType(osg::Node);
 	I_BaseType(osg::Node);
 	I_Constructor0();
 	I_ConstructorWithDefaults2(IN, const osg::Group &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
@@ -53,87 +52,21 @@ BEGIN_OBJECT_REFLECTOR(osg::Group)
 	I_Method1(unsigned int, getChildIndex, IN, const osg::Node *, node);
 	I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
 	I_Method0(osg::BoundingSphere, computeBound);
-	I_Constructor0();
-	I_ConstructorWithDefaults2(IN, const osg::Group &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
-	I_Method0(osg::Object *, cloneType);
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);
-	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj);
-	I_Method0(const char *, className);
-	I_Method0(const char *, libraryName);
-	I_Method1(void, accept, IN, osg::NodeVisitor &, nv);
-	I_Method0(osg::Group *, asGroup);
-	I_Method0(const osg::Group *, asGroup);
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv);
-	I_Method1(bool, addChild, IN, osg::Node *, child);
-	I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child);
-	I_Method1(bool, removeChild, IN, osg::Node *, child);
-	I_Method1(bool, removeChild, IN, unsigned int, pos);
-	I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove);
-	I_Method2(bool, replaceChild, IN, osg::Node *, origChild, IN, osg::Node *, newChild);
-	I_Method0(unsigned int, getNumChildren);
-	I_Method2(bool, setChild, IN, unsigned int, i, IN, osg::Node *, node);
-	I_Method1(osg::Node *, getChild, IN, unsigned int, i);
-	I_Method1(const osg::Node *, getChild, IN, unsigned int, i);
-	I_Method1(bool, containsNode, IN, const osg::Node *, node);
-	I_Method1(unsigned int, getChildIndex, IN, const osg::Node *, node);
-	I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
-	I_Method0(osg::BoundingSphere, computeBound);
 	I_ArrayProperty_GSA(osg::Node *, Child, Children, unsigned int, bool);
 END_REFLECTOR
 
-BEGIN_OBJECT_REFLECTOR(osg::Group)
-	I_BaseType(osg::Node);
-	I_BaseType(osg::Node);
+TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Node > >, osg::NodeList);
+
+BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Node >)
 	I_Constructor0();
-	I_ConstructorWithDefaults2(IN, const osg::Group &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
-	I_Method0(osg::Object *, cloneType);
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);
-	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj);
-	I_Method0(const char *, className);
-	I_Method0(const char *, libraryName);
-	I_Method1(void, accept, IN, osg::NodeVisitor &, nv);
-	I_Method0(osg::Group *, asGroup);
-	I_Method0(const osg::Group *, asGroup);
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv);
-	I_Method1(bool, addChild, IN, osg::Node *, child);
-	I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child);
-	I_Method1(bool, removeChild, IN, osg::Node *, child);
-	I_MethodWithDefaults2(bool, removeChild, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1);
-	I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove);
-	I_Method2(bool, replaceChild, IN, osg::Node *, origChild, IN, osg::Node *, newChild);
-	I_Method0(unsigned int, getNumChildren);
-	I_Method2(bool, setChild, IN, unsigned int, i, IN, osg::Node *, node);
-	I_Method1(osg::Node *, getChild, IN, unsigned int, i);
-	I_Method1(const osg::Node *, getChild, IN, unsigned int, i);
-	I_Method1(bool, containsNode, IN, const osg::Node *, node);
-	I_Method1(unsigned int, getChildIndex, IN, const osg::Node *, node);
-	I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
-	I_Method0(osg::BoundingSphere, computeBound);
-	I_Constructor0();
-	I_ConstructorWithDefaults2(IN, const osg::Group &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
-	I_Method0(osg::Object *, cloneType);
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);
-	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj);
-	I_Method0(const char *, className);
-	I_Method0(const char *, libraryName);
-	I_Method1(void, accept, IN, osg::NodeVisitor &, nv);
-	I_Method0(osg::Group *, asGroup);
-	I_Method0(const osg::Group *, asGroup);
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv);
-	I_Method1(bool, addChild, IN, osg::Node *, child);
-	I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child);
-	I_Method1(bool, removeChild, IN, osg::Node *, child);
-	I_Method1(bool, removeChild, IN, unsigned int, pos);
-	I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove);
-	I_Method2(bool, replaceChild, IN, osg::Node *, origChild, IN, osg::Node *, newChild);
-	I_Method0(unsigned int, getNumChildren);
-	I_Method2(bool, setChild, IN, unsigned int, i, IN, osg::Node *, node);
-	I_Method1(osg::Node *, getChild, IN, unsigned int, i);
-	I_Method1(const osg::Node *, getChild, IN, unsigned int, i);
-	I_Method1(bool, containsNode, IN, const osg::Node *, node);
-	I_Method1(unsigned int, getChildIndex, IN, const osg::Node *, node);
-	I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
-	I_Method0(osg::BoundingSphere, computeBound);
-	I_ArrayProperty_GSA(osg::Node *, Child, Children, unsigned int, bool);
+	I_Constructor1(IN, osg::Node *, ptr);
+	I_Constructor1(IN, const osg::ref_ptr< osg::Node > &, rp);
+	I_Method0(osg::Node *, get);
+	I_Method0(bool, valid);
+	I_Method0(osg::Node *, release);
+	I_Method1(void, swap, IN, osg::ref_ptr< osg::Node > &, rp);
+	I_ReadOnlyProperty(osg::Node *, );
 END_REFLECTOR
 
+STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Node > >);
+
diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp
index e1e61b20a..6f857026e 100644
--- a/src/osgWrappers/osg/Node.cpp
+++ b/src/osgWrappers/osg/Node.cpp
@@ -11,7 +11,7 @@
 
 #include <osg/BoundingSphere>
 #include <osg/CopyOp>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/Node>
 #include <osg/NodeCallback>
 #include <osg/NodeVisitor>
diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp
index f72c81d27..1f465066a 100644
--- a/src/osgWrappers/osg/NodeVisitor.cpp
+++ b/src/osgWrappers/osg/NodeVisitor.cpp
@@ -17,7 +17,7 @@
 #include <osg/CoordinateSystemNode>
 #include <osg/FrameStamp>
 #include <osg/Geode>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/LOD>
 #include <osg/LightSource>
 #include <osg/MatrixTransform>
diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp
index 69533e593..9df3a4800 100644
--- a/src/osgWrappers/osgDB/DatabasePager.cpp
+++ b/src/osgWrappers/osgDB/DatabasePager.cpp
@@ -11,7 +11,7 @@
 
 #include <osg/FrameStamp>
 #include <osg/GraphicsThread>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/Node>
 #include <osg/PagedLOD>
 #include <osg/State>
diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp
index 63cfdd91e..be58942e6 100644
--- a/src/osgWrappers/osgGA/EventVisitor.cpp
+++ b/src/osgWrappers/osgGA/EventVisitor.cpp
@@ -11,7 +11,7 @@
 
 #include <osg/Billboard>
 #include <osg/Geode>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/LOD>
 #include <osg/LightSource>
 #include <osg/Node>
diff --git a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp
index 5f39c60a4..209ee6f94 100644
--- a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp
+++ b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp
@@ -14,7 +14,7 @@
 #include <osg/CullSettings>
 #include <osg/DisplaySettings>
 #include <osg/FrameStamp>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/Matrixd>
 #include <osg/Node>
 #include <osg/StateSet>
diff --git a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp
index d70dec2fb..6b47dd9fa 100644
--- a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp
+++ b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp
@@ -9,7 +9,7 @@
 #include <osgIntrospection/TypedMethodInfo>
 #include <osgIntrospection/Attributes>
 
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/LOD>
 #include <osg/Node>
 #include <osgSim/InsertImpostorsVisitor>
diff --git a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp
index 93f0825f2..e5778fa50 100644
--- a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp
+++ b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp
@@ -10,7 +10,7 @@
 #include <osgIntrospection/Attributes>
 
 #include <osg/Geode>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/Node>
 #include <osgSim/OpenFlightOptimizer>
 
diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp
index 5f9ecffee..d7ae64bbd 100644
--- a/src/osgWrappers/osgUtil/CullVisitor.cpp
+++ b/src/osgWrappers/osgUtil/CullVisitor.cpp
@@ -16,7 +16,7 @@
 #include <osg/ClipNode>
 #include <osg/Drawable>
 #include <osg/Geode>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/LOD>
 #include <osg/LightSource>
 #include <osg/Matrix>
diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp
index 1e1bf5838..e245585e2 100644
--- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp
+++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp
@@ -13,7 +13,7 @@
 #include <osg/CameraNode>
 #include <osg/Drawable>
 #include <osg/Geode>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/LOD>
 #include <osg/LineSegment>
 #include <osg/Matrix>
diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp
index 1d150ea21..1021137f8 100644
--- a/src/osgWrappers/osgUtil/Optimizer.cpp
+++ b/src/osgWrappers/osgUtil/Optimizer.cpp
@@ -12,7 +12,7 @@
 #include <osg/Billboard>
 #include <osg/Drawable>
 #include <osg/Geode>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/LOD>
 #include <osg/MatrixTransform>
 #include <osg/Node>
diff --git a/src/osgWrappers/osgUtil/UpdateVisitor.cpp b/src/osgWrappers/osgUtil/UpdateVisitor.cpp
index 447798d24..32718323e 100644
--- a/src/osgWrappers/osgUtil/UpdateVisitor.cpp
+++ b/src/osgWrappers/osgUtil/UpdateVisitor.cpp
@@ -11,7 +11,7 @@
 
 #include <osg/Billboard>
 #include <osg/Geode>
-#include <osg/Group.bkp>
+#include <osg/Group>
 #include <osg/LOD>
 #include <osg/LightSource>
 #include <osg/Node>