summaryrefslogtreecommitdiff
path: root/assetFactory/modelFactoryMesh.h
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2023-03-02 18:18:38 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2023-03-02 18:18:38 +0000
commit98df33e0a52e086b68df2a62ce2f41cc6b67db63 (patch)
tree196300dbc07855b130e73b92077ff0e1e701a418 /assetFactory/modelFactoryMesh.h
parentRemove to specify if the Selection pointer type is shared or not (diff)
downloadilt-98df33e0a52e086b68df2a62ce2f41cc6b67db63.tar.bz2
ilt-98df33e0a52e086b68df2a62ce2f41cc6b67db63.tar.xz
ilt-98df33e0a52e086b68df2a62ce2f41cc6b67db63.zip
Parse colour values as they're read
Diffstat (limited to 'assetFactory/modelFactoryMesh.h')
-rw-r--r--assetFactory/modelFactoryMesh.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/assetFactory/modelFactoryMesh.h b/assetFactory/modelFactoryMesh.h
index b4f5254..258913b 100644
--- a/assetFactory/modelFactoryMesh.h
+++ b/assetFactory/modelFactoryMesh.h
@@ -5,6 +5,7 @@
#include <OpenMesh/Core/Mesh/Traits.hh>
#include <glm/geometric.hpp>
#include <glm/vec3.hpp>
+#include <glm/vec4.hpp>
namespace OpenMesh {
template<typename Scalar, int DIM> struct glmvec : public VectorT<Scalar, DIM> {
@@ -25,7 +26,7 @@ struct ModelFactoryTraits : public OpenMesh::DefaultTraits {
VertexAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status);
using Point = OpenMesh::glmvec<float, 3>;
using Normal = OpenMesh::glmvec<float, 3>;
- using Color = OpenMesh::glmvec<float, 4>;
+ using Color = glm::vec4;
};
struct ModelFactoryMesh : public OpenMesh::PolyMesh_ArrayKernelT<ModelFactoryTraits> {