Browse Source

Move projection editor draw to ProjectionMappingState

master
Krisjanis Rijnieks 9 years ago
parent
commit
aeae570b73
  1. 7
      src/Application/States/ProjectionMappingState.cpp
  2. 2
      src/Surfaces/SurfaceManagerGui.cpp

7
src/Application/States/ProjectionMappingState.cpp

@ -26,11 +26,10 @@ void ProjectionMappingState::draw(Application * app){
app->getSurfaceManager()->draw(); app->getSurfaceManager()->draw();
ofPopStyle(); ofPopStyle();
app->getGui()->draw(); // TODO: Extract projection editor, make it a widget
app->getGui()->getProjectionEditor()->draw();
/* // Draw scale widget. The size of the widget is being set on surface select.
Draw scale widget. The size of the widget is being set on surface select.
*/
BaseSurface * selectedSurface = app->getSurfaceManager()->getSelectedSurface(); BaseSurface * selectedSurface = app->getSurfaceManager()->getSelectedSurface();
if(selectedSurface != 0){ if(selectedSurface != 0){
Gui::instance()->getScaleWidget().draw(); Gui::instance()->getScaleWidget().draw();

2
src/Surfaces/SurfaceManagerGui.cpp

@ -19,7 +19,7 @@ void SurfaceManagerGui::draw(){
if(guiMode == GuiMode::TEXTURE_MAPPING){ if(guiMode == GuiMode::TEXTURE_MAPPING){
// TODO: Remove this if else together with the SurfaceManagerGui // TODO: Remove this if else together with the SurfaceManagerGui
}else if(guiMode == GuiMode::PROJECTION_MAPPING){ }else if(guiMode == GuiMode::PROJECTION_MAPPING){
projectionEditor.draw(); //projectionEditor.draw();
}else if(guiMode == GuiMode::SOURCE_SELECTION){ }else if(guiMode == GuiMode::SOURCE_SELECTION){
sourcesEditor.draw(); sourcesEditor.draw();
} }

Loading…
Cancel
Save