FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Romano José Magacho da Silva, support for vertex attributes in vertex program.

Browse Source
This commit is contained in:
Robert Osfield
2003-05-07 13:13:13 +00:00
parent ba8bf1e94c
commit cda2c90315
5 changed files with 963 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

773
src/osg/Geometry.cpp
View File

File diff suppressed because it is too large Load Diff

5
src/osg/State.cpp
View File

@@ -10,7 +10,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details.
*/
#include <osg/GLExtensions>
#include <osg/State>
#include <osg/Notify>
#include <osg/GLU>
@@ -202,7 +201,7 @@ void State::captureCurrentState(StateSet& stateset) const
// template<class T>
// T mymax(const T& a,const T& b)
// {
// return (((a) > (b)) ? (a) : (b));
// return (((a) > (b)) ? (a) : (b));
// }
void State::apply(const StateSet* dstate)
@@ -491,6 +490,7 @@ void State::disableAllVertexArrays()
{
disableVertexPointer();
disableTexCoordPointersAboveAndIncluding(0);
disableVertexAttribPointersAboveAndIncluding(0);
disableColorPointer();
disableFogCoordPointer();
disableIndexPointer();
@@ -502,6 +502,7 @@ void State::dirtyAllVertexArrays()
{
dirtyVertexPointer();
dirtyTexCoordPointersAboveAndIncluding(0);
dirtyVertexAttribPointersAboveAndIncluding(0);
dirtyColorPointer();
dirtyFogCoordPointer();
dirtyIndexPointer();

12
src/osg/VertexProgram.cpp
View File

@@ -119,7 +119,7 @@ void VertexProgram::apply(State& state) const
}
else if (!_vertexProgram.empty())
{
::glGetError(); // Reset Error flags.
glGetError(); // Reset Error flags.
extensions->glGenPrograms( 1, &vertexProgramId );
extensions->glBindProgram( GL_VERTEX_PROGRAM_ARB, vertexProgramId );
extensions->glProgramString( GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
@@ -127,10 +127,10 @@ void VertexProgram::apply(State& state) const
// Check for errors
GLint errorposition;
::glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorposition);
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorposition);
if (errorposition != -1)
{
notify(osg::FATAL) << "VertexProgram: " << ::glGetString(GL_PROGRAM_ERROR_STRING_ARB) << std::endl;
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);
@@ -161,10 +161,10 @@ void VertexProgram::apply(State& state) const
itr!=_matrixList.end();
++itr)
{
::glMatrixMode((*itr).first);
::glLoadMatrixf((*itr).second.ptr());
glMatrixMode((*itr).first);
glLoadMatrixf((*itr).second.ptr());
}
::glMatrixMode(GL_MODELVIEW); // restore matrix mode
glMatrixMode(GL_MODELVIEW); // restore matrix mode
}
}