From 59b00645ccfbade509b1d1694c9fcfc68e013a10 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 10 Dec 2009 00:32:11 +0100 Subject: Zu vmmlib migriert --- Trapezocube.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Trapezocube.h') diff --git a/Trapezocube.h b/Trapezocube.h index 3d64eaa..694ecde 100644 --- a/Trapezocube.h +++ b/Trapezocube.h @@ -2,7 +2,6 @@ #define _TRAPEZOCUBE_H_ #include "gl.h" -#include "Color.h" #include "Triangle.h" #include @@ -44,12 +43,12 @@ class Trapezocube this->z = z; } void setRotate(float r) {rotate = r;} - void setColor(Color col) {color = col;} + void setColor(const vmml::vec4f &col) {color = col;} std::list getTriangles(/*const Matrix &modelview*/); private: float x, y, z, widthfront, widthback, height, depth, rotate; - Color color; + vmml::vec4f color; }; #endif /*_TRAPEZOCUBE_H_ */ -- cgit v1.2.3