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.h23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/model/primitives.h b/src/model/primitives.h
index 84c3f9b..43fd380 100644
--- a/src/model/primitives.h
+++ b/src/model/primitives.h
@@ -23,31 +23,28 @@ class Primitives
public:
/// type definition for a list of triangles
typedef std::list<Triangle *> Triangles;
-
+
/// type definition for a list of quads
typedef std::list<Quad *> Quads;
-
+
Primitives(Material *material);
~Primitives();
-
+
/// the material to be used for these primitives
- inline const Material *material() const
- {
+ inline const Material *material() const {
return primitives_material;
}
-
+
/// list of triangles
- inline Triangles & triangles()
- {
+ inline Triangles & triangles() {
return primitives_triangles;
}
-
+
/// list of quads
- inline Quads & quads()
- {
+ inline Quads & quads() {
return primitives_quads;
}
-
+
/// add a Triangle primitive
void add_triangle(Triangle *triangle);
@@ -57,7 +54,7 @@ public:
private:
Triangles primitives_triangles;
Quads primitives_quads;
-
+
Material * primitives_material;
};