From d584d29ac49182130d643c9221047e0acb5cfa01 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 30 Jan 2008 17:36:03 +0000 Subject: accomodate the new modules --- src/gl/sphere.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gl/sphere.h') diff --git a/src/gl/sphere.h b/src/gl/sphere.h index 2e237c5..b448a88 100644 --- a/src/gl/sphere.h +++ b/src/gl/sphere.h @@ -4,10 +4,10 @@ the terms of the GNU General Public License version 2 */ -#ifndef __INCLUDED_SPHERE_H__ -#define __INCLUDED_SPHERE_H__ +#ifndef __INCLUDED_GL_SPHERE_H__ +#define __INCLUDED_GL_SPHERE_H__ -#include "osiriongl.h" +#include "gl/gllib.h" namespace gl { @@ -16,7 +16,7 @@ class Sphere { public: /// create a new sphere - Sphere(Vector3f p = Vector3f(), float r = 1.0f); + Sphere(math::Vector3f p = math::Vector3f(), float r = 1.0f); /// copy constructor Sphere(const Sphere &other); @@ -31,15 +31,15 @@ public: float radius; /// position of the sphere - Vector3f position; + math::Vector3f position; /// draw the sphere void draw(); /// Top color - Color topcolor; + math::Color topcolor; /// bottom color - Color bottomcolor; + math::Color bottomcolor; private: float *sintable; @@ -48,4 +48,4 @@ private: } // namespace gl -#endif // __INCLUDED_SPHERE_H__ +#endif // __INCLUDED_GL_SPHERE_H__ -- cgit v1.2.3