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/math/func.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/math/func.h') 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; -- cgit v1.2.3-1-g7c22