diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-07-16 18:34:54 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-07-16 18:34:54 +0000 |
| commit | 70b4d79d501be4802a06770f02b8f49e2c14e8a7 (patch) | |
| tree | b868e13489f8ef4377c7ac6c7d900ee854270b03 /src/model/primitives.h | |
| parent | 1b8ceba3a173ff59939042713cd07a65e83193f1 (diff) | |
Removes unused collor array support, disable bullet in sys/sys.h
Diffstat (limited to 'src/model/primitives.h')
| -rw-r--r-- | src/model/primitives.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/model/primitives.h b/src/model/primitives.h index 2b53b5a..d113961 100644 --- a/src/model/primitives.h +++ b/src/model/primitives.h @@ -10,7 +10,6 @@ #include <list> #include "math/vector3f.h" -#include "math/color.h" #include "model/material.h" #include "model/triangle.h" #include "model/quad.h" @@ -51,12 +50,11 @@ public: /// add a Triangle primitive void add_triangle(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2, - math::Vector3f const &normal, math::Color const &color, bool detail); - + math::Vector3f const &normal, bool detail); + /// add a Quad primitive void add_quad(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2, math::Vector3f const &v3, - math::Vector3f const &normal, math::Color const &color, bool detail); - + math::Vector3f const &normal, bool detail); private: Triangles primitives_triangles; Quads primitives_quads; |