projects
/
hair
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fixed materials etc (not all), improvements
[hair]
/
src
/
mesh.h
diff --git
a/src/mesh.h
b/src/mesh.h
index
7ca25c2
..
ec93ab1
100644
(file)
--- a/
src/mesh.h
+++ b/
src/mesh.h
@@
-19,6
+19,14
@@
struct Aabb {
Vec3 v1;
};
+struct Material {
+ Vec3 diffuse;
+ Vec3 specular;
+ float shininess;
+
+ unsigned int tex;
+};
+
class Mesh {
private:
unsigned int vbo_vertices;
@@
-34,6
+42,7
@@
public:
~Mesh();
Aabb bbox;
+ Material mtl;
std::string name;
std::vector<uint16_t> indices;