Added VertexAttribDivisor class to wrap up glVertexAttribDivisor function

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14526 16af8721-9629-0410-8352-f15c8da7e697

include/osg/StateAttribute

@@ -195,7 +195,9 @@ class OSG_EXPORT StateAttribute : public Object
 
             PATCH_PARAMETER,
 
-            FRAME_BUFFER_OBJECT
+            FRAME_BUFFER_OBJECT,
+
+            VERTEX_ATTRIB_DIVISOR
         };
 
         /** Simple pairing between an attribute type and the member within that attribute type group.*/

include/osg/VertexAttribDivisor

@@ -0,0 +1,86 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSG_VERTEXATTRIBDIVISOR
+#define OSG_VERTEXATTRIBDIVISOR 1
+
+#include <osg/StateAttribute>
+#include <osg/Vec3>
+#include <osg/Vec4>
+
+namespace osg {
+
+/** VertexAttribDivisor state class which encapsulates OpenGL glVertexAttribDivisor() functionality. */
+class OSG_EXPORT VertexAttribDivisor : public StateAttribute
+{
+    public :
+
+        VertexAttribDivisor();
+
+        VertexAttribDivisor(unsigned int index, unsigned int divisor);
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        VertexAttribDivisor(const VertexAttribDivisor& vad,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
+            StateAttribute(vad,copyop),
+            _index(vad._index),
+            _divisor(vad._divisor) {}
+
+        virtual osg::Object* cloneType() const { return new VertexAttribDivisor(_index, 0); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new VertexAttribDivisor(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const VertexAttribDivisor *>(obj)!=NULL; }
+        virtual const char* libraryName() const { return "osg"; }
+        virtual const char* className() const { return "VertexAttribDivisor"; }
+        virtual Type getType() const { return VERTEX_ATTRIB_DIVISOR; }
+
+        /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
+        virtual int compare(const StateAttribute& sa) const
+        {
+            // check the types are equal and then create the rhs variable
+            // used by the COMPARE_StateAttribute_Parameter macros below.
+            COMPARE_StateAttribute_Types(VertexAttribDivisor,sa)
+
+            // compare each parameter in turn against the rhs.
+            COMPARE_StateAttribute_Parameter(_divisor)
+
+            return 0; // passed all the above comparison macros, must be equal.
+        }
+
+        virtual unsigned int getMember() const { return _index; }
+
+
+        /** Set the vertex attrib index - the vertex attribute slot that the divisor should apply to. */
+        inline void setIndex( unsigned int index )                       { _index = index; }
+
+        /** Get the vertex attrib index. */
+        inline unsigned int getIndex() const                               { return _index; }
+
+        /** Set the vertex attrib divisor. */
+        inline void setDivisor( unsigned int divisor )                       { _divisor = divisor; }
+
+        /** Get the vertex attrib divisor. */
+        inline unsigned int getDivisor() const                               { return _divisor; }
+
+        /** Apply to the OpenGL state machine. */
+        virtual void apply(State& state) const;
+
+    protected :
+
+        virtual ~VertexAttribDivisor();
+
+        unsigned int _index;
+        unsigned int _divisor;
+};
+
+}
+
+#endif

src/osg/CMakeLists.txt

@@ -206,6 +206,7 @@ SET(TARGET_H
     ${HEADER_PATH}/Vec4ui
     ${HEADER_PATH}/Vec4us
     ${HEADER_PATH}/Version
+    ${HEADER_PATH}/VertexAttribDivisor
     ${HEADER_PATH}/VertexProgram
     ${HEADER_PATH}/View
     ${HEADER_PATH}/Viewport
@@ -362,6 +363,7 @@ SET(TARGET_SRC
     Uniform.cpp
     UserDataContainer.cpp
     Version.cpp
+    VertexAttribDivisor.cpp
     VertexProgram.cpp
     View.cpp
     Viewport.cpp

src/osg/VertexAttribDivisor.cpp

@@ -0,0 +1,42 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+#include <osg/VertexAttribDivisor>
+#include <osg/GL2Extensions>
+#include <osg/State>
+
+using namespace osg;
+
+VertexAttribDivisor::VertexAttribDivisor():
+    _index(0),
+    _divisor(0)
+{
+}
+
+VertexAttribDivisor::VertexAttribDivisor(unsigned int index, unsigned int divisor):
+    _index(index),
+    _divisor(divisor)
+{
+}
+
+VertexAttribDivisor::~VertexAttribDivisor()
+{
+}
+
+void VertexAttribDivisor::apply(State& state) const
+{
+    const GL2Extensions* extensions = GL2Extensions::Get(state.getContextID(), true);
+    if (extensions)
+    {
+        extensions->glVertexAttribDivisor( _index, _divisor );
+    }
+}

src/osgWrappers/serializers/osg/VertexAttribDivisor.cpp

@@ -0,0 +1,13 @@
+#include <osg/VertexAttribDivisor>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( VertexAttribDivisor,
+                         new osg::VertexAttribDivisor,
+                         osg::VertexAttribDivisor,
+                         "osg::Object osg::StateAttribute osg::VertexAttribDivisor" )
+{
+    ADD_UINT_SERIALIZER( Index, 0 );
+    ADD_UINT_SERIALIZER( Divisor, 0 );
+}