moved camera into render::

8 files changed, 25 insertions, 451 deletions

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.cc b/src/client/camera.cc
deleted file mode 100644
index cbed115..0000000
--- a/src/client/camera.cc
+++ /dev/null
@@ -1,346 +0,0 @@
-/* 
-   client/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 "math/mathlib.h"
-#include "math/matrix4f.h"
-#include "core/core.h"
-#include "client/client.h"
-#include "client/camera.h"
-#include "render/render.h"
-#include "sys/sys.h"
-
-using math::degrees360f;
-using math::degrees180f;
-
-using namespace render;
-
-namespace client
-{
-
-namespace camera 
-{
-
-// gameworld coordinates of the camera target
-math::Vector3f target;
-math::Vector3f eye;
-math::Axis axis;
-
-const float MIN_DELTA = 10e-10;
-
-// current camera mode
-Mode mode;
-
-// private variables
-
-// 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;
-
-// 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;
-
-// default pitch in mode::Track
-const float pitch_track = -15.0f;
-const float pitch_overview = -75.0f;
-
-void set_mode(Mode newmode);
-
-void init()
-{
-	yaw_current = 0;
-	yaw_target = 0; 
-
-	pitch_current = pitch_track * 2; 
-	pitch_target = pitch_track; 
-
-	target_pitch = 0.0f;
-	target_direction = 0.0f;
-
-	distance = 0.4f;
-
-	set_mode(Track);
-	
-}
-
-void shutdown() 
-{
-}
-
-void set_mode(Mode newmode) {
-
-	yaw_target = 0;
-	yaw_current = yaw_target;
-	pitch_target = pitch_track;
-	pitch_current = pitch_target;
-
-	target_direction = 0.0f;
-	target_pitch = 0.0f;
-	distance = 0.4f;
-
-	axis.clear();
-
-	switch(newmode) {
-	case Track:
-		// switch camera to Track mode
-		mode = Track;
-		if (core::localcontrol()) {
-			if (core::localcontrol()->state())
-				axis.assign(core::localcontrol()->state()->axis());
-			else
-				axis.assign(core::localcontrol()->axis());
-		}
-		break;
-
-	case Free:
-		// switch camera to Free mode
-		mode = Free;
-		pitch_target = 2.0 * pitch_track;
-		pitch_current = pitch_target;
-		break;
-
-	case Cockpit:
-		mode = Cockpit;
-		break;
-
-	case Overview:
-		// switch camera to Overview mode
-		mode = Overview;
-
-	default:
-		break;
-	}
-
-}
-
-void next_mode()
-{
-	
- 	if (!core::localcontrol()) {
-		set_mode(Overview);
-		return;
-	}
-
-	switch(mode) {
-	case Free:
-		// switch camera to Track mode
-		set_mode(Track);
-		con_print << "camera mode: track" << std::endl;
-		break;
-
-	case Track:
-		// switch camera to Cockpit mode
-		set_mode(Cockpit);
-		con_print << "camera mode: cockpit" << std::endl;
-		break;
-	
-	case Cockpit:
-		// switch camera to Free mode
-		set_mode(Free);
-		con_print << "camera mode: free" << std::endl;
-		break;
-	
-	default:
-		break;
-	}
-}
-
-void draw(float seconds) 
-{	
-	math::Matrix4f matrix;
-	math::Axis target_axis;
-	float d = 0;
-
-	if (!core::localcontrol()) {
-
-		if (mode != Overview) {
-			set_mode(Overview);
-		}
-		
-		target.clear();
-		axis.clear();
-		pitch_current = pitch_overview;
-		axis.change_pitch(pitch_current);
-
-		distance = 20.0f;
-
-	} else {
-		if (mode == Overview)
-			set_mode(Track);
-
-		if (core::localcontrol()->state()) {
-			target.assign(core::localcontrol()->state()->location());
-			target_axis.assign(core::localcontrol()->state()->axis());
-		} else {
-			target.assign(core::localcontrol()->location());
-			target_axis.assign(core::localcontrol()->axis());
-		}
-		
-		if (mode == Track) {
-			float cosangle;
-			float angle;
-			float side;
-			float u;
-			const float cam_speed = seconds;
-
-			math::Vector3f n;
-			math::Vector3f p;
-
-			// camera axis: pitch
-
-			// project target_axis.up() into the plane with axis->left() normal
-			n = 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;
-
-			if ((fabs(side) - MIN_DELTA > 0)) {
-				
-				cosangle = math::dotproduct(p, 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: direction
-
-			// project target_axis.forward() into the plane with axis.up() normal
-			n = 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;
-
-			if ((fabs(side) - MIN_DELTA > 0)) {
-				
-				cosangle = math::dotproduct(p, 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: roll
-
-			// project target_axis.up() into the plane with axis.forward() normal
-			n = 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;
-
-			if ((fabs(side) - MIN_DELTA > 0)) {
-				
-				cosangle = math::dotproduct(p, 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);
-				}
-			}
-
-			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();
-			}
-
-		} else if (mode == Free) {
-			axis.assign(target_axis);
-
-			yaw_target =  yaw_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);
-
-			// adjust pitch 
-			d = degrees180f(pitch_current - pitch_target);
-			pitch_current = degrees360f(pitch_current -  d * seconds);
-			axis.change_pitch(pitch_current);
-		
-		} else if (mode == Cockpit) {
-			axis.assign(target_axis);
-
-			if (core::localcontrol()->state() && core::localcontrol()->model())
-				target += (core::localcontrol()->model()->maxbbox().x+0.05) *
-					 core::localcontrol()->state()->axis().forward();
-			
-			distance = 0.0f;
-		}
-	}
-
-	// 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);
-
-	// 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);
-	
-	// apply camera offset
-	gl::translate((1.0 + distance) * axis.forward());
-
-	// calculate eye position
-	eye = target - ((1.0f+distance) * axis.forward());
-	eye.assign(target);
-
-}
-
-void set_direction(float direction)
-{
-	target_direction = direction;
-	math::clamp(target_direction, -1.0f, 1.0f);
-}
-
-void set_pitch(float pitch)
-{
-	target_pitch = pitch;
-	math::clamp(target_pitch, -1.0f, 1.0f);
-}
-
-void reset()
-{
-	set_mode(mode);
-}
-
-} // namespace camera
-
-} // namespace client
-
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