diff --git a/include/osg/GLU b/include/osg/GLU index 5c731fb9d..9fc6b130a 100644 --- a/include/osg/GLU +++ b/include/osg/GLU @@ -3,7 +3,7 @@ //as published by the Free Software Foundation. #ifndef OSG_GLU -#define OSG_GL 1 +#define OSG_GLU 1 #ifdef __APPLE_CC__ #include @@ -11,4 +11,4 @@ #include #endif -#endif // __osgGL_h +#endif // __osgGLU_h diff --git a/include/osg/Matrix b/include/osg/Matrix index e4d850813..facd122da 100644 --- a/include/osg/Matrix +++ b/include/osg/Matrix @@ -86,6 +86,7 @@ class SG_EXPORT Matrix : public Object bool invertAffine( const Matrix& ); //basic utility functions to create new matrices or vectors + inline static Matrix identity( void ); inline static Matrix scale( const Vec3& ); inline static Matrix scale( float, float, float ); inline static Matrix trans( const Vec3& ); @@ -180,6 +181,13 @@ class SG_EXPORT Matrix : public Object }; //static utility methods +inline Matrix Matrix::identity(void) +{ + Matrix m; + m.makeIdent(); + return m; +} + inline Matrix Matrix::scale(float sx, float sy, float sz) { Matrix m;