Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/model/primitives.h')
-rw-r--r--src/model/primitives.h7
1 files changed, 4 insertions, 3 deletions
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<Quad *> 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;
};
}