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

Fixing rendering behavior of StatusNodes so they can be used in a standalone fashion.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@20576 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 713eeb93
...@@ -111,6 +111,7 @@ availableDrawModes() const ...@@ -111,6 +111,7 @@ availableDrawModes() const
{ {
return (DrawModes::POINTS | return (DrawModes::POINTS |
DrawModes::WIREFRAME | DrawModes::WIREFRAME |
DrawModes::EDGES |
DrawModes::SOLID_FLAT_SHADED); DrawModes::SOLID_FLAT_SHADED);
} }
...@@ -369,11 +370,21 @@ draw(GLState& _state, const DrawModes::DrawMode& _drawMode) ...@@ -369,11 +370,21 @@ draw(GLState& _state, const DrawModes::DrawMode& _drawMode)
bool shaded = false, bool shaded = false,
smooth = false, smooth = false,
wires = _drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_WIREFRAME) >= 0, wires = ((this->drawMode() == DrawModes::DEFAULT) ||
points = _drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_POINT) >= 0, this->drawMode().getLayerIndexByPrimitive(DrawModes::PRIMITIVE_WIREFRAME) >= 0 ||
edges = _drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_EDGE) >= 0, _drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_WIREFRAME) >= 0),
halfedges = _drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_HALFEDGE) >= 0, points = ((this->drawMode() == DrawModes::DEFAULT) ||
faces = _drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_POLYGON) >= 0; this->drawMode().getLayerIndexByPrimitive(DrawModes::PRIMITIVE_POINT) >= 0 ||
_drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_POINT) >= 0),
edges = (this->drawMode() == DrawModes::DEFAULT ||
this->drawMode().getLayerIndexByPrimitive(DrawModes::PRIMITIVE_EDGE) >= 0 ||
_drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_EDGE) >= 0),
halfedges = ((this->drawMode() == DrawModes::DEFAULT) ||
this->drawMode().getLayerIndexByPrimitive(DrawModes::PRIMITIVE_HALFEDGE) >= 0 ||
_drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_HALFEDGE) >= 0),
faces = ((this->drawMode() == DrawModes::DEFAULT) ||
this->drawMode().getLayerIndexByPrimitive(DrawModes::PRIMITIVE_POLYGON) >= 0 ||
_drawMode.getLayerIndexByPrimitive(DrawModes::PRIMITIVE_POLYGON) >= 0);
for (unsigned int i = 0; i < _drawMode.getNumLayers(); ++i) for (unsigned int i = 0; i < _drawMode.getNumLayers(); ++i)
{ {
......
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