From 2c4b60cafcb04866c7355ec169c5460ff1b2af5b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sat, 10 Oct 2009 10:54:33 +0000
Subject: [PATCH] Updated wrappers

---
 src/osgWrappers/osg/PrimitiveSet.cpp |  4 ++++
 src/osgWrappers/osg/State.cpp        | 30 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp
index 07b3df6fe..1de2a8606 100644
--- a/src/osgWrappers/osg/PrimitiveSet.cpp
+++ b/src/osgWrappers/osg/PrimitiveSet.cpp
@@ -397,6 +397,10 @@ BEGIN_ENUM_REFLECTOR(osg::PrimitiveSet::Mode)
 	I_EnumLabel(osg::PrimitiveSet::QUADS);
 	I_EnumLabel(osg::PrimitiveSet::QUAD_STRIP);
 	I_EnumLabel(osg::PrimitiveSet::POLYGON);
+	I_EnumLabel(osg::PrimitiveSet::LINES_ADJACENCY);
+	I_EnumLabel(osg::PrimitiveSet::LINE_STRIP_ADJACENCY);
+	I_EnumLabel(osg::PrimitiveSet::TRIANGLES_ADJACENCY);
+	I_EnumLabel(osg::PrimitiveSet::TRIANGLE_STRIP_ADJECENCY);
 END_REFLECTOR
 
 BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet)
diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp
index 71fc8b2f9..2a7a66b80 100644
--- a/src/osgWrappers/osg/State.cpp
+++ b/src/osgWrappers/osg/State.cpp
@@ -21,6 +21,7 @@
 #include <osg/State>
 #include <osg/StateAttribute>
 #include <osg/StateSet>
+#include <osg/Uniform>
 #include <osg/Viewport>
 
 // Must undefine IN and OUT macros defined in Windows headers
@@ -166,6 +167,26 @@ BEGIN_OBJECT_REFLECTOR(osg::State)
 	          __C5_osg_Matrix_R1__getModelViewMatrix,
 	          "",
 	          "");
+	I_Method0(void, applyModelViewAndProjectionUniformsIfRequired,
+	          Properties::NON_VIRTUAL,
+	          __void__applyModelViewAndProjectionUniformsIfRequired,
+	          "",
+	          "");
+	I_Method0(osg::Uniform *, getModelViewMatrixUniform,
+	          Properties::NON_VIRTUAL,
+	          __osg_Uniform_P1__getModelViewMatrixUniform,
+	          "",
+	          "");
+	I_Method0(osg::Uniform *, getProjectionMatrixUniform,
+	          Properties::NON_VIRTUAL,
+	          __osg_Uniform_P1__getProjectionMatrixUniform,
+	          "",
+	          "");
+	I_Method0(osg::Uniform *, getModelViewProjectionMatrixUniform,
+	          Properties::NON_VIRTUAL,
+	          __osg_Uniform_P1__getModelViewProjectionMatrixUniform,
+	          "",
+	          "");
 	I_Method0(osg::Polytope, getViewFrustum,
 	          Properties::NON_VIRTUAL,
 	          __Polytope__getViewFrustum,
@@ -883,12 +904,21 @@ BEGIN_OBJECT_REFLECTOR(osg::State)
 	I_SimpleProperty(const osg::Matrix &, ModelViewMatrix, 
 	                 __C5_osg_Matrix_R1__getModelViewMatrix, 
 	                 0);
+	I_SimpleProperty(osg::Uniform *, ModelViewMatrixUniform, 
+	                 __osg_Uniform_P1__getModelViewMatrixUniform, 
+	                 0);
+	I_SimpleProperty(osg::Uniform *, ModelViewProjectionMatrixUniform, 
+	                 __osg_Uniform_P1__getModelViewProjectionMatrixUniform, 
+	                 0);
 	I_SimpleProperty(const osg::Array *, NormalPointer, 
 	                 0, 
 	                 __void__setNormalPointer__C5_Array_P1);
 	I_SimpleProperty(const osg::Matrix &, ProjectionMatrix, 
 	                 __C5_osg_Matrix_R1__getProjectionMatrix, 
 	                 0);
+	I_SimpleProperty(osg::Uniform *, ProjectionMatrixUniform, 
+	                 __osg_Uniform_P1__getProjectionMatrixUniform, 
+	                 0);
 	I_SimpleProperty(const osg::Array *, SecondaryColorPointer, 
 	                 0, 
 	                 __void__setSecondaryColorPointer__C5_Array_P1);