moved camera into render::

17 files changed, 271 insertions, 253 deletions

diff --git a/osirion.kdevelop b/osirion.kdevelop
index 58a8bfc..0a41004 100644
--- a/osirion.kdevelop
+++ b/osirion.kdevelop
@@ -21,7 +21,7 @@
   </general>
   <kdevautoproject>
     <general>
-      <activetarget>src/client/libclient.la</activetarget>
+      <activetarget>src/render/librender.la</activetarget>
       <useconfiguration>debug</useconfiguration>
     </general>
     <run>
diff --git a/osirion.kdevelop.pcs b/osirion.kdevelop.pcs
index 9eb6ce5..8d69e31 100644
--- a/osirion.kdevelop.pcs
+++ b/osirion.kdevelop.pcs
diff --git a/osirion.kdevses b/osirion.kdevses
index f187ee6..da36663 100644
--- a/osirion.kdevses
+++ b/osirion.kdevses
@@ -1,19 +1,28 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="4" >
-  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/netclient.cc" >
-   <View0 Encoding="" line="153" Type="Source" />
+ <DocsAndViews NumberOfDocuments="7" >
+  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/render/camera.h" >
+   <View0 Encoding="" line="68" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/netconnection.cc" >
-   <View0 Encoding="" line="175" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/render/camera.cc" >
+   <View0 Encoding="" line="297" Type="Source" />
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/filesystem/inifile.cc" >
-   <View0 Encoding="" line="76" Type="Source" />
+  <Doc2 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/render/draw.cc" >
+   <View0 Encoding="" line="667" Type="Source" />
   </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/audio/audio.cc" >
-   <View0 Encoding="" line="23" Type="Source" />
+  <Doc3 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/client/video.h" >
+   <View0 Encoding="" line="34" Type="Source" />
   </Doc3>
+  <Doc4 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/client/video.cc" >
+   <View0 Encoding="" line="107" Type="Source" />
+  </Doc4>
+  <Doc5 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/client/client.cc" >
+   <View0 Encoding="" line="16" Type="Source" />
+  </Doc5>
+  <Doc6 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/client/input.cc" >
+   <View0 Encoding="" line="326" Type="Source" />
+  </Doc6>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 7e0c9e9..8c35895 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,12 +1,12 @@
 METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/src
 
-libclient_la_SOURCES = camera.cc chat.cc client.cc console.cc hud.cc input.cc \
-	keyboard.cc radar.cc video.cc view.cc
+libclient_la_SOURCES = chat.cc client.cc console.cc hud.cc input.cc keyboard.cc \
+	radar.cc video.cc view.cc
 libclient_la_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS)
 libclient_la_LDFLAGS = -avoid-version -no-undefined $(GL_LIBS) $(LIBSDL_LIBS)
 noinst_LTLIBRARIES = libclient.la
-noinst_HEADERS = camera.h chat.h client.h console.h input.h keyboard.h radar.h \
-	video.h view.h
+noinst_HEADERS = chat.h client.h console.h input.h keyboard.h radar.h video.h \
+	view.h
 libclient_la_LIBADD = $(top_builddir)/src/render/librender.la \
 	$(top_builddir)/src/core/libcore.la
diff --git a/src/client/camera.h b/src/client/camera.h
deleted file mode 100644
index 649bdc9..0000000
--- a/src/client/camera.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 
-   client/camera.h
-   This file is part of the Osirion project and is distributed under 
-   the terms and conditions of the GNU General Public License version 2 
-*/
-
-#ifndef __INCLUDED_CLIENT_CAMERA_H__
-#define __INCLUDED_CLIENT_CAMERA_H__
-
-#include "math/mathlib.h"
-
-namespace client {
-
-/// camera functions
-namespace camera
-{
-	/// enum indicating the camera mode
-	enum Mode {Free, Track, Cockpit, Overview};
-
-	/// initialize the camera
-	void init();
-
-	/// shutdown the camera
-	void shutdown();
-
-	/// draw the OpenGL camera transformation
-	void draw(float elapsed);
-	
-	/// set target direction
-	void set_direction(float direction);
-
-	/// set target pitch
-	void set_pitch(float pitch);
-
-	/// switch to next camera mode
-	void next_mode();
-
-	/// reset the current mode
-	void reset();
-
-	/// gameworld coordinates of the camera target
-	extern math::Vector3f target;
-
-	/// gameworld coordinates of the camera eye
-	extern math::Vector3f eye;
-
-	/// global camera axis coordinate system
-	extern math::Axis axis;
-
-	/// current camera mode
-	extern Mode mode;
-
-} // namespace camera
-
-} // namespace client
-	
-#endif // __INCLUDED_CLIENT_CAMERA_H__
diff --git a/src/client/client.cc b/src/client/client.cc
index 80b983e..a3ad481 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -14,7 +14,6 @@
 #include "client/chat.h"
 #include "client/client.h"
 #include "client/video.h"
