diff options
author | Dan Goodliffe <dan.goodliffe@octal.co.uk> | 2023-10-26 20:34:55 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-10-27 00:31:40 +0100 |
commit | 6ec18905acdb9b30e5bfc5eee9be0182ce1744c9 (patch) | |
tree | f0cc6257392b1c375c4030fe69e5b217314a08c0 /assetFactory/modelFactoryMesh.h | |
parent | Merge branch 'glad' (diff) | |
download | ilt-6ec18905acdb9b30e5bfc5eee9be0182ce1744c9.tar.bz2 ilt-6ec18905acdb9b30e5bfc5eee9be0182ce1744c9.tar.xz ilt-6ec18905acdb9b30e5bfc5eee9be0182ce1744c9.zip |
Move OpenMesh/GLM compatibility structs to common place
Diffstat (limited to 'assetFactory/modelFactoryMesh.h')
-rw-r--r-- | assetFactory/modelFactoryMesh.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/assetFactory/modelFactoryMesh.h b/assetFactory/modelFactoryMesh.h index 32e7ab5..2129fb5 100644 --- a/assetFactory/modelFactoryMesh.h +++ b/assetFactory/modelFactoryMesh.h @@ -2,36 +2,11 @@ #include "modelFactoryMesh_fwd.h" #include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh> -#include <OpenMesh/Core/Mesh/Traits.hh> #include <glad/gl.h> -#include <glm/geometric.hpp> #include <glm/vec2.hpp> #include <glm/vec3.hpp> #include <glm/vec4.hpp> - -namespace glm { - template<length_t L, typename T, qualifier Q> - auto - norm(const vec<L, T, Q> & v) - { - return length(v); - } - - template<length_t L, typename T, qualifier Q, typename S> - auto - vectorize(vec<L, T, Q> & v, S scalar) - { - v = vec<L, T, Q> {static_cast<T>(scalar)}; - } -} - -namespace OpenMesh { - template<glm::length_t L, typename T, glm::qualifier Q> struct vector_traits<glm::vec<L, T, Q>> { - using vector_type = glm::vec<L, T, Q>; - using value_type = T; - static constexpr glm::length_t size_ = L; - }; -} +#include <thirdparty/openmesh/glmcompat.h> struct ModelFactoryTraits : public OpenMesh::DefaultTraits { FaceAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status | OpenMesh::Attributes::Color); |