maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added: Added a second RotateView method which accepts and normalizes a Vec3d vector as opposed to individual components.

Browse Source 
Changed: SetViewByMouse now requires an OpenArena::Window not a Screen
Added: Implemented SetViewByMouse for linux
~g2k
This commit is contained in:
Tom Hicks
2005-07-02 01:44:58 -04:00
parent dced47e5b1
commit 08ef90e302
1 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/camera.cpp
View File

@@ -71,22 +71,51 @@ namespace OpenArena
m_vUpVector = up; 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 //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 #ifdef WIN32
static double currentRotX = 0.0f; static double currentRotX = 0.0f;
POINT mpos; POINT mpos;
POINT middle; POINT middle;
double angleZ; double angleZ;
middle.x = window.width / 2;
middle.x = g_Screen.width / 2; middle.y = window.height / 2;
middle.y = g_Screen.height / 2;
GetCursorPos(&mpos); GetCursorPos(&mpos);
SetCursorPos(middle.x, middle.y); SetCursorPos(middle.x, middle.y);
if(mpos.x != middle.x || mpos.y != middle.y) if(mpos.x != middle.x || mpos.y != middle.y)
{ {
angleZ = double(middle.y - mpos.y) / 1000.0f; angleZ = double(middle.y - mpos.y) / 1000.0f;
@@ -123,6 +152,13 @@ namespace OpenArena
m_vView.z += heading.z * speed; 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) void Camera::RotateView(double angle, double x, double y, double z)
{ {
Vec3f nView; Vec3f nView;