diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-09 12:47:38 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-01 20:58:54 +0000 |
| commit | 1d984d2bb2d03f60d1cac53e58d6a60fb7645a03 (patch) | |
| tree | 68a1207db25ac38e30c15448bf269963a7614d4d /include | |
| parent | f3fc87261c2f2db71ac9d63b680417836885da13 (diff) | |
| download | qtlocation-mapboxgl-1d984d2bb2d03f60d1cac53e58d6a60fb7645a03.tar.gz | |
[core] Get rid of mbgl/util/vec4 - use vec4 from vec.hpp instead
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/util/mat4.hpp | 8 | ||||
| -rw-r--r-- | include/mbgl/util/vec.hpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/mbgl/util/mat4.hpp b/include/mbgl/util/mat4.hpp index 59f6e3ee00..ff8e65224c 100644 --- a/include/mbgl/util/mat4.hpp +++ b/include/mbgl/util/mat4.hpp @@ -23,11 +23,13 @@ #ifndef MBGL_UTIL_MAT4 #define MBGL_UTIL_MAT4 +#include <mbgl/util/vec.hpp> + #include <array> namespace mbgl { -typedef std::array<double, 16> mat4; +using mat4 = std::array<double, 16>; namespace matrix { @@ -43,7 +45,9 @@ void rotate_z(mat4& out, const mat4& a, double rad); void scale(mat4& out, const mat4& a, double x, double y, double z); void multiply(mat4& out, const mat4& a, const mat4& b); +void transformMat4(vec4<double>& out, vec4<double>& a, mat4& m); + } // namespace matrix } // namespace mbgl -#endif +#endif // MBGL_UTIL_MAT4 diff --git a/include/mbgl/util/vec.hpp b/include/mbgl/util/vec.hpp index 6fca71b06c..83530a1798 100644 --- a/include/mbgl/util/vec.hpp +++ b/include/mbgl/util/vec.hpp @@ -122,4 +122,4 @@ struct vec4 { } // namespace mbgl -#endif +#endif // MBGL_UTIL_VEC |