diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
commit | b735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch) | |
tree | efa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/math/func.h | |
parent | b5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff) | |
download | colobot-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/func.h')
-rw-r--r-- | src/math/func.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/math/func.h b/src/math/func.h index e5e1321..212f7c1 100644 --- a/src/math/func.h +++ b/src/math/func.h @@ -151,7 +151,7 @@ inline bool TestAngle(float angle, float min, float max) } //! Calculates a value (radians) proportional between a and b (degrees) -float PropAngle(int a, int b, float p) +inline float PropAngle(int a, int b, float p) { float aa = (float)a * DEG_TO_RAD; float bb = (float)b * DEG_TO_RAD; @@ -185,7 +185,7 @@ inline float Direction(float a, float g) <----> dead out: -1 0 0 1\endverbatim */ -float Neutral(float value, float dead) +inline float Neutral(float value, float dead) { if ( fabs(value) <= dead ) { @@ -200,7 +200,7 @@ float Neutral(float value, float dead) //! Gently advances a desired value from its current value /** Over time, the progression is more rapid. */ -float Smooth(float actual, float hope, float time) +inline float Smooth(float actual, float hope, float time) { float future = actual + (hope-actual)*time; |