Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-12 20:22:20 +0000
committerStijn Buys <ingar@osirion.org>2009-08-12 20:22:20 +0000
commitea18c25aef4aa0104852f314dd76e4ce446673f3 (patch)
tree928d7ecef63acda7b32d5243ef5cf14760e555c9 /src/model/primitives.cc
parent83b66522dfcad1b2428ce4fd81d83e39a051a4c5 (diff)
triangle/quad code cleanup,corrects submodel origin, enable quad rendering again
Diffstat (limited to 'src/model/primitives.cc')
-rw-r--r--src/model/primitives.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/model/primitives.cc b/src/model/primitives.cc
index 8eec0f4..f21a6d5 100644
--- a/src/model/primitives.cc
+++ b/src/model/primitives.cc
@@ -27,20 +27,14 @@ Primitives::~Primitives()
primitives_quads.clear();
}
-Triangle *Primitives::add_triangle(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2,
- math::Vector3f const &normal, bool detail)
+void Primitives::add_triangle(Triangle *triangle)
{
- Triangle *triangle = new Triangle(v0, v1, v2, normal, detail);
primitives_triangles.push_back(triangle);
- return triangle;
}
-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)
+void Primitives::add_quad(Quad *quad)
{
- Quad *quad = new Quad(v0, v1, v2, v3, normal, detail);
primitives_quads.push_back(quad);
- return quad;
}
}