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

Made the State::setInterleavedArrays method use a const GLvoid*.

Browse Source
This commit is contained in:
Robert Osfield
2003-03-05 21:02:37 +00:00
parent d1c0d74bb7
commit 5e396d40e1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/State
View File

@@ -248,7 +248,7 @@ class SG_EXPORT State : public Referenced
/** Wrapper around glInterleavedArrays(..).
* also resets the internal array points and modes within osg::State to keep the other
* vertex array operations consistent. */
void setInterleavedArrays( GLenum format, GLsizei stride, void* pointer);
void setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* pointer);
/** wrapper around glEnableClientState(GL_VERTEX_ARRAY);glVertexPointer(..);

2
src/osg/State.cpp
View File

@@ -504,7 +504,7 @@ void State::dirtyAllVertexArrays()
dirtySecondaryColorPointer();
}
void State::setInterleavedArrays( GLenum format, GLsizei stride, void* pointer)
void State::setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* pointer)
{
glInterleavedArrays( format, stride, pointer);

12
src/osgSim/LightPointDrawable.cpp
View File

@@ -108,8 +108,8 @@ void LightPointDrawable::drawImplementation(osg::State& state) const
if (!lpl.empty())
{
glPointSize(pointsize);
glInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
//state.setInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
//glInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
state.setInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
glDrawArrays(GL_POINTS,0,lpl.size());
}
}
@@ -129,8 +129,8 @@ void LightPointDrawable::drawImplementation(osg::State& state) const
if (!lpl.empty())
{
glPointSize(pointsize);
glInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
//state.setInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
//glInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
state.setInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
glDrawArrays(GL_POINTS,0,lpl.size());
}
}
@@ -148,8 +148,8 @@ void LightPointDrawable::drawImplementation(osg::State& state) const
{
//state.applyMode(GL_POINT_SMOOTH,pointsize!=1);
glPointSize(pointsize);
glInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
//state.setInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
//glInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
state.setInterleavedArrays(GL_C4UB_V3F,0,&lpl.front());
glDrawArrays(GL_POINTS,0,lpl.size());
}
}