diff options
Diffstat (limited to 'Trapezocube.h')
| -rw-r--r-- | Trapezocube.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Trapezocube.h b/Trapezocube.h index 533cbf8..c291e21 100644 --- a/Trapezocube.h +++ b/Trapezocube.h @@ -2,15 +2,15 @@ #define _TRAPEZOCUBE_H_ #include "gl.h" -#include "Color.h" #include "Triangle.h" #include <list> class Trapezocube { public: - Trapezocube(): widthfront(0), widthback(0), height(0), depth(0), x(0), y(0), z(0), rotate(0), color(0) {} - Trapezocube(float widthfront, float widthback, float height, float depth, float x, float y, float z, float rotate, Color col) { + Trapezocube(): widthfront(0), widthback(0), height(0), depth(0), x(0), y(0), z(0), rotate(0) {} + + Trapezocube(float widthfront, float widthback, float height, float depth, float x, float y, float z, float rotate, const vmml::vec4f &col) { setSize(widthfront, widthback, height, depth); setPos(x, y, z); setRotate(rotate); @@ -24,7 +24,8 @@ class Trapezocube float getPosY() {return y;} float getPosZ() {return z;} float getRotate() {return rotate;} - Color getColor() {return color;} + vmml::vec4f getColor() {return color;} + void setSize(float wf, float wb, float h, float d) { widthfront = wf; @@ -39,12 +40,12 @@ class Trapezocube this->z = z; } void setRotate(float r) {rotate = r;} - void setColor(Color col) {color = col;} - std::list<Triangle> getTriangles(/*const Matrix &modelview*/); + void setColor(const vmml::vec4f &col) {color = col;} + std::list<Triangle> getTriangles(); private: float x, y, z, widthfront, widthback, height, depth, rotate; - Color color; + vmml::vec4f color; }; #endif /*_TRAPEZOCUBE_H_ */ |