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, 5 insertions, 5 deletions

diff --git a/src/o3d/tri.cpp b/src/o3d/tri.cpp
index 08f5e7e..73410bf 100644
--- a/src/o3d/tri.cpp
+++ b/src/o3d/tri.cpp
@@ -1,16 +1,16 @@
-#include "o3d/tri_vertex.h"
+#include "o3d/tri.h"
 #include <vector>
 #include "math/vector.h"
 #include "o3d/vertex_data.h"
 #include "o3d/deriv_vertex.h"
 #include "o3d/vertex.h"
-#include "o3d/tri_deriv_vertex.h"
+#include "o3d/tri_deriv.h"
 
 using namespace engine::o3d;
 
-TriangleVertex4::TriangleVertex4(Vertex4 vertex1, Vertex4 vertex2, Vertex4 vertex3) : vertex1{vertex1}, vertex2{vertex2}, vertex3{vertex3} {
+Triangle::Triangle(Vertex vertex1, Vertex vertex2, Vertex vertex3) : vertex1{vertex1}, vertex2{vertex2}, vertex3{vertex3} {
 }
 
-TriangleDerivedVertex4 TriangleVertex4::to_derived() const {
-    return {{vertex1.point, 1.f, 0.f}, {vertex2.point, 0.f, 1.f}, {vertex3.point, 0.f, 0.f}};
+TriangleDerived Triangle::to_derived() const {
+    return {{vertex1.vertex, 1.f, 0.f}, {vertex2.vertex, 0.f, 1.f}, {vertex3.vertex, 0.f, 0.f}};
 }