Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/gl
diff options
context:
space:
mode:
Diffstat (limited to 'src/gl')
-rw-r--r--src/gl/box.cc7
-rw-r--r--src/gl/box.h9
-rw-r--r--src/gl/osiriongl.cc13
-rw-r--r--src/gl/osiriongl.h15
-rw-r--r--src/gl/sphere.cc10
-rw-r--r--src/gl/sphere.h9
6 files changed, 36 insertions, 27 deletions
diff --git a/src/gl/box.cc b/src/gl/box.cc
index 67a8ed0..fea5d28 100644
--- a/src/gl/box.cc
+++ b/src/gl/box.cc
@@ -1,10 +1,11 @@
-/* box.cc
- This file is part of the Osirion project
+/*
+ gl/box.cc
+ This file is part of the Osirion project and is distributed under
+ the terms of the GNU General Public License version 2
*/
// project headers
#include "box.h"
-#include "osiriongl.h"
namespace gl {
diff --git a/src/gl/box.h b/src/gl/box.h
index f612243..8fb4c45 100644
--- a/src/gl/box.h
+++ b/src/gl/box.h
@@ -1,12 +1,13 @@
-/* box.h
- This file is part of the Osirion project
+/*
+ gl/box.h
+ This file is part of the Osirion project and is distributed under
+ the terms of the GNU General Public License version 2
*/
#ifndef __INCLUDED_BOX_H__
#define __INCLUDED_BOX_H__
-#include "common/vector3f.h"
-#include "common/color.h"
+#include "osiriongl.h"
namespace gl {
diff --git a/src/gl/osiriongl.cc b/src/gl/osiriongl.cc
index 95e12d1..08462e7 100644
--- a/src/gl/osiriongl.cc
+++ b/src/gl/osiriongl.cc
@@ -1,12 +1,13 @@
-/* gl.cc
- * This file is part of the Osirion project
- */
-
-// SDL headers
-#include <SDL/SDL.h>
+/*
+ gl/osiriongl.cc
+ This file is part of the Osirion project and is distributed under
+ the terms of the GNU General Public License version 2
+*/
#include "osiriongl.h"
+#include <SDL/SDL.h>
+
namespace gl
{
diff --git a/src/gl/osiriongl.h b/src/gl/osiriongl.h
index 26ff131..5a1f9f9 100644
--- a/src/gl/osiriongl.h
+++ b/src/gl/osiriongl.h
@@ -1,23 +1,28 @@
-/* gl.h
- This file is part of the Osirion project
+/*
+ gl/osiriongl.h
+ This file is part of the Osirion project and is distributed under
+ the terms of the GNU General Public License version 2
*/
#ifndef __INCLUDED_OSIRIONGL_H__
#define __INCLUDED_OSIRIONGL_H__
-// OpenGL headers
-#include <GL/gl.h>
-
// project headers
#include "common/vector3f.h"
#include "common/color.h"
+// OpenGL headers
+#include <GL/gl.h>
+
/// wrapper namespace for OpenGL operations
/*! The GL namespace provides a wrapper to the OpenGL library functions.
* All methods take floats or Vector3f and Color as parameters.
*/
namespace gl
{
+ using common::Vector3f;
+ using common::Color;
+
/// initialize the OpenGL subsystem
void init();
diff --git a/src/gl/sphere.cc b/src/gl/sphere.cc
index 5e4e931..bd724f5 100644
--- a/src/gl/sphere.cc
+++ b/src/gl/sphere.cc
@@ -1,11 +1,11 @@
-/* sphere.cc
- This file is part of the Osirion project
+/*
+ gl/sphere.cc
+ This file is part of the Osirion project and is distributed under
+ the terms of the GNU General Public License version 2
*/
-#include "common/functions.h"
-
-#include "osiriongl.h"
#include "sphere.h"
+#include "common/functions.h"
namespace gl {
diff --git a/src/gl/sphere.h b/src/gl/sphere.h
index f2bbf0a..2e237c5 100644
--- a/src/gl/sphere.h
+++ b/src/gl/sphere.h
@@ -1,12 +1,13 @@
-/* sphere.h
- This file is part of the Osirion project
+/*
+ gl/sphere.h
+ This file is part of the Osirion project and is distributed under
+ the terms of the GNU General Public License version 2
*/
#ifndef __INCLUDED_SPHERE_H__
#define __INCLUDED_SPHERE_H__
-#include "common/vector3f.h"
-#include "common/color.h"
+#include "osiriongl.h"
namespace gl {