X-Git-Url: https://eleni.mutantstargoat.com/git/?p=hair;a=blobdiff_plain;f=src%2Fmesh.h;h=08d01d7d26cc7c703e167378e9a6b2e5237e1b78;hp=ec93ab1a4271d25c2d71bd8805e7ef8b37592cb6;hb=8f59fd2bda5b48b7cb9137ca5ee141dd8f8382d1;hpb=6b061e7aa1fcfad3e01eff29d5e4b2bed451e090 diff --git a/src/mesh.h b/src/mesh.h index ec93ab1..08d01d7 100644 --- a/src/mesh.h +++ b/src/mesh.h @@ -10,8 +10,9 @@ enum { MESH_VERTEX = 1, MESH_NORMAL = 2, - MESH_COLOR = 4, - MESH_INDEX = 8 + MESH_TEXCOORDS = 4, + MESH_COLOR = 8, + MESH_INDEX = 16 }; struct Aabb { @@ -25,12 +26,14 @@ struct Material { float shininess; unsigned int tex; + bool tex_opaque; }; class Mesh { private: unsigned int vbo_vertices; unsigned int vbo_normals; + unsigned int vbo_texcoords; unsigned int vbo_colors; unsigned int ibo; @@ -47,6 +50,7 @@ public: std::string name; std::vector indices; std::vector vertices; + std::vector texcoords; std::vector normals; std::vector colors;