From afcf022154a1716d2df7e3d659a9492de38689d7 Mon Sep 17 00:00:00 2001 From: Martin Heistermann <git@mheistermann.de> Date: Tue, 19 Feb 2019 17:44:43 +0100 Subject: [PATCH] ACG DrawModeConverter: convert dynamically added drawmodes (e.g. for OVM), so they can be used for ViewControl scripting --- ACGHelper/DrawModeConverter.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ACGHelper/DrawModeConverter.cc b/ACGHelper/DrawModeConverter.cc index a01d2038..8424983c 100644 --- a/ACGHelper/DrawModeConverter.cc +++ b/ACGHelper/DrawModeConverter.cc @@ -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()); } } -- GitLab