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

Fixed handling of Vec3dArray in GLBeginEdnAdapter/ArrayDispatchers.

Browse Source
This commit is contained in:
Robert Osfield 2011-10-21 15:39:51 +00:00
parent d7cba048f5
commit 9e903861a2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/GLBeginEndAdapter
View File

@ -65,6 +65,9 @@ class OSG_EXPORT GLBeginEndAdapter
void Vertex3f(GLfloat x, GLfloat y, GLfloat z);
void Vertex3fv(const GLfloat* v) { Vertex3f(v[0], v[1], v[2]); }
void Vertex3dv(GLdouble x, GLdouble y, GLdouble z) { Vertex3f(x,y,z); }
void Vertex3dv(const GLdouble* v) { Vertex3f(v[0], v[1], v[2]); }
void Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
{
_colorAssigned = true;

1
src/osg/ArrayDispatchers.cpp
View File

@ -429,6 +429,7 @@ void ArrayDispatchers::init()
_useGLBeginEndAdapter = false;
_vertexDispatchers->assignGLBeginEnd<GLfloat>(Array::Vec3ArrayType, &GLBeginEndAdapter::Vertex3fv, 3);
_vertexDispatchers->assignGLBeginEnd<GLdouble>(Array::Vec3dArrayType, &GLBeginEndAdapter::Vertex3dv, 3);
_normalDispatchers->assignGLBeginEnd<GLfloat>(Array::Vec3ArrayType, &GLBeginEndAdapter::Normal3fv, 3);
_colorDispatchers->assignGLBeginEnd<GLubyte>(Array::Vec4ubArrayType, &GLBeginEndAdapter::Color4ubv, 4);
_colorDispatchers->assignGLBeginEnd<GLfloat>(Array::Vec4ArrayType, &GLBeginEndAdapter::Color4fv, 4);