From 691cfb0c709fc8fafd8be16f4d72cda9771e1148 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Fri, 11 Aug 2006 16:57:22 -0400 Subject: [PATCH] *** empty log message *** --- src/camera.cpp | 2 +- src/window.cpp | 2 +- src/windows.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/camera.cpp b/src/camera.cpp index 9fadef4..ed86737 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -130,7 +130,7 @@ namespace OpenArena currentRotX = -1.0f; else { - Vec3f axis = (m_vView - m_vPosition).cross(m_vUpVector); + Vec3f axis = (_heading).cross(_up); axis.normalize(); RotateView(angleZ, axis.x, axis.y, axis.z); diff --git a/src/window.cpp b/src/window.cpp index 18aff40..ffeeb19 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -406,10 +406,10 @@ OpenArena::Vec2i OpenArena::Window::GetMousePosition() } #elif USE_AGL #elif USE_CGL + #elif USE_WGL POINT pos; GetCursorPos(&pos); return Vec2i(pos.x, pos.y); - #elif USE_WGL #endif } diff --git a/src/windows.cpp b/src/windows.cpp index b363216..f56d25d 100644 --- a/src/windows.cpp +++ b/src/windows.cpp @@ -30,8 +30,10 @@ #ifdef WIN32 //include necessary header files #include "main.h" +#include #include "version.h" #include "vector.h" +using OpenArena::Vec2i; //link necessary libraries #pragma comment(lib, "opengl32.lib") @@ -296,8 +298,8 @@ int WINAPI WinMain( HINSTANCE hInstance, //Vec2i mouseDelta = mousePosition - middleOfScreen; Vec2i mouseDelta = middleOfScreen - mousePosition; g_Screen.SetMousePosition(middleOfScreen); - const float MOUSE_SENSITIVITY_HORIZONTAL = 0.005; - const float MOUSE_SENSITIVITY_VERTICAL = 0.005; + const float MOUSE_SENSITIVITY_HORIZONTAL = 0.005f; + const float MOUSE_SENSITIVITY_VERTICAL = 0.005f; float horizontalAngle = mouseDelta.x * MOUSE_SENSITIVITY_HORIZONTAL; float verticalAngle = mouseDelta.y * MOUSE_SENSITIVITY_VERTICAL; level.defaultPlayer[0].camera.RotateHorizontal(horizontalAngle);