Commit a92a711e authored by Hans-Christian Ebke's avatar Hans-Christian Ebke
Browse files

Changed signature off GlutPrimitiveNode::add_primitive. (In a backwards...

Changed signature off GlutPrimitiveNode::add_primitive. (In a backwards compatible fashion, that is.)

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19834 383ad7c9-94d9-4d36-a494-682f7c89f535
parent da4df4e2
...@@ -285,12 +285,13 @@ draw(GLState& _state, const DrawModes::DrawMode& _drawMode) ...@@ -285,12 +285,13 @@ draw(GLState& _state, const DrawModes::DrawMode& _drawMode)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void size_t
GlutPrimitiveNode:: GlutPrimitiveNode::
add_primitive(GlutPrimitiveType _type, Vec3d _pos, Vec3d _axis, ACG::Vec4f _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);
return primitives_.size() - 1;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
......
...@@ -178,7 +178,12 @@ public: ...@@ -178,7 +178,12 @@ public:
/// destructor /// destructor
virtual ~GlutPrimitiveNode() {} virtual ~GlutPrimitiveNode() {}
void add_primitive(GlutPrimitiveType _type, Vec3d _pos, Vec3d _axis, ACG::Vec4f _color); /**
* Adds a primitive and returns its index.
*
* @return the index of the new primitive.
*/
size_t add_primitive(GlutPrimitiveType _type, Vec3d _pos, Vec3d _axis, ACG::Vec4f _color);
void clear(){primitives_.clear();}; void clear(){primitives_.clear();};
......
Supports Markdown
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