From 359f056c7388a993995031a16e7590b0b51ef05f Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 25 Feb 2008 15:08:45 +0000
Subject: [PATCH] Updated wrappers

---
 src/osgWrappers/osg/Plane.cpp              |  7 ++++---
 src/osgWrappers/osg/ProxyNode.cpp          | 20 ++++++++++++++++++++
 src/osgWrappers/osgManipulator/Dragger.cpp |  4 ++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/osgWrappers/osg/Plane.cpp b/src/osgWrappers/osg/Plane.cpp
index 513485abd..2ff7d955d 100644
--- a/src/osgWrappers/osg/Plane.cpp
+++ b/src/osgWrappers/osg/Plane.cpp
@@ -14,7 +14,6 @@
 #include <osg/BoundingSphere>
 #include <osg/Matrix>
 #include <osg/Plane>
-#include <osg/Vec3>
 #include <osg/Vec3d>
 #include <osg/Vec3f>
 #include <osg/Vec4d>
@@ -174,9 +173,9 @@ BEGIN_VALUE_REFLECTOR(osg::Plane)
 	          __double__dotProductNormal__C5_osg_Vec3d_R1,
 	          "calculate the dot product of the plane normal and a point. ",
 	          "");
-	I_Method1(int, intersect, IN, const std::vector< osg::Vec3 > &, vertices,
+	I_Method1(int, intersect, IN, const std::vector< osg::Vec3f > &, vertices,
 	          Properties::NON_VIRTUAL,
-	          __int__intersect__C5_std_vectorT1_Vec3__R1,
+	          __int__intersect__C5_std_vectorT1_Vec3f__R1,
 	          "intersection test between plane and vertex list return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane. ",
 	          "");
 	I_Method1(int, intersect, IN, const std::vector< osg::Vec3d > &, vertices,
@@ -211,3 +210,5 @@ END_REFLECTOR
 
 STD_VECTOR_REFLECTOR(std::vector< osg::Vec3d >)
 
+STD_VECTOR_REFLECTOR(std::vector< osg::Vec3f >)
+
diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp
index 740c5ca19..8506272ee 100644
--- a/src/osgWrappers/osg/ProxyNode.cpp
+++ b/src/osgWrappers/osg/ProxyNode.cpp
@@ -34,6 +34,13 @@ BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode)
 	I_EnumLabel(osg::ProxyNode::USER_DEFINED_CENTER);
 END_REFLECTOR
 
+BEGIN_ENUM_REFLECTOR(osg::ProxyNode::LoadingExternalReferenceMode)
+	I_DeclaringFile("osg/ProxyNode");
+	I_EnumLabel(osg::ProxyNode::LOAD_IMMEDIATELY);
+	I_EnumLabel(osg::ProxyNode::DEFER_LOADING_TO_DATABASE_PAGER);
+	I_EnumLabel(osg::ProxyNode::NO_AUTOMATIC_LOADING);
+END_REFLECTOR
+
 BEGIN_OBJECT_REFLECTOR(osg::ProxyNode)
 	I_DeclaringFile("osg/ProxyNode");
 	I_BaseType(osg::Group);
@@ -129,6 +136,16 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode)
 	          __CenterMode__getCenterMode,
 	          "Get how the center of object should be determined when computed which child is active. ",
 	          "");
+	I_Method1(void, setLoadingExternalReferenceMode, IN, osg::ProxyNode::LoadingExternalReferenceMode, mode,
+	          Properties::NON_VIRTUAL,
+	          __void__setLoadingExternalReferenceMode__LoadingExternalReferenceMode,
+	          "Set how the child loading is done. ",
+	          "");
+	I_Method0(osg::ProxyNode::LoadingExternalReferenceMode, getLoadingExternalReferenceMode,
+	          Properties::NON_VIRTUAL,
+	          __LoadingExternalReferenceMode__getLoadingExternalReferenceMode,
+	          "Get the setted mode of loading. ",
+	          "");
 	I_Method1(void, setCenter, IN, const osg::Vec3 &, center,
 	          Properties::NON_VIRTUAL,
 	          __void__setCenter__C5_Vec3_R1,
@@ -176,6 +193,9 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode)
 	                0, 
 	                0, 
 	                0);
+	I_SimpleProperty(osg::ProxyNode::LoadingExternalReferenceMode, LoadingExternalReferenceMode, 
+	                 __LoadingExternalReferenceMode__getLoadingExternalReferenceMode, 
+	                 __void__setLoadingExternalReferenceMode__LoadingExternalReferenceMode);
 	I_SimpleProperty(float, Radius, 
 	                 __float__getRadius, 
 	                 __void__setRadius__float);
diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp
index dd5f3d4f4..32e058841 100644
--- a/src/osgWrappers/osgManipulator/Dragger.cpp
+++ b/src/osgWrappers/osgManipulator/Dragger.cpp
@@ -233,9 +233,9 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo)
 	          __void__setCamera__osg_Camera_P1,
 	          "",
 	          "");
-	I_Method2(void, addIntersection, IN, const osg::NodePath &, nodePath, IN, osg::Vec3, intersectionPoint,
+	I_Method2(void, addIntersection, IN, const osg::NodePath &, nodePath, IN, const osg::Vec3 &, intersectionPoint,
 	          Properties::NON_VIRTUAL,
-	          __void__addIntersection__C5_osg_NodePath_R1__osg_Vec3,
+	          __void__addIntersection__C5_osg_NodePath_R1__C5_osg_Vec3_R1,
 	          "",
 	          "");
 	I_Method2(void, setMousePosition, IN, float, pixel_x, IN, float, pixel_y,