Commit 3fca812a authored by Ellen Dekkers's avatar Ellen Dekkers
Browse files

Color bug fixed

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@10148 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 106c0390
......@@ -739,23 +739,6 @@ draw_cylinder( const Point& _p0, const Point& _axis, double _r, GLState& _state,
//----------------------------------------------------------------------------
template <class BSplineCurve>
void
BSplineCurveNodeT<BSplineCurve>::
set_random_color()
{
// set random color
#ifndef WIN32
srand((unsigned) time(NULL));
#endif
// set_color(OpenMesh::Vec4f(0.2 + double(rand())/double(RAND_MAX)*0.8,
// 0.2 + double(rand())/double(RAND_MAX)*0.8,
// 0.2 + double(rand())/double(RAND_MAX)*0.8,
// 1.0));
}
//----------------------------------------------------------------------------
template <class BSplineCurve>
void
BSplineCurveNodeT<BSplineCurve>::
......
......@@ -117,10 +117,6 @@ public:
/// Destructor
~BSplineCurveNodeT() {}
// enum BSplineDrawMode {
// DIRECT = 0,
// GLU_NURBS = 1
// };
enum BSplineDrawMode {
NORMAL = 0,
......@@ -133,7 +129,6 @@ public:
KNOTVECTOR = 2
};
void set_random_color();
BSplineCurve& bsplineCurve() { return bsplineCurve_; }
......
......@@ -173,6 +173,8 @@ void BSplineCurveObject::init(BSplineCurve* _curve) {
std::cerr << "Error when creating BSplineCurve Object! materialNode is NULL!" << std::endl;
splineCurveNode_ = new ACG::SceneGraph::BSplineCurveNodeT< BSplineCurve >(*splineCurve_, materialNode() , "NEW BSplineCurveNode");
materialNode()->set_color(ACG::Vec4f(178.0f/255.0, 34.0/255.0, 34.0/255.0, 1.0));
}
// ===============================================================================
......
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