From 9b04a9379b52703b9d00dd6e6739e92b672c31f4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 21 Oct 2009 16:42:12 +0000 Subject: [PATCH] Added Translatef, Scalef, Rotatef methods, and fixed Color4f method. --- include/osg/GLBeginEndAdapter | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/osg/GLBeginEndAdapter b/include/osg/GLBeginEndAdapter index 255eb24bd..c6b1bf0bf 100644 --- a/include/osg/GLBeginEndAdapter +++ b/include/osg/GLBeginEndAdapter @@ -50,6 +50,10 @@ class OSG_EXPORT GLBeginEndAdapter void LoadMatrixd(const GLdouble* m); void MultMatrixd(const GLdouble* m); + void Translatef(GLfloat x, GLfloat y, GLfloat z) { Translated(x,y,z); } + void Scalef(GLfloat x, GLfloat y, GLfloat z) { Scaled(x,y,z); } + void Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) { Rotated(angle,x,y,z); } + void Translated(GLdouble x, GLdouble y, GLdouble z); void Scaled(GLdouble x, GLdouble y, GLdouble z); void Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); @@ -59,7 +63,7 @@ class OSG_EXPORT GLBeginEndAdapter void Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { - _normalAssigned = true; + _colorAssigned = true; _color.set(red,green,blue,alpha); }