Browse Source

Draw SourcesEditor directly from SourceSelectionState

master
Krisjanis Rijnieks 9 years ago
parent
commit
4adf3eb2e2
  1. 3
      src/Application/States/SourceSelectionState.cpp
  2. 2
      src/Surfaces/SurfaceManagerGui.cpp

3
src/Application/States/SourceSelectionState.cpp

@ -18,7 +18,8 @@ void SourceSelectionState::draw(Application * app){
app->getSurfaceManager()->draw();
ofPopStyle();
app->getGui()->draw();
// TODO: Separate SourcesEditor from SurfaceManagerGui, make it a widget
app->getGui()->getSourcesEditor()->draw();
Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager());
Gui::instance()->getSurfaceHighlightWidget().draw();

2
src/Surfaces/SurfaceManagerGui.cpp

@ -21,7 +21,7 @@ void SurfaceManagerGui::draw(){
}else if(guiMode == GuiMode::PROJECTION_MAPPING){
//projectionEditor.draw();
}else if(guiMode == GuiMode::SOURCE_SELECTION){
sourcesEditor.draw();
//sourcesEditor.draw();
}
}

Loading…
Cancel
Save