-#include "client/camera.h"
 #include "client/console.h"
 #include "client/input.h"
 #include "client/view.h"
diff --git a/src/client/input.cc b/src/client/input.cc
index d594dbf..f75cbb9 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -9,9 +9,9 @@
 #include "client/input.h"
 #include "client/chat.h"
 #include "client/console.h"
-#include "client/camera.h"
 #include "client/keyboard.h"
 #include "client/video.h"
+#include "render/camera.h"
 #include "math/functions.h"
 #include "render/text.h"
 
@@ -68,20 +68,20 @@ void keyreleased(const SDL_keysym &keysym)
 {
 	switch (keysym.sym) {
 		case SDLK_LEFT:
-			camera::set_direction(0.0f);
+			render::Camera::set_direction(0.0f);
 			break;
 		case SDLK_RIGHT:
-			camera::set_direction(0.0f);
+			render::Camera::set_direction(0.0f);
 			break;
 		case SDLK_UP:
-			camera::set_pitch(0.0f);
+			render::Camera::set_pitch(0.0f);
 			break;
 		case SDLK_DOWN:
-			camera::set_pitch(0.0f);
+			render::Camera::set_pitch(0.0f);
 			break;
 
 		case SDLK_SPACE:
-			camera::next_mode();
+			render::Camera::next_mode();
 			local_roll = 0;
 			local_pitch = 0;
 			local_direction = 0;
@@ -123,16 +123,16 @@ void keypressed(const SDL_keysym &keysym)
 {
 	switch (keysym.sym) {
 		case SDLK_LEFT:
-			camera::set_direction(1.0f);
+			render::Camera::set_direction(1.0f);
 			break;
 		case SDLK_RIGHT:
-			camera::set_direction(-1.0f);
+			render::Camera::set_direction(-1.0f);
 			break;
 		case SDLK_UP:
-			camera::set_pitch(1.0f);
+			render::Camera::set_pitch(1.0f);
 			break;
 		case SDLK_DOWN:
-			camera::set_pitch(-1.0f);
+			render::Camera::set_pitch(-1.0f);
 			break;
 
 		case SDLK_KP_PLUS:
@@ -208,7 +208,7 @@ void frame(float seconds)
 		mouse_direction = 0.0f;
 		mouse_x = video::width / 2;
 		mouse_y = video::height / 2;
-		camera::reset();
+		render::Camera::reset();
 	}
 
 	SDL_Event event;
@@ -303,13 +303,13 @@ void frame(float seconds)
 				mouse_deadzone = false;
 			}
 
-			if ((camera::mode == camera::Track) || (camera::mode == camera::Cockpit)) {
+			if ((render::Camera::mode() == render::Camera::Track) || (render::Camera::mode() == render::Camera::Cockpit)) {
 				local_direction = mouse_direction * math::absf(mouse_direction);
 				local_pitch = mouse_pitch * math::absf(mouse_pitch);
-			} else if (camera::mode == camera::Free) {
+			} else if (render::Camera::mode() == render::Camera::Free) {
 				// squared values to smoothen camera movement
-				camera::set_direction( -mouse_direction * math::absf(mouse_direction));
-				camera::set_pitch(-mouse_pitch * math::absf(mouse_pitch));
+				render::Camera::set_direction( -mouse_direction * math::absf(mouse_direction));
+				render::Camera::set_pitch(-mouse_pitch * math::absf(mouse_pitch));
 			}
 
 		} else {
@@ -324,7 +324,7 @@ void frame(float seconds)
 
 		core::localcontrol()->set_thrust(local_thrust);
 		core::localcontrol()->set_direction(local_direction);
-		core::localcontrol()->set_pitch(local_pitch / video::aspect );
+		core::localcontrol()->set_pitch(local_pitch / render::Camera::aspect() );
 		core::localcontrol()->set_roll(local_roll);
 	}
 }
diff --git a/src/client/video.cc b/src/client/video.cc
index 2253c52..0dfe8ef 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -9,6 +9,7 @@
 
 #include "client/video.h"
 #include "client/view.h"
+#include "render/camera.h"
 #include "render/render.h"
 #include "render/tga.h"
 #include "core/core.h"
@@ -32,8 +33,6 @@ int height_prev = 0;
 const int width_default = 1024;
 const int height_default = 768;
 
-float aspect = 1;
-
 //--- cvars -------------------------------------------------------
 
 core::Cvar *r_width;
@@ -43,7 +42,7 @@ core::Cvar *r_fullscreen;
 void reset()
 {
 	// recalculate the video aspect
-	aspect = (float) width / (float) height;
+	render::Camera::set_aspect((float) width / (float) height);
 
 	// settup our viewport.
 	gl::viewport(0, 0, width, height );
@@ -106,7 +105,7 @@ bool init()
 	}
 	con_print << "  video mode " << width << "x" << height << "x" << bpp << "bpp" << std::endl;
 	
-	aspect = (float) width / (float) height;
+	render::Camera::set_aspect((float) width / (float) height);
 	(*r_width) = width;
 	(*r_height) = height;
 
diff --git a/src/client/video.h b/src/client/video.h
index d453536..20cd875 100644
--- a/src/client/video.h
+++ b/src/client/video.h
@@ -33,9 +33,6 @@ namespace video
 	/// height of the window in pixels
 	extern int height;
 
-	/// width/height ratio
-	extern float aspect;
-
 } // namespace video
 
 } // namespace client
