From b735913debff93c1a6444ec731cd4bf99ae2a5c2 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 13 Jun 2012 22:48:35 +0200 Subject: FPOINT -> Math::Point & other math functions - changed FPOINT to Math::Point and some functions from math module to the new implementation - moved old function and FPOINT struct declarations to math3d.cpp - removed some unused functions in math module - fixed some #include dependencies - moved #define STRICT and #define D3D_OVERLOADS to compile options --- src/graphics/common/camera.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/graphics/common/camera.h') diff --git a/src/graphics/common/camera.h b/src/graphics/common/camera.h index 407d522..433a458 100644 --- a/src/graphics/common/camera.h +++ b/src/graphics/common/camera.h @@ -19,8 +19,9 @@ #pragma once +#include "common/event.h" +#include "math/point.h" #include "graphics/d3d/d3dengine.h" -#include "common/struct.h" class CInstanceManager; @@ -142,7 +143,7 @@ public: void SetCameraInvertY(bool bInvert); float RetMotorTurn(); - D3DMouse RetMouseDef(FPOINT pos); + D3DMouse RetMouseDef(Math::Point pos); protected: bool EventMouseMove(const Event &event); @@ -193,9 +194,9 @@ protected: float m_focus; bool m_bRightDown; - FPOINT m_rightPosInit; - FPOINT m_rightPosCenter; - FPOINT m_rightPosMove; + Math::Point m_rightPosInit; + Math::Point m_rightPosCenter; + Math::Point m_rightPosMove; D3DVECTOR m_eyePt; // CAMERA_FREE: eye float m_directionH; // CAMERA_FREE: horizontal direction @@ -226,7 +227,7 @@ protected: float m_remotePan; float m_remoteZoom; - FPOINT m_mousePos; + Math::Point m_mousePos; float m_mouseDirH; float m_mouseDirV; float m_mouseMarging; -- cgit v1.2.3-1-g7c22