Added new ARB vertex program state attribute and demo program,

sent in my Brede Johansen.

src/osg/Geometry.cpp

@@ -160,22 +160,23 @@ class DrawFogCoord : public osg::ConstValueVisitor
 {
     public:
     
-        DrawFogCoord(const FloatArray* fogcoords,const IndexArray* indices,
-                        FogCoordProc fogCoordProc):
+        DrawFogCoord(const Array* fogcoords,const IndexArray* indices,FogCoordProc fogCoordProc):
             _fogcoords(fogcoords),
             _indices(indices),
             _glFogCoord1fv(fogCoordProc) {}
     
         void operator () (unsigned int pos)
         {
-            if (_indices) _glFogCoord1fv(&(*_fogcoords)[_indices->index(pos)]);
-            else _glFogCoord1fv(&(*_fogcoords)[pos]);
+            if (_indices) _fogcoords->accept(_indices->index(pos),*this);
+            else _fogcoords->accept(pos,*this);
         }
 
-        const FloatArray*   _fogcoords;
+        virtual void apply(const GLfloat& v) { _glFogCoord1fv(&v); }
+
+        const Array*        _fogcoords;
         const IndexArray*   _indices;
 
-        FogCoordProc _glFogCoord1fv;
+        FogCoordProc        _glFogCoord1fv;
 };
 
 

src/osg/Makefile

@@ -87,6 +87,7 @@ CXXFILES =\
 	UnitTestFramework.cpp\
 	Version.cpp\
 	Vec3.cpp\
+	VertexProgram.cpp\
 	Viewport.cpp\
 
 DEF     += -DSG_LIBRARY

src/osg/VertexProgram.cpp

@@ -0,0 +1,100 @@
+#include <osg/Notify>
+#include <osg/GLExtensions>
+#include <osg/VertexProgram>
+
+using namespace osg;
+
+
+VertexProgram::VertexProgram() :
+    _vertexProgramId(0)
+{
+}
+
+
+VertexProgram::VertexProgram(const VertexProgram& vp,const CopyOp& copyop):
+    osg::StateAttribute(vp,copyop),
+    _vertexProgramId(vp._vertexProgramId)
+{}
+
+
+// virtual
+VertexProgram::~VertexProgram()
+{}
+
+
+typedef void (APIENTRY * BindProgramProc) (GLenum target, GLuint id);
+typedef void (APIENTRY * GenProgramsProc) (GLsizei n, GLuint *programs);
+typedef void (APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string); 
+typedef void (APIENTRY * ProgramLocalParameter4fvProc) (GLenum target, GLuint index, const GLfloat *params);
+
+void VertexProgram::apply(State& state) const
+{
+    static bool supported = osg::isGLExtensionSupported("GL_ARB_vertex_program");
+    if (!supported) return;
+
+    static BindProgramProc s_glBindProgram =
+        (BindProgramProc)osg::getGLExtensionFuncPtr("glBindProgramARB");
+    static GenProgramsProc s_glGenPrograms =
+        (GenProgramsProc)osg::getGLExtensionFuncPtr("glGenProgramsARB");
+    static ProgramStringProc s_glProgramString =
+        (ProgramStringProc)osg::getGLExtensionFuncPtr("glProgramStringARB");
+    static ProgramLocalParameter4fvProc s_glProgramLocalParameter4fv =
+        (ProgramLocalParameter4fvProc)osg::getGLExtensionFuncPtr("glProgramLocalParameter4fvARB");
+
+    // Vertex Program
+    if (_vertexProgramId != 0)
+    {
+        s_glBindProgram( GL_VERTEX_PROGRAM_ARB, _vertexProgramId );
+    }
+    else if (!_vertexProgram.empty())
+    {
+        ::glGetError(); // Reset Error flags.
+        s_glGenPrograms( 1, &_vertexProgramId );
+        s_glBindProgram( GL_VERTEX_PROGRAM_ARB, _vertexProgramId );
+        s_glProgramString( GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
+            _vertexProgram.length(), _vertexProgram.c_str());
+
+        // Check for errors
+        int errorposition;
+        ::glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorposition);
+        if (errorposition != -1)
+        {
+            notify(osg::FATAL) << "VertexProgram: " << ::glGetString(GL_PROGRAM_ERROR_STRING_ARB) << std::endl;
+
+            std::string::size_type start = _vertexProgram.rfind('\n', errorposition);
+            std::string::size_type stop  = _vertexProgram.find('\n', errorposition);
+            if (start!=std::string::npos && stop!=std::string::npos)
+            {
+                notify(osg::FATAL) << "             : " << _vertexProgram.substr(start+1, stop-start-2) << std::endl;
+                std::string pointAtproblem(errorposition-(start+1), ' ');
+                notify(osg::FATAL) << "             : " << pointAtproblem << '^' << std::endl;
+            }
+            exit(1);
+        }
+    }
+
+    // Update local program parameters
+    {
+        for(LocalParamList::const_iterator itr=_programLocalParameters.begin();
+            itr!=_programLocalParameters.end();
+            ++itr)
+        {
+            s_glProgramLocalParameter4fv(GL_VERTEX_PROGRAM_ARB, (*itr).first, (*itr).second.ptr());
+        }
+    }
+
+    // Update matrix
+    if (!_matrixList.empty())
+    {
+        for(MatrixList::const_iterator itr = _matrixList.begin();
+            itr!=_matrixList.end();
+            ++itr)
+        {
+            ::glMatrixMode((*itr).first);
+            ::glLoadMatrixf((*itr).second->ptr());
+        }
+        ::glMatrixMode(GL_MODELVIEW); // restore matrix mode
+    }
+}
+
+