src/model filenames cleanup, parse .map texture coordinates, early loading of material textures

1 files changed, 4 insertions, 2 deletions

diff --git a/src/model/primitives.cc b/src/model/primitives.cc
index 5e58b50..8eec0f4 100644
--- a/src/model/primitives.cc
+++ b/src/model/primitives.cc
@@ -27,18 +27,20 @@ Primitives::~Primitives()
 	primitives_quads.clear();
 }
 
-void Primitives::add_triangle(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2,
+Triangle *Primitives::add_triangle(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2,
 			      math::Vector3f const &normal, bool detail)
 {
 	Triangle *triangle = new Triangle(v0, v1, v2, normal, detail);
 	primitives_triangles.push_back(triangle);
+	return triangle;
 }
 
-void Primitives::add_quad(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2, math::Vector3f const &v3,
+Quad *Primitives::add_quad(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2, math::Vector3f const &v3,
 			  math::Vector3f const &normal, bool detail)
 {
 	Quad *quad = new Quad(v0, v1, v2, v3, normal, detail);
 	primitives_quads.push_back(quad);
+	return quad;
 }
 
 }