devirtualize shape and outline calls

[blank.git] / src / model.hpp

diff --git a/src/model.hpp b/src/model.hpp
index ea9bf119e80e6061084117edb0e1c11549a8b1a0..62f467c4f787a6de9547f450af12197dd3e955f6 100644 (file)
--- a/src/model.hpp
+++ b/src/model.hpp
@@ -11,13 +11,21 @@ namespace blank {
 class Model {
 
 public:
+       using Position = glm::vec3;
+       using Color = glm::vec3;
+       using Normal = glm::vec3;
        using Index = unsigned int;
 
+       using Positions = std::vector<Position>;
+       using Colors = std::vector<Color>;
+       using Normals = std::vector<Normal>;
+       using Indices = std::vector<Index>;
+
 public:
-       std::vector<glm::vec3> vertices;
-       std::vector<glm::vec3> colors;
-       std::vector<glm::vec3> normals;
-       std::vector<Index> indices;
+       Positions vertices;
+       Colors colors;
+       Normals normals;
+       Indices indices;
 
 public:
        Model();
@@ -59,12 +67,18 @@ private:
 class OutlineModel {
 
 public:
+       using Position = glm::vec3;
+       using Color = glm::vec3;
        using Index = unsigned short;
 
+       using Positions = std::vector<Position>;
+       using Colors = std::vector<Color>;
+       using Indices = std::vector<Index>;
+
 public:
-       std::vector<glm::vec3> vertices;
-       std::vector<glm::vec3> colors;
-       std::vector<Index> indices;
+       Positions vertices;
+       Colors colors;
+       Indices indices;
 
 public:
        OutlineModel();