Commit 0d67d17f authored by Jan Möbius's avatar Jan Möbius

Switched pointNode to Vec4f

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13584 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 44e12ce4
......@@ -79,7 +79,7 @@ boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
//----------------------------------------------------------------------------
DrawModes::DrawMode
DrawModes::DrawMode
PointNode::
availableDrawModes() const
{
......@@ -135,7 +135,8 @@ draw(GLState& /* _state */ , const DrawModes::DrawMode& _drawMode)
ACG::GLState::enableClientState(GL_COLOR_ARRAY);
ACG::GLState::colorPointer(&colors_[0]);
glDrawArrays(GL_POINTS, 0, points_.size());
}
} else
std::cerr << "Mismatch size!" << std::endl;
}
......
......@@ -85,7 +85,7 @@ public:
typedef std::vector<ACG::Vec3d> PointVector;
typedef PointVector::iterator PointIter;
typedef PointVector::const_iterator ConstPointIter;
typedef std::vector<ACG::Vec3uc> ColorVector;
typedef std::vector<ACG::Vec4f> ColorVector;
typedef ColorVector::iterator ColorIter;
typedef ColorVector::const_iterator ConstColorIter;
......@@ -121,7 +121,7 @@ public:
/// add normal
void add_normal(const ACG::Vec3d& _n) { normals_.push_back(_n); }
/// add color
void add_color(const ACG::Vec3uc& _c) { colors_.push_back(_c); }
void add_color(const ACG::Vec4f& _c) { colors_.push_back(_c); }
/// how many points?
unsigned int n_points() const { return points_.size(); }
......
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