summaryrefslogtreecommitdiffstats
path: root/src/math/conv.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-13 22:48:35 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-13 22:48:35 +0200
commitb735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch)
treeefa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/math/conv.h
parentb5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff)
downloadcolobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.gz
colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.bz2
colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.zip
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
Diffstat (limited to 'src/math/conv.h')
-rw-r--r--src/math/conv.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/math/conv.h b/src/math/conv.h
index 8b77db9..8cfdc6b 100644
--- a/src/math/conv.h
+++ b/src/math/conv.h
@@ -8,9 +8,7 @@
#define D3D_OVERLOADS
#include <d3d.h>
-#include "common/struct.h"
#include "vector.h"
-#include "point.h"
inline D3DVECTOR V_TO_D3D(Math::Vector vec)
{
@@ -21,13 +19,3 @@ inline Math::Vector D3D_TO_V(D3DVECTOR vec)
{
return Math::Vector(vec.x, vec.y, vec.z);
}
-
-inline FPOINT P_TO_FP(Math::Point pt)
-{
- return FPOINT(pt.x, pt.y);
-}
-
-inline Math::Point FP_TO_P(FPOINT pt)
-{
- return Math::Point(pt.x, pt.y);
-}