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/geometry.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/geometry.h')
| -rw-r--r-- | src/math/geometry.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/math/geometry.h b/src/math/geometry.h index 55bc745..f086e2d 100644 --- a/src/math/geometry.h +++ b/src/math/geometry.h @@ -22,19 +22,21 @@ #pragma once -#include "const.h" -#include "func.h" -#include "point.h" -#include "vector.h" -#include "matrix.h" + +#include "math/const.h" +#include "math/func.h" +#include "math/point.h" +#include "math/matrix.h" +#include "math/vector.h" + #include <cmath> #include <cstdlib> // Math module namespace -namespace Math -{ +namespace Math { + //! Returns py up on the line \a a - \a b inline float MidPoint(const Math::Point &a, const Math::Point &b, float px) @@ -617,4 +619,5 @@ inline Math::Vector RotateView(Math::Vector center, float angleH, float angleV, return eye+center; } -}; // namespace Math + +} // namespace Math |