diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-07 02:51:42 +0000 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-07 02:51:42 +0000 |
commit | d6e99a696aa582b81018078b68f6600c8030d643 (patch) | |
tree | 5c1451bbc76c31f78ddd169fca7780a0943f5910 /gfx/models/vertex.h | |
parent | Reformat with new clang-format (diff) | |
download | ilt-d6e99a696aa582b81018078b68f6600c8030d643.tar.bz2 ilt-d6e99a696aa582b81018078b68f6600c8030d643.tar.xz ilt-d6e99a696aa582b81018078b68f6600c8030d643.zip |
WIP typedefing all the things - headers
Diffstat (limited to 'gfx/models/vertex.h')
-rw-r--r-- | gfx/models/vertex.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gfx/models/vertex.h b/gfx/models/vertex.h index 0464ea7..5635fa1 100644 --- a/gfx/models/vertex.h +++ b/gfx/models/vertex.h @@ -1,12 +1,12 @@ #pragma once +#include "config/types.h" #include <glad/gl.h> -#include <glm/glm.hpp> class Vertex { public: #ifndef __cpp_aggregate_paren_init - constexpr Vertex(glm::vec3 pos, glm::vec2 texCoord, glm::vec3 normal, glm::vec4 colour = {}, GLuint material = 0) : + constexpr Vertex(Position3D pos, TextureRelCoord texCoord, Normal3D normal, RGBA colour = {}, GLuint material = 0) : pos {std::move(pos)}, texCoord {std::move(texCoord)}, normal {std::move(normal)}, colour {std::move(colour)}, material {material} { @@ -15,9 +15,9 @@ public: bool operator==(const Vertex &) const = default; - glm::vec3 pos; - glm::vec2 texCoord; - glm::vec3 normal; - glm::vec4 colour {}; + Position3D pos {}; + TextureRelCoord texCoord {}; + Normal3D normal {}; + RGBA colour {}; GLuint material {}; }; |