diff --git a/CMakeLists.txt b/CMakeLists.txt index fe079f6d9..8e588c32b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,6 +275,7 @@ add_library( ${PROJECT_SOURCE_DIR}/include/mbgl/util/unitbezier.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/util.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/variant.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/util/vectors.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_request.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task_impl.hpp diff --git a/include/mbgl/util/vectors.hpp b/include/mbgl/util/vectors.hpp new file mode 100644 index 000000000..90371284d --- /dev/null +++ b/include/mbgl/util/vectors.hpp @@ -0,0 +1,13 @@ +#pragma once + +#include + +namespace mbgl { + +using vec2 = std::array; +using vec3 = std::array; +using vec3f = std::array; +using vec3i = std::array; +using vec4 = std::array; + +} // namespace mbgl \ No newline at end of file diff --git a/src/mbgl/util/mat3.hpp b/src/mbgl/util/mat3.hpp index 9690bab00..cb43505ba 100644 --- a/src/mbgl/util/mat3.hpp +++ b/src/mbgl/util/mat3.hpp @@ -24,12 +24,10 @@ #include #include +#include namespace mbgl { -using vec3 = std::array; -using vec3f = std::array; -using vec3i = std::array; using mat3 = std::array; inline vec3 vec3Cross(const vec3& a, const vec3& b) { diff --git a/src/mbgl/util/mat4.hpp b/src/mbgl/util/mat4.hpp index 438771949..5e56ca170 100644 --- a/src/mbgl/util/mat4.hpp +++ b/src/mbgl/util/mat4.hpp @@ -23,10 +23,10 @@ #pragma once #include +#include namespace mbgl { -using vec4 = std::array; using mat4 = std::array; namespace matrix {