diff --git a/src/client/view.cc b/src/client/view.cc
index 24eb8e3..6d3f456 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -12,7 +12,6 @@
 #include <iomanip>
 
 #include "client/client.h"
-#include "client/camera.h"
 #include "client/chat.h"
 #include "client/console.h"
 #include "client/input.h"
@@ -21,6 +20,7 @@
 #include "render/draw.h"
 #include "render/render.h"
 #include "render/textures.h"
+#include "render/camera.h"
 #include "core/core.h"
 #include "core/stats.h"
 #include "math/mathlib.h"
@@ -41,8 +41,6 @@ float fps = 0;
 
 void init()
 {
-	camera::init();
-
 	draw_stats = core::Cvar::get("draw_stats", "0", core::Cvar::Archive);
 	draw_stats->set_info("[bool] draw network and render statistics");
 
@@ -58,7 +56,6 @@ void init()
 
 void shutdown()
 {
-	camera::shutdown();
 }
 
 void reset()
@@ -244,22 +241,7 @@ void frame(float seconds)
 	gl::clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	if (core::application()->connected() && core::game()->serverframetime()) {
-
-		// Change to the projection matrix and set our viewing volume.
-		gl::matrixmode(GL_PROJECTION);
-		gl::loadidentity();
-
-		// FIXME width must always be one
-		const float frustumsize = .5f;
-		gl::frustum(-frustumsize*video::aspect, frustumsize*video::aspect, -frustumsize, frustumsize, 1.0f, 1024.0f);
-
-		gl::matrixmode(GL_MODELVIEW);
-		gl::loadidentity();
-		
-		camera::draw(seconds);		// draw the current camera transformation
-
-		render::draw(camera::axis, camera::eye, camera::target, seconds);		// draw the world
-
+		render::draw(seconds);		// draw the world
 	}
 
 	// switch to ortographic projection to draw the GUI
diff --git a/src/render/Makefile.am b/src/render/Makefile.am
index 5747681..389c141 100644
--- a/src/render/Makefile.am
+++ b/src/render/Makefile.am
@@ -3,6 +3,6 @@ METASOURCES = AUTO
 noinst_LTLIBRARIES = librender.la
 librender_la_LDFLAGS = -avoid-version -no-undefined @GL_LIBS@
 librender_la_LIBADD = $(top_builddir)/src/math/libmath.la
-librender_la_SOURCES = draw.cc gl.cc image.cc render.cc text.cc textures.cc \
-	tga.cc
-noinst_HEADERS = draw.h gl.h image.h render.h text.h textures.h tga.h
+librender_la_SOURCES = camera.cc draw.cc gl.cc image.cc render.cc text.cc \
+	textures.cc tga.cc
+noinst_HEADERS = camera.h draw.h gl.h image.h render.h text.h textures.h tga.h
diff --git a/src/client/camera.cc b/src/render/camera.cc
index cbed115..8da6bc9 100644
--- a/src/client/camera.cc
+++ b/src/render/camera.cc
@@ -1,64 +1,51 @@
 /* 
-   client/camera.cc
+   render/camera.cc
    This file is part of the Osirion project and is distributed under 
    the terms and conditions of the GNU General Public License version 2 
 */
 
+#include "core/core.h"
 #include "math/mathlib.h"
 #include "math/matrix4f.h"
-#include "core/core.h"
-#include "client/client.h"
-#include "client/camera.h"
-#include "render/render.h"
+#include "render/camera.h"
+#include "render/gl.h"
 #include "sys/sys.h"
 
 using math::degrees360f;
 using math::degrees180f;
 
-using namespace render;
-
-namespace client
+namespace render
 {
 
-namespace camera 
-{
+const float 		MIN_DELTA = 10e-10;
 
-// gameworld coordinates of the camera target
-math::Vector3f target;
-math::Vector3f eye;
-math::Axis axis;
+const float 		pitch_track = -15.0f;
+const float 		pitch_overview = -75.0f;
 
-const float MIN_DELTA = 10e-10;
-
-// current camera mode
-Mode mode;
-
-// private variables
+float 			Camera::camera_aspect = 1.0f;
+math::Vector3f 		Camera::camera_eye;
+math::Vector3f 		Camera::camera_target;
+math::Axis 		Camera::camera_axis;
+Camera::Mode 		Camera::camera_mode;
 
 // current and target yaw angle in XZ plane, positive is looking left
-float yaw_current;
-float yaw_target;
-// movement direction in free mode 
-float target_direction;
+float Camera::direction_current;
+float Camera::direction_target;
+float Camera::target_direction;
 
 // current and target pitch angle in XY, positive is looking up
-float pitch_current;
-float pitch_target;
-// movement direction in free mode 
-float target_pitch;
-
-float distance;
+float Camera::pitch_current;
+float Camera::pitch_target;
+float Camera::target_pitch;
 
-// default pitch in mode::Track
-const float pitch_track = -15.0f;
-const float pitch_overview = -75.0f;
+float Camera::distance;
 
-void set_mode(Mode newmode);
-
-void init()
+void Camera::init()
 {
-	yaw_current = 0;
-	yaw_target = 0; 
+	camera_aspect = 1.0f;
+
+	direction_current = 0;
+	direction_target = 0; 
 
 	pitch_current = pitch_track * 2; 
 	pitch_target = pitch_track; 
@@ -69,17 +56,26 @@ void init()
 	distance = 0.4f;
 
 	set_mode(Track);
+
+	camera_axis.clear();
+	camera_eye.clear();
+	camera_target.clear();
 	
 }
 
-void shutdown() 
+void Camera::shutdown()
 {
 }
 
-void set_mode(Mode newmode) {
+void Camera::set_aspect(float aspect)
+{
+	camera_aspect = aspect;
+}
+
+void Camera::set_mode(Mode newmode) {
 
-	yaw_target = 0;
-	yaw_current = yaw_target;
+	direction_target = 0;
+	direction_current = direction_target;
 	pitch_target = pitch_track;
 	pitch_current = pitch_target;
 
@@ -87,34 +83,34 @@ void set_mode(Mode newmode) {
 	target_pitch = 0.0f;
 	distance = 0.4f;
 
-	axis.clear();
+	camera_axis.clear();
 
 	switch(newmode) {
 	case Track:
 		// switch camera to Track mode
-		mode = Track;
+		camera_mode = Track;
 		if (core::localcontrol()) {
 			if (core::localcontrol()->state())
-				axis.assign(core::localcontrol()->state()->axis());
+				camera_axis.assign(core::localcontrol()->state()->axis());
 			else
-				axis.assign(core::localcontrol()->axis());
+				camera_axis.assign(core::localcontrol()->axis());
 		}
 		break;
 
 	case Free:
 		// switch camera to Free mode
-		mode = Free;
+		camera_mode = Free;
 		pitch_target = 2.0 * pitch_track;
 		pitch_current = pitch_target;
 		break;
 
 	case Cockpit:
-		mode = Cockpit;
+		camera_mode = Cockpit;
 		break;
 
 	case Overview:
 		// switch camera to Overview mode
-		mode = Overview;
+		camera_mode = Overview;
 
 	default:
 		break;
@@ -122,7 +118,7 @@ void set_mode(Mode newmode) {
 
 }
 
-void next_mode()
+void Camera::next_mode()
 {
 	
  	if (!core::localcontrol()) {
@@ -130,7 +126,7 @@ void next_mode()
 		return;
 	}
 
-	switch(mode) {
+	switch(camera_mode) {
 	case Free:
 		// switch camera to Track mode
 		set_mode(Track);
@@ -154,7 +150,7 @@ void next_mode()
 	}
 }
 
-void draw(float seconds) 
+void Camera::draw(float seconds) 
 {	
 	math::Matrix4f matrix;
 	math::Axis target_axis;
@@ -162,30 +158,37 @@ void draw(float seconds)
 
 	if (!core::localcontrol()) {
 
-		if (mode != Overview) {
+		if (camera_mode != Overview) {
 			set_mode(Overview);
 		}
 		
-		target.clear();
-		axis.clear();
+		camera_eye.clear();
+		camera_target.clear();
+		camera_axis.clear();
 		pitch_current = pitch_overview;
-		axis.change_pitch(pitch_current);
+		camera_axis.change_pitch(pitch_current);
 
 		distance = 20.0f;
 
 	} else {
-		if (mode == Overview)
+		if (mode() == Overview)
 			set_mode(Track);
 
 		if (core::localcontrol()->state()) {
-			target.assign(core::localcontrol()->state()->location());
+			camera_target.assign(core::localcontrol()->state()->location());
 			target_axis.assign(core::localcontrol()->state()->axis());
 		} else {
-			target.assign(core::localcontrol()->location());
+			camera_target.assign(core::localcontrol()->location());
 			target_axis.assign(core::localcontrol()->axis());
 		}
 		
-		if (mode == Track) {
+		if (core::localcontrol()->model()) {
+			distance = core::localcontrol()->model()->radius();
+		} else {
+			distance = 1.0f;
+		}
+
+		if (mode() == Track) {
 			float cosangle;
 			float angle;
 			float side;
@@ -198,149 +201,149 @@ void draw(float seconds)
 			// camera axis: pitch
 
 			// project target_axis.up() into the plane with axis->left() normal
-			n = axis.left();
+			n = camera_axis.left();
 			p = target_axis.up();
 			u = p[0]*n[0] + p[1]*n[1] + p[2]*n[2] / (-n[0]*n[0] - n[1]*n[1] - n[2] * n[2]);
 			p = target_axis.up() + u * n;
 	
-			side = axis.forward().x * p.x + 
-				axis.forward().y * p.y +
-				axis.forward().z * p.z;
+			side = camera_axis.forward().x * p.x + 
+				camera_axis.forward().y * p.y +
+				camera_axis.forward().z * p.z;
 
 			if ((fabs(side) - MIN_DELTA > 0)) {
 				
-				cosangle = math::dotproduct(p, axis.up());
+				cosangle = math::dotproduct(p, camera_axis.up());
 				if (fabs(cosangle) + MIN_DELTA < 1 ) {
 					angle = acos(cosangle) * 180.0f / M_PI;
 					angle = math::sgnf(side) * angle * cam_speed;
-					axis.change_pitch(-angle);
+					camera_axis.change_pitch(-angle);
 				}
 			}
 
 			// camera axis: direction
 
 			// project target_axis.forward() into the plane with axis.up() normal
-			n = axis.up();
+			n = camera_axis.up();
 			p = target_axis.forward();
 			u = p[0]*n[0] + p[1]*n[1] + p[2]*n[2] / (-n[0]*n[0] - n[1]*n[1] - n[2] * n[2]);
 			p = target_axis.forward() + u * n;
 
-			side = axis.left().x * p.x + 
-				axis.left().y * p.y +
-				axis.left().z * p.z;
+			side = camera_axis.left().x * p.x + 
+				camera_axis.left().y * p.y +
+				camera_axis.left().z * p.z;
 
 			if ((fabs(side) - MIN_DELTA > 0)) {
 				
-				cosangle = math::dotproduct(p, axis.forward());
+				cosangle = math::dotproduct(p, camera_axis.forward());
 				if (fabs(cosangle) + MIN_DELTA < 1 ) {
 					angle = acos(cosangle) * 180.0f / M_PI;
 					angle = math::sgnf(side) * angle * cam_speed;
-					axis.change_direction(angle);
+					camera_axis.change_direction(angle);
 				}
 			}
 
 			// camera axis: roll
 
 			// project target_axis.up() into the plane with axis.forward() normal
-			n = axis.forward();
+			n = camera_axis.forward();
 			p = target_axis.up();
 			u = p[0]*n[0] + p[1]*n[1] + p[2]*n[2] / (-n[0]*n[0] - n[1]*n[1] - n[2] * n[2]);
 			p = target_axis.up() + u * n;
 
-			side = axis.left().x * p.x + 
-				axis.left().y * p.y +
-				axis.left().z * p.z;
+			side = camera_axis.left().x * p.x + 
+				camera_axis.left().y * p.y +
+				camera_axis.left().z * p.z;
 
 			if ((fabs(side) - MIN_DELTA > 0)) {
 				
-				cosangle = math::dotproduct(p, axis.up());
+				cosangle = math::dotproduct(p, camera_axis.up());
 				if (fabs(cosangle) + MIN_DELTA < 1 ) {
 					angle = acos(cosangle) * 180.0f / M_PI;
 					angle = math::sgnf(side) * angle * cam_speed;
-					axis.change_roll(angle);
+					camera_axis.change_roll(angle);
 				}
 			}
 
-			distance = 0.0f;
-
 			if (core::localcontrol()->model()) {
- 				target -= (core::localcontrol()->model()->maxbbox().x + 0.1f) * axis.forward();
-				target += (core::localcontrol()->model()->maxbbox().z + 0.1f ) * axis.up();
+ 				camera_target -= (core::localcontrol()->model()->maxbbox().x + 0.1f) * camera_axis.forward();
+				camera_target += (core::localcontrol()->model()->maxbbox().z + 0.1f ) * camera_axis.up();
 			}
 
-		} else if (mode == Free) {
-			axis.assign(target_axis);
+		} else if (mode() == Free) {
+			camera_axis.assign(target_axis);
 
-			yaw_target =  yaw_current - 90 * target_direction;
+			direction_target =  direction_current - 90 * target_direction;
 			pitch_target = pitch_current - 90 * target_pitch;
 
-			if (core::localcontrol()->model()) {
-				distance = core::localcontrol()->model()->radius();
-			} else {
-				distance = 1.0f;
-			}
-
 			// adjust direction
-			d = degrees180f(yaw_current - yaw_target);
-			yaw_current = degrees360f( yaw_current -  d * seconds);
-			axis.change_direction(yaw_current);
+			d = degrees180f(direction_current - direction_target);
+			direction_current = degrees360f( direction_current -  d * seconds);
+			camera_axis.change_direction(direction_current);
 
 			// adjust pitch 
 			d = degrees180f(pitch_current - pitch_target);
 			pitch_current = degrees360f(pitch_current -  d * seconds);
-			axis.change_pitch(pitch_current);
+			camera_axis.change_pitch(pitch_current);
 		
-		} else if (mode == Cockpit) {
-			axis.assign(target_axis);
+		} else if (mode() == Cockpit) {
+			camera_axis.assign(target_axis);
 
 			if (core::localcontrol()->state() && core::localcontrol()->model())
-				target += (core::localcontrol()->model()->maxbbox().x+0.05) *
+				camera_target += (core::localcontrol()->model()->maxbbox().x+0.05) *
 					 core::localcontrol()->state()->axis().forward();
 			
 			distance = 0.0f;
 		}
 	}
 
+	// Change to the projection matrix and set our viewing volume.
+	gl::matrixmode(GL_PROJECTION);
+	gl::loadidentity();
+
+	const float frustum_size = 0.5f;
+	const float frustum_front = 1.0f;
+	distance += frustum_front;
+	gl::frustum(-frustum_size*aspect(), frustum_size*aspect(), -frustum_size, frustum_size, frustum_front, 1024.0f);
+
+	// model view
+	gl::matrixmode(GL_MODELVIEW);
+	gl::loadidentity();
+
 	// map world coordinates to opengl coordinates
 	gl::rotate(90.0f, 0, 1.0, 0);
 	gl::rotate(-90.0f, 1.0f , 0, 0);
 
 	// assign transformation matrix
-	matrix.assign(axis);
+	matrix.assign(camera_axis);
 
 	// apply the transpose of the axis transformation (the axis is orhtonormal)
 	gl::multmatrix(matrix.transpose());
 
 	// match the camera with the current target
-	gl::translate(-1.0f * target);
+	gl::translate(-1.0f * camera_target);
 	
 	// apply camera offset
-	gl::translate((1.0 + distance) * axis.forward());
+	gl::translate(distance * camera_axis.forward());
 
 	// calculate eye position
-	eye = target - ((1.0f+distance) * axis.forward());
-	eye.assign(target);
-
+	camera_eye = camera_target - (distance * camera_axis.forward());
 }
 
-void set_direction(float direction)
+void Camera::set_direction(float direction)
 {
 	target_direction = direction;
 	math::clamp(target_direction, -1.0f, 1.0f);
 }
 
-void set_pitch(float pitch)
+void Camera::set_pitch(float pitch)
 {
 	target_pitch = pitch;
 	math::clamp(target_pitch, -1.0f, 1.0f);
 }
 
-void reset()
+void Camera::reset()
 {
-	set_mode(mode);
+	set_mode(camera_mode);
 }
 
-} // namespace camera
-
-} // namespace client
-
+}
diff --git a/src/render/camera.h b/src/render/camera.h
new file mode 100644
index 0000000..42bd835
--- /dev/null
+++ b/src/render/camera.h
@@ -0,0 +1,87 @@
+/* 
+   render/camera.h
+   This file is part of the Osirion project and is distributed under 
+   the terms and conditions of the GNU General Public License version 2 
+*/
+
+#ifndef __INCLUDED_RENDER_CAMERA_H__
+#define __INCLUDED_RENDER_CAMERA_H__
+
+#include "math/mathlib.h"
+
+namespace render {
+
+/// camera functions
+class Camera
+{
+public:
+
+	/// enum indicating the camera mode
+	enum Mode {Free, Track, Cockpit, Overview};
+
+	/// initialize the camera
+	static void init();
+
+	/// shutdown the camera
+	static void shutdown();
+
+	/// gameworld coordinates of the camera eye
+	static inline const math::Vector3f & eye() { return camera_eye; }
+
+	/// gameworld coordinates of the camera target
+	static inline const math::Vector3f & target() { return camera_target; }
+
+	/// gameworld camera axis
+	static inline const math::Axis & axis() { return camera_axis; }
+
+	/// current camera mode
+	static inline Mode mode() { return camera_mode; }
+
+	/// current aspect ratio
+	static inline float aspect() { return camera_aspect; }
+
+	/// reset the current mode
+	static void reset();
+
+	/// draw the OpenGL camera transformation
+	static void draw(float elapsed);
+	
+	/// set target direction
+	static void set_direction(float direction);
+
+	/// set target pitch
+	static void set_pitch(float pitch);
+
+	/// switch to next camera mode
+	static void next_mode();
+
+	/// set specified camera mode
+	static void set_mode(Mode newmode);
+
+	/// set camera aspect ratio
+	static void set_aspect(float aspect);
+
+private:
+	static math::Vector3f 		camera_eye;
+	static math::Vector3f 		camera_target;
+	static math::Axis 		camera_axis;
+	static Mode 			camera_mode;
+	static float			camera_aspect;
+
+	// current and target yaw angle in XZ plane, positive is looking left
+	static float direction_current;
+	static float direction_target;
+	static float target_direction;
+
+	// current and target pitch angle in XY, positive is looking up
+	static float pitch_current;
+	static float pitch_target;
+	static float target_pitch;
+
+	static float distance;
+
+};
+
+} // namespace client
+	
+#endif // __INCLUDED_RENDER_CAMERA_H__
diff --git a/src/render/draw.cc b/src/render/draw.cc
index cb16b89..f3df6c0 100644
--- a/src/render/draw.cc
+++ b/src/render/draw.cc
@@ -38,10 +38,6 @@ math::Vector3f v7(-1, -1,  -1);
 const float drawdistance = 128.0f;
 const float drawfxdistance = 32.0f;
 
-math::Vector3f camera_target;
-math::Vector3f camera_eye;
-math::Axis camera_axis;
-
 float angle = 0;
 
 // function to test flags
@@ -266,7 +262,7 @@ void pass_prepare(float seconds)
 		if (entity->model()) {
 
 			entity->state()->state_visible = false;
-			float dq = math::distancesquared(camera_eye, entity->location());
+			float dq = math::distancesquared(Camera::eye(), entity->location());
 	
 			if (dq <= drawfxdistance*drawfxdistance*entity->model()->radius())  {
 				// entites within drawing distance
@@ -487,13 +483,13 @@ void draw_pass_model_fx()
 					gl::color(color);
 					
 					glTexCoord2f(0,1);
-					gl::vertex(location + (camera_axis.up() - camera_axis.left()) * light_size);
+					gl::vertex(location + (Camera::axis().up() - Camera::axis().left()) * light_size);
 					glTexCoord2f(0,0);
-					gl::vertex(location + (camera_axis.up() + camera_axis.left()) * light_size);
+					gl::vertex(location + (Camera::axis().up() + Camera::axis().left()) * light_size);
 					glTexCoord2f(1,0);
-					gl::vertex(location + (camera_axis.up() * -1 + camera_axis.left()) * light_size);
+					gl::vertex(location + (Camera::axis().up() * -1 + Camera::axis().left()) * light_size);
 					glTexCoord2f(1,1);
-					gl::vertex(location + (camera_axis.up() * -1 - camera_axis.left()) * light_size);
+					gl::vertex(location + (Camera::axis().up() * -1 - Camera::axis().left()) * light_size);
 
 					Stats::quads++;
 					
@@ -531,7 +527,7 @@ void draw_pass_model_fx()
 						color.assign(flare->color());
 					}
 
-					float a = dotproduct(flare_axis.forward(), camera_axis.forward());
+					float a = dotproduct(flare_axis.forward(), Camera::axis().forward());
 					if (a < -0.1f) {
 						color.a = -a - 0.1f;
 						gl::color(color);
@@ -621,11 +617,11 @@ void draw_pass_spacegrid()
 	float s = 1.0f / gridsize;
 	float z = -4.0f;
 
-	float dx =  camera_target.x - floorf(camera_target.x);
-	float dy =  camera_target.y - floorf(camera_target.y);
+	float dx =  Camera::target().x - floorf(Camera::target().x);
+	float dy =  Camera::target().y - floorf(Camera::target().y);
 
 	gl::push();
-	gl::translate(camera_target);
+	gl::translate(Camera::target());
 	gl::color(0,0, 1.0f);
 	gl::normal(0, 0, 1.0f);
 
@@ -653,7 +649,7 @@ void draw_pass_spacegrid()
 
 /* ----- Main draw routine ----------------------------------------- */
 
-void draw(math::Axis const &axis, math::Vector3f const &eye, math::Vector3f const &target, float seconds)
+void draw(float seconds)
 {
 	Stats::clear();
 
@@ -662,10 +658,8 @@ void draw(math::Axis const &axis, math::Vector3f const &eye, math::Vector3f cons
     	if( angle > 360.0f ) {
             angle -= 360.0f;
     	}
-
-	camera_target.assign(target);
-	camera_eye.assign(eye);
-	camera_axis.assign(axis);
+		
+	Camera::draw(seconds);		// draw the current camera transformation
 
 	pass_prepare(seconds);
 	
diff --git a/src/render/draw.h b/src/render/draw.h
index a260f34..ee9db26 100644
--- a/src/render/draw.h
+++ b/src/render/draw.h
@@ -14,7 +14,7 @@ namespace render
 {
 
 /// draw the world
-void draw(math::Axis const &axis, math::Vector3f const &eye, math::Vector3f const &target, float seconds);
+void draw(float seconds);
 
 /// draw a sphere
 void draw_sphere(math::Color const & color, float radius);
diff --git a/src/render/render.cc b/src/render/render.cc
index 87ff64a..dac0972 100644
--- a/src/render/render.cc
+++ b/src/render/render.cc
@@ -85,6 +85,8 @@ void init()
 	r_bbox = core::Cvar::get("r_bbox", "0", core::Cvar::Archive);
 	r_bbox->set_info("[bool] render model bounding box");
 
+	Camera::init();
+
 	Textures::init();
 
 	Text::init();
@@ -94,10 +96,6 @@ void shutdown()
 {
 	con_print << "^BShutting down renderer..." << std::endl;
 
-	Text::shutdown();
-
-	Textures::shutdown();
-
 	// clear entity models, this will force a reload
 	for (std::map<unsigned int, core::Entity *>::iterator it=core::Entity::registry.begin(); it != core::Entity::registry.end(); it++) {
 		core::Entity *entity = (*it).second;
@@ -111,6 +109,12 @@ void shutdown()
 	// clear vertex array
 	delete vertexarray;
 	vertexarray = 0;
+
+	Text::shutdown();
+
+	Textures::shutdown();
+
+	Camera::shutdown();
 }
 
 }
diff --git a/src/render/render.h b/src/render/render.h
index 68952f1..ebecf7f 100644
--- a/src/render/render.h
+++ b/src/render/render.h
@@ -10,6 +10,7 @@
 #include "core/cvar.h"
 #include "model/vertexarray.h"
 
+#include "render/camera.h"
 #include "render/draw.h"
 #include "render/gl.h"
 #include "render/text.h"