Commit 5f1e51df authored by Ellen Dekkers's avatar Ellen Dekkers
Browse files

bugfix

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14779 383ad7c9-94d9-4d36-a494-682f7c89f535
parent f3bc2576
...@@ -254,7 +254,8 @@ BSplineCurveNodeT<BSplineCurve>:: ...@@ -254,7 +254,8 @@ BSplineCurveNodeT<BSplineCurve>::
drawFancyCurve(GLState& _state) drawFancyCurve(GLState& _state)
{ {
// draw the curve // draw the curve
double cylinderRadius = _state.line_width() * 0.05; // double cylinderRadius = _state.line_width() * 0.05;
double cylinderRadius = _state.line_width() * 0.2;
for (int i = 0; i < (int)curve_samples_.size() - 1; ++i) for (int i = 0; i < (int)curve_samples_.size() - 1; ++i)
{ {
...@@ -272,13 +273,13 @@ BSplineCurveNodeT<BSplineCurve>:: ...@@ -272,13 +273,13 @@ BSplineCurveNodeT<BSplineCurve>::
generateHighlightColor(ACG::Vec4f _color) generateHighlightColor(ACG::Vec4f _color)
{ {
float c1 = _color[0]*1.5; float c1 = _color[0]*1.5;
c1 = c1 > 255.0 ? 255 : c1; c1 = c1 > 1.0 ? 1.0 : c1;
float c2 = _color[1]*1.5; float c2 = _color[1]*1.5;
c2 = c2 > 255.0 ? 255 : c2; c2 = c2 > 1.0 ? 1.0 : c2;
float c3 = _color[2]*1.5; float c3 = _color[2]*1.5;
c3 = c3 > 255.0 ? 255 : c3; c3 = c3 > 1.0 ? 1.0 : c3;
return Vec4f( c1, c2, c3, _color[3]); return Vec4f( c1, c2, c3, _color[3]);
} }
...@@ -393,7 +394,8 @@ drawFancyControlPolygon(DrawModes::DrawMode _drawMode, GLState& _state) ...@@ -393,7 +394,8 @@ drawFancyControlPolygon(DrawModes::DrawMode _drawMode, GLState& _state)
// draw line segments // draw line segments
if (_drawMode & DrawModes::WIREFRAME) if (_drawMode & DrawModes::WIREFRAME)
{ {
double cylinderRadius = _state.line_width() * 0.05; // double cylinderRadius = _state.line_width() * 0.05;
double cylinderRadius = _state.line_width() * 0.2;
// draw selection // draw selection
if( bsplineCurve_.edge_selections_available()) if( bsplineCurve_.edge_selections_available())
...@@ -432,7 +434,8 @@ drawFancyControlPolygon(DrawModes::DrawMode _drawMode, GLState& _state) ...@@ -432,7 +434,8 @@ drawFancyControlPolygon(DrawModes::DrawMode _drawMode, GLState& _state)
return; return;
// radius of sphere // radius of sphere
double sphereRadius = _state.point_size() * 0.05; // double sphereRadius = _state.point_size() * 0.05;
double sphereRadius = _state.point_size() * 0.25;
// draw selection // draw selection
if( bsplineCurve_.controlpoint_selections_available()) if( bsplineCurve_.controlpoint_selections_available())
......
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