diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-16 17:45:00 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-05 11:30:53 -0700 |
| commit | 9330d674a983652d248d6a43fa4adbf5970c3d30 (patch) | |
| tree | bd9292fcdb14f416922197f36c7707bb52e13591 /src/mbgl/util/mat4.hpp | |
| parent | f89cfacab2457602c5bd81ab9da35cede23584e2 (diff) | |
| download | qtlocation-mapboxgl-9330d674a983652d248d6a43fa4adbf5970c3d30.tar.gz | |
[core] Use geometry.hpp's point
Diffstat (limited to 'src/mbgl/util/mat4.hpp')
| -rw-r--r-- | src/mbgl/util/mat4.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/util/mat4.hpp b/src/mbgl/util/mat4.hpp index ff8e65224c..80bd912554 100644 --- a/src/mbgl/util/mat4.hpp +++ b/src/mbgl/util/mat4.hpp @@ -23,12 +23,11 @@ #ifndef MBGL_UTIL_MAT4 #define MBGL_UTIL_MAT4 -#include <mbgl/util/vec.hpp> - #include <array> namespace mbgl { +using vec4 = std::array<double, 4>; using mat4 = std::array<double, 16>; namespace matrix { @@ -45,7 +44,7 @@ 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); +void transformMat4(vec4& out, const vec4& a, const mat4& m); } // namespace matrix } // namespace mbgl |