Commit f9a0330b authored by Jan Möbius's avatar Jan Möbius
Browse files

Make color in GlutPrimitiveNode Vec4f

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@8992 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 84df3cca
...@@ -223,7 +223,7 @@ draw(GLState& _state, DrawModes::DrawMode _drawMode) ...@@ -223,7 +223,7 @@ draw(GLState& _state, DrawModes::DrawMode _drawMode)
void void
GlutPrimitiveNode:: GlutPrimitiveNode::
add_primitive(GlutPrimitiveType _type, Vec3d _pos, Vec3d _axis, ACG::Vec3uc _color) add_primitive(GlutPrimitiveType _type, Vec3d _pos, Vec3d _axis, ACG::Vec4f _color)
{ {
Primitive p(_type, _pos, _axis, _color); Primitive p(_type, _pos, _axis, _color);
primitives_.push_back(p); primitives_.push_back(p);
......
...@@ -103,7 +103,7 @@ public: ...@@ -103,7 +103,7 @@ public:
GlutPrimitiveType type; // glut primitive type GlutPrimitiveType type; // glut primitive type
ACG::Vec3uc color; // color ACG::Vec4f color; // color
// glut primitive resolution // glut primitive resolution
double size; double size;
...@@ -123,7 +123,7 @@ public: ...@@ -123,7 +123,7 @@ public:
stacks = 20; stacks = 20;
} }
Primitive(GlutPrimitiveType _t, Vec3d _p, Vec3d _a, ACG::Vec3uc _c) Primitive(GlutPrimitiveType _t, Vec3d _p, Vec3d _a, ACG::Vec4f _c)
{ {
type = _t; type = _t;
position = _p; position = _p;
...@@ -182,7 +182,7 @@ public: ...@@ -182,7 +182,7 @@ public:
/// destructor /// destructor
virtual ~GlutPrimitiveNode() {} virtual ~GlutPrimitiveNode() {}
void add_primitive(GlutPrimitiveType _type, Vec3d _pos, Vec3d _axis, ACG::Vec3uc _color); void add_primitive(GlutPrimitiveType _type, Vec3d _pos, Vec3d _axis, ACG::Vec4f _color);
void clear(){primitives_.clear();}; void clear(){primitives_.clear();};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment