diff options
| author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-20 23:04:37 +0200 |
|---|---|---|
| committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-20 23:04:37 +0200 |
| commit | 34a11021daca9d6b51e8cc29c1562a75815df7b3 (patch) | |
| tree | 7d1427b27337d32224cf66cc114adf4f3665bbee /src/math/func.h | |
| parent | 191fdc614ed8022c145d3530f9d412e715ae37db (diff) | |
| parent | e25823f98437461826b52521bcf9d70eb11a00b3 (diff) | |
| download | colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.tar.gz colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.tar.bz2 colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.zip | |
changed paths for models and levels. Now it's possible to load level. Merged with latest trunk
Diffstat (limited to 'src/math/func.h')
| -rw-r--r-- | src/math/func.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/math/func.h b/src/math/func.h index 541b084..413b5d9 100644 --- a/src/math/func.h +++ b/src/math/func.h @@ -22,15 +22,17 @@ #pragma once -#include "const.h" + +#include "math/const.h" + #include <cmath> #include <cstdlib> // Math module namespace -namespace Math -{ +namespace Math { + //! Compares \a a and \a b within \a tolerance inline bool IsEqual(float a, float b, float tolerance = Math::TOLERANCE) @@ -253,4 +255,5 @@ inline float Bounce(float progress, float middle = 0.3f, float bounce = 0.4f) } } -}; // namespace Math + +} // namespace Math |