From 0f529d72ab53adc16a6169da122f42e3c47220a7 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sat, 21 Jan 2006 13:02:03 +0000
Subject: [PATCH] Updated wrappers.

---
 .../osgParticle/wrapper_osgParticle.dsp       |  4 ++
 src/osgWrappers/osg/FrameBufferObject.cpp     |  3 +-
 src/osgWrappers/osg/Program.cpp               |  2 +-
 src/osgWrappers/osg/Shader.cpp                |  2 +
 src/osgWrappers/osgParticle/BoxPlacer.cpp     | 52 +++++++++++++++++++
 src/osgWrappers/osgParticle/GNUmakefile       |  1 +
 6 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 src/osgWrappers/osgParticle/BoxPlacer.cpp

diff --git a/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp b/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp
index b2a8e382d..99f9644bb 100644
--- a/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp
+++ b/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp
@@ -103,6 +103,10 @@ SOURCE=..\..\..\src\osgWrappers\osgParticle\AccelOperator.cpp
 SOURCE=..\..\..\src\osgWrappers\osgParticle\AngularAccelOperator.cpp
 # End Source File
 
+# Begin Source File
+SOURCE=..\..\..\src\osgWrappers\osgParticle\BoxPlacer.cpp
+# End Source File
+
 # Begin Source File
 SOURCE=..\..\..\src\osgWrappers\osgParticle\CenteredPlacer.cpp
 # End Source File
diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp
index 3ba62735b..e8910deaa 100644
--- a/src/osgWrappers/osg/FrameBufferObject.cpp
+++ b/src/osgWrappers/osg/FrameBufferObject.cpp
@@ -55,7 +55,8 @@ TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT);
 
 TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT);
 
-BEGIN_VALUE_REFLECTOR(osg::FBOExtensions)
+BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
+	I_BaseType(osg::Referenced);
 	I_Method0(bool, isSupported);
 END_REFLECTOR
 
diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp
index 10d05248e..d01b9b6d2 100644
--- a/src/osgWrappers/osg/Program.cpp
+++ b/src/osgWrappers/osg/Program.cpp
@@ -68,7 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram)
 	I_Method0(GLuint, getHandle);
 	I_Method0(void, requestLink);
 	I_Method0(void, linkProgram);
-	I_Method0(void, validateProgram);
+	I_Method0(bool, validateProgram);
 	I_Method0(bool, needsLink);
 	I_Method0(bool, isLinked);
 	I_Method1(bool, getInfoLog, IN, std::string &, infoLog);
diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp
index aa17eb59d..bff83ff0c 100644
--- a/src/osgWrappers/osg/Shader.cpp
+++ b/src/osgWrappers/osg/Shader.cpp
@@ -12,6 +12,7 @@
 #include <osg/CopyOp>
 #include <osg/Object>
 #include <osg/Shader>
+#include <osg/State>
 
 // Must undefine IN and OUT macros defined in Windows headers
 #ifdef IN
@@ -44,6 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader)
 	I_Method0(const std::string &, getShaderSource);
 	I_Method0(osg::Shader::Type, getType);
 	I_Method0(const char *, getTypename);
+	I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0);
 	I_Method0(void, dirtyShader);
 	I_Method1(void, compileShader, IN, unsigned int, contextID);
 	I_Method2(void, attachShader, IN, unsigned int, contextID, IN, GLuint, program);
diff --git a/src/osgWrappers/osgParticle/BoxPlacer.cpp b/src/osgWrappers/osgParticle/BoxPlacer.cpp
new file mode 100644
index 000000000..95655019e
--- /dev/null
+++ b/src/osgWrappers/osgParticle/BoxPlacer.cpp
@@ -0,0 +1,52 @@
+// ***************************************************************************
+//
+//   Generated automatically by genwrapper.
+//   Please DO NOT EDIT this file!
+//
+// ***************************************************************************
+
+#include <osgIntrospection/ReflectionMacros>
+#include <osgIntrospection/TypedMethodInfo>
+#include <osgIntrospection/Attributes>
+
+#include <osg/CopyOp>
+#include <osg/Object>
+#include <osg/Vec3>
+#include <osgParticle/BoxPlacer>
+#include <osgParticle/Particle>
+#include <osgParticle/range>
+
+// Must undefine IN and OUT macros defined in Windows headers
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
+BEGIN_OBJECT_REFLECTOR(osgParticle::BoxPlacer)
+	I_BaseType(osgParticle::CenteredPlacer);
+	I_Constructor0();
+	I_ConstructorWithDefaults2(IN, const osgParticle::BoxPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
+	I_Method0(const osgParticle::rangef &, getXRange);
+	I_Method1(void, setXRange, IN, const osgParticle::rangef &, r);
+	I_Method2(void, setXRange, IN, float, r1, IN, float, r2);
+	I_Method0(const osgParticle::rangef &, getYRange);
+	I_Method1(void, setYRange, IN, const osgParticle::rangef &, r);
+	I_Method2(void, setYRange, IN, float, r1, IN, float, r2);
+	I_Method0(const osgParticle::rangef &, getZRange);
+	I_Method1(void, setZRange, IN, const osgParticle::rangef &, r);
+	I_Method2(void, setZRange, IN, float, r1, IN, float, r2);
+	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 *, libraryName);
+	I_Method0(const char *, className);
+	I_Method1(void, place, IN, osgParticle::Particle *, P);
+	I_Method0(osg::Vec3, getControlPosition);
+	I_ReadOnlyProperty(osg::Vec3, ControlPosition);
+	I_Property(const osgParticle::rangef &, XRange);
+	I_Property(const osgParticle::rangef &, YRange);
+	I_Property(const osgParticle::rangef &, ZRange);
+END_REFLECTOR
+
diff --git a/src/osgWrappers/osgParticle/GNUmakefile b/src/osgWrappers/osgParticle/GNUmakefile
index 2fafbee8f..a21d4da05 100644
--- a/src/osgWrappers/osgParticle/GNUmakefile
+++ b/src/osgWrappers/osgParticle/GNUmakefile
@@ -4,6 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	AccelOperator.cpp\
 	AngularAccelOperator.cpp\
+	BoxPlacer.cpp\
 	CenteredPlacer.cpp\
 	ConnectedParticleSystem.cpp\
 	ConstantRateCounter.cpp\