diff options
Diffstat (limited to 'include/triangle.hpp')
| -rw-r--r-- | include/triangle.hpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/triangle.hpp b/include/triangle.hpp index 456a238..5a62aec 100644 --- a/include/triangle.hpp +++ b/include/triangle.hpp @@ -1,15 +1,18 @@ #ifndef __TRIANGLE_HPP_
#define __TRIANGLE_HPP_
+#include "material.hpp"
+
struct vertex {
vec3 position;
vec3 normal;
+ vec3 uv;
};
struct triangle {
triangle() = default;
- triangle(vertex v1, vertex v2, vertex v3)
- : v1(v1), v2(v2), v3(v3)
+ triangle(vertex v1, vertex v2, vertex v3, material mat)
+ : v1(v1), v2(v2), v3(v3), mat(mat)
{}
vec3 center() {
@@ -19,6 +22,7 @@ struct triangle { vertex v1;
vertex v2;
vertex v3;
+ material mat;
};
#endif // !__TRIANGLE_HPP_
|
