Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/gl/sphere.h')
-rw-r--r--src/gl/sphere.h16
1 files changed, 8 insertions, 8 deletions
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__