From 08ef90e3029cf42b4596bc16ef5f5da64697e6ba Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sat, 2 Jul 2005 01:44:58 -0400
Subject: [PATCH] Added: Added a second RotateView method which accepts and
 normalizes a Vec3d vector as opposed to individual components. Changed:
 SetViewByMouse now requires an OpenArena::Window not a Screen Added:
 Implemented SetViewByMouse for linux ~g2k

---
 src/camera.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/camera.cpp b/src/camera.cpp
index 97a2c12..5c13389 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -71,22 +71,51 @@ namespace OpenArena
 		m_vUpVector = up;
 	}
 	
-	void Camera::SetViewByMouse(Screen g_Screen)
+	void Camera::SetViewByMouse(Window window)
 	{
+		//Remove the ifdef and use the linux section for both linux and windows
+		#ifdef __linux
+		static double currentRotX = 0.0f;
+		Vec2i pos;
+		Vec2i middle;
+		double angleZ;
+		
+		middle.x = window.width/2;
+		middle.y = window.height/2;
+		pos = window.GetMousePosition();
+		window.SetMousePosition(middle);
+		if(pos != middle)
+		{
+			angleZ = (middle.y - pos.y)/1000.0;
+			currentRotX-=angleZ;
+			if(currentRotX >1.0)
+			{
+				currentRotX = 1.0;
+			}
+			else if(currentRotX < -1.0)
+			{
+				currentRotX = -1.0;
+			}
+			else
+			{
+				Vec3d axis = (m_vView - m_vPosition).cross(m_vUpVector);
+				axis.normalize();
+				RotateView(angleZ, axis.x, axis.y, axis.z);
+				RotateView((middle.x-pos.x)/1000.0, 0, 1, 0);
+				//RotateView((middle.x-pos.x)/1000.0, m_vUpVector.x, m_vUpVector.y, m_vUpVector.z);
+			}
+		}		
+		#endif
 		//Most of this is sorta right for linux I think but since I don't know how yet it's currently windows only
 		#ifdef WIN32
 		static double currentRotX = 0.0f;
 		POINT mpos;
 		POINT middle;
-		
 		double angleZ;
-		
-		middle.x = g_Screen.width / 2;
-		middle.y = g_Screen.height / 2;
-		
+		middle.x = window.width / 2;
+		middle.y = window.height / 2;
 		GetCursorPos(&mpos);
 		SetCursorPos(middle.x, middle.y);							
-		
 		if(mpos.x != middle.x || mpos.y != middle.y)
 		{
 			angleZ = double(middle.y - mpos.y) / 1000.0f;		
@@ -123,6 +152,13 @@ namespace OpenArena
 		m_vView.z += heading.z * speed;
 	}
 	
+	void Camera::RotateView(double angle, Vec3d axis)
+	{
+		//Maybe make this not call the other RotateView later
+		axis.normalize();
+		RotateView(angle, axis.x, axis.y, axis.z);
+	}
+	
 	void Camera::RotateView(double angle, double x, double y, double z)
 	{
 		Vec3f nView;