From 968a8d1118e75f3f38f392edf65d42ee40a08dad Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 23 Feb 2007 12:14:52 +0000
Subject: [PATCH] Updated wrappers

---
 src/osgWrappers/osg/Camera.cpp | 13 ++++++++++++
 src/osgWrappers/osg/View.cpp   | 37 ++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp
index b965ae051..eaeb84dac 100644
--- a/src/osgWrappers/osg/Camera.cpp
+++ b/src/osgWrappers/osg/Camera.cpp
@@ -142,6 +142,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera)
 	          __C5_osg_Stats_P1__getStats,
 	          "Get the const Stats object. ",
 	          "");
+	I_Method1(void, setAllowEventFocus, IN, bool, focus,
+	          Properties::NON_VIRTUAL,
+	          __void__setAllowEventFocus__bool,
+	          "Set whether this camera allows events to be generated by the associated graphics window to be associated with this camera. ",
+	          "");
+	I_Method0(bool, getAllowEventFocus,
+	          Properties::NON_VIRTUAL,
+	          __bool__getAllowEventFocus,
+	          "Get whether this camera allows events to be generated by the associated graphics window to be associated with this camera. ",
+	          "");
 	I_Method1(void, setClearColor, IN, const osg::Vec4 &, color,
 	          Properties::NON_VIRTUAL,
 	          __void__setClearColor__C5_Vec4_R1,
@@ -482,6 +492,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera)
 	          __bool__computeWorldToLocalMatrix__Matrix_R1__NodeVisitor_P1,
 	          "Transform method that must be defined to provide generic interface for scene graph traversals. ",
 	          "");
+	I_SimpleProperty(bool, AllowEventFocus, 
+	                 __bool__getAllowEventFocus, 
+	                 __void__setAllowEventFocus__bool);
 	I_SimpleProperty(osg::Camera::BufferAttachmentMap &, BufferAttachmentMap, 
 	                 __BufferAttachmentMap_R1__getBufferAttachmentMap, 
 	                 0);
diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp
index 5f49a9840..60a7e31c8 100644
--- a/src/osgWrappers/osg/View.cpp
+++ b/src/osgWrappers/osg/View.cpp
@@ -59,16 +59,16 @@ BEGIN_OBJECT_REFLECTOR(osg::View)
 	          __C5_osg_Camera_P1__getCamera,
 	          "Get the const master camera of the view. ",
 	          "");
-	I_Method1(bool, addSlave, IN, osg::Camera *, camera,
-	          Properties::NON_VIRTUAL,
-	          __bool__addSlave__osg_Camera_P1,
-	          "",
-	          "");
-	I_Method3(bool, addSlave, IN, osg::Camera *, camera, IN, const osg::Matrix &, projectionOffset, IN, const osg::Matrix &, viewOffse,
-	          Properties::NON_VIRTUAL,
-	          __bool__addSlave__osg_Camera_P1__C5_osg_Matrix_R1__C5_osg_Matrix_R1,
-	          "",
-	          "");
+	I_MethodWithDefaults2(bool, addSlave, IN, osg::Camera *, camera, , IN, bool, useMastersSceneData, true,
+	                      Properties::NON_VIRTUAL,
+	                      __bool__addSlave__osg_Camera_P1__bool,
+	                      "",
+	                      "");
+	I_MethodWithDefaults4(bool, addSlave, IN, osg::Camera *, camera, , IN, const osg::Matrix &, projectionOffset, , IN, const osg::Matrix &, viewOffse, , IN, bool, useMastersSceneData, true,
+	                      Properties::NON_VIRTUAL,
+	                      __bool__addSlave__osg_Camera_P1__C5_osg_Matrix_R1__C5_osg_Matrix_R1__bool,
+	                      "",
+	                      "");
 	I_Method1(bool, removeSlave, IN, unsigned int, pos,
 	          Properties::NON_VIRTUAL,
 	          __bool__removeSlave__unsigned_int,
@@ -120,13 +120,15 @@ BEGIN_OBJECT_REFLECTOR(osg::View)
 END_REFLECTOR
 
 BEGIN_VALUE_REFLECTOR(osg::View::Slave)
-	I_Constructor0(____Slave,
-	               "",
-	               "");
-	I_Constructor3(IN, osg::Camera *, camera, IN, const osg::Matrixd &, projectionOffset, IN, const osg::Matrixd &, viewOffset,
-	               ____Slave__osg_Camera_P1__C5_osg_Matrixd_R1__C5_osg_Matrixd_R1,
-	               "",
-	               "");
+	I_ConstructorWithDefaults1(IN, bool, useMastersSceneData, true,
+	                           Properties::NON_EXPLICIT,
+	                           ____Slave__bool,
+	                           "",
+	                           "");
+	I_ConstructorWithDefaults4(IN, osg::Camera *, camera, , IN, const osg::Matrixd &, projectionOffset, , IN, const osg::Matrixd &, viewOffset, , IN, bool, useMastersSceneData, true,
+	                           ____Slave__osg_Camera_P1__C5_osg_Matrixd_R1__C5_osg_Matrixd_R1__bool,
+	                           "",
+	                           "");
 	I_Constructor1(IN, const osg::View::Slave &, rhs,
 	               Properties::NON_EXPLICIT,
 	               ____Slave__C5_Slave_R1,
@@ -135,5 +137,6 @@ BEGIN_VALUE_REFLECTOR(osg::View::Slave)
 	I_PublicMemberProperty(osg::ref_ptr< osg::Camera >, _camera);
 	I_PublicMemberProperty(osg::Matrixd, _projectionOffset);
 	I_PublicMemberProperty(osg::Matrixd, _viewOffset);
+	I_PublicMemberProperty(bool, _useMastersSceneData);
 END_REFLECTOR