X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel.hpp;h=6e9583b3ec84f6ae05c7f1beaeeaa05b7e36e75b;hb=9c1f7b20394808f7ec7a6cadd9e0dd665c6f6bd5;hp=4423cd7115338f671847d2461def60ffd11454cd;hpb=5700ea3c08ea5e4a5c743f0413b65dc8eebfd220;p=blank.git diff --git a/src/model.hpp b/src/model.hpp index 4423cd7..6e9583b 100644 --- a/src/model.hpp +++ b/src/model.hpp @@ -10,10 +10,14 @@ namespace blank { class Model { +public: + using Index = unsigned int; + public: std::vector vertices; std::vector colors; std::vector normals; + std::vector indices; public: Model(); @@ -28,7 +32,7 @@ public: void Invalidate() { dirty = true; } void Clear(); - void Reserve(int); + void Reserve(int vtx_count, int idx_count); void Draw(); @@ -40,6 +44,7 @@ private: ATTRIB_VERTEX, ATTRIB_COLOR, ATTRIB_NORMAL, + ATTRIB_INDEX, ATTRIB_COUNT, }; @@ -51,9 +56,13 @@ private: class OutlineModel { +public: + using Index = unsigned short; + public: std::vector vertices; std::vector colors; + std::vector indices; public: OutlineModel(); @@ -65,7 +74,7 @@ public: void Invalidate() { dirty = true; } void Clear(); - void Reserve(int); + void Reserve(int vtx_count, int idx_count); void Draw(); @@ -76,6 +85,7 @@ private: enum Attribute { ATTRIB_VERTEX, ATTRIB_COLOR, + ATTRIB_INDEX, ATTRIB_COUNT, };