diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-03 21:31:54 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-03 21:31:54 +0000 |
| commit | 5d9849266e11043deefdd18b4701c7e9c289f37e (patch) | |
| tree | d43e7f97613dd6231b9d900758ed89e37b1851d5 /assetFactory | |
| parent | Don't request a specific OpenGL version, just check we get something sufficie... (diff) | |
| parent | Implement terrain intersect ray (diff) | |
| download | ilt-5d9849266e11043deefdd18b4701c7e9c289f37e.tar.bz2 ilt-5d9849266e11043deefdd18b4701c7e9c289f37e.tar.xz ilt-5d9849266e11043deefdd18b4701c7e9c289f37e.zip | |
Psycho-rebased branch terrain on top of main
Diffstat (limited to 'assetFactory')
| -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); |