Commit 10026dbe authored by Jan Möbius's avatar Jan Möbius

Merge branch 'drawmode-scripting' into 'master'

ACG DrawModeConverter: also convert dynamically added drawmodes

See merge request !132
parents 276726d9 afcf0221
......@@ -51,6 +51,7 @@
//== INCLUDES =================================================================
#include "ACG/Scenegraph/DrawModes.hh"
#include "DrawModeConverter.hh"
//== TYPEDEFS =================================================================
......@@ -175,6 +176,8 @@ ACG::SceneGraph::DrawModes::DrawMode listToDrawMode( std::vector< QString > _dra
drawMode = drawMode | ACG::SceneGraph::DrawModes::SOLID_SHADER;
} else if( _draw_modes[i] == "SOLID_SMOOTH_SHADED_FEATURES" ) {
drawMode = drawMode | ACG::SceneGraph::DrawModes::SOLID_SMOOTH_SHADED_FEATURES;
} else {
drawMode |= ACG::SceneGraph::DrawModes::getDrawMode(_draw_modes[i].toStdString());
}
}
......@@ -240,6 +243,8 @@ ACG::SceneGraph::DrawModes::DrawMode descriptionsToDrawMode ( std::vector< QStri
drawMode = drawMode | ACG::SceneGraph::DrawModes::SOLID_SHADER;
} else if( _draw_modes[i] == "Solid (smooth shaded, features)" ) {
drawMode = drawMode | ACG::SceneGraph::DrawModes::SOLID_SMOOTH_SHADED_FEATURES;
} else {
drawMode |= ACG::SceneGraph::DrawModes::getDrawMode(_draw_modes[i].toStdString());
}
}
......
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