moved camera into render::

1 files changed, 0 insertions, 346 deletions

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
-