From ba9d61266c5f5d3d618e55bf6b85a2569c04c29f Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 8 Feb 2009 16:50:54 +0000 Subject: materials system --- src/model/primitives.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/model/primitives.h') diff --git a/src/model/primitives.h b/src/model/primitives.h index d11ac61..2b53b5a 100644 --- a/src/model/primitives.h +++ b/src/model/primitives.h @@ -11,6 +11,7 @@ #include "math/vector3f.h" #include "math/color.h" +#include "model/material.h" #include "model/triangle.h" #include "model/quad.h" @@ -27,11 +28,11 @@ public: /// type definition for a list of quads typedef std::list Quads; - Primitives(unsigned int material); + Primitives(Material *material); ~Primitives(); /// the material to be used for these primitives - inline unsigned int material() const + inline const Material *material() const { return primitives_material; } @@ -60,7 +61,7 @@ private: Triangles primitives_triangles; Quads primitives_quads; - unsigned int primitives_material; + Material * primitives_material; }; } -- cgit v1.2.3