improved mesh definition

- In the context of mesh definition, splited
  indices into vertex index, normal index and
  vertex data index to be able to specify
  different normals and vertex data for
  different faces using the same vertex

1 files changed, 11 insertions, 10 deletions

diff --git a/src/o3d/tri.h b/src/o3d/tri.h
index 715f649..7fa37fe 100644
--- a/src/o3d/tri.h
+++ b/src/o3d/tri.h
@@ -1,22 +1,23 @@
-#ifndef O3D_TRI_VERTEX_H
-#define O3D_TRI_VERTEX_H
+#ifndef O3D_TRI_H
+#define O3D_TRI_H
 
 #include <vector>
 #include "o3d/vertex.h"
-#include "o3d/tri_deriv_vertex.h"
+#include "o3d/tri.h"
+#include "o3d/tri_deriv.h"
 
 namespace engine::o3d {
 
-class TriangleVertex4 {
+class Triangle {
     public:
-        Vertex4 vertex1;
-        Vertex4 vertex2;
-        Vertex4 vertex3;
+        Vertex vertex1;
+        Vertex vertex2;
+        Vertex vertex3;
 
-        TriangleVertex4(Vertex4 vertex1, Vertex4 vertex2, Vertex4 vertex3);
-        TriangleDerivedVertex4 to_derived() const;
+        Triangle(Vertex vertex1, Vertex vertex2, Vertex vertex3);
+        TriangleDerived to_derived() const;
 };
 
 }
 
-#endif // O3D_TRI_VERTEX_H
+#endif // O3D_TRI_H