Browse Source

Draw the surface manager in application states

Instead of the SurfaceManagerGui class.
master
Krisjanis Rijnieks 9 years ago
parent
commit
899c1db43f
  1. 1
      src/Application/PresentationState.cpp
  2. 1
      src/Application/ProjectionMappingState.cpp
  3. 1
      src/Application/SourceSelectionState.cpp
  4. 1
      src/Application/TextureMappingState.cpp

1
src/Application/PresentationState.cpp

@ -13,6 +13,7 @@ PresentationState * PresentationState::instance(){
} }
void PresentationState::draw(Application * app){ void PresentationState::draw(Application * app){
app->getSurfaceManager()->draw();
app->getGui()->draw(); app->getGui()->draw();
} }

1
src/Application/ProjectionMappingState.cpp

@ -17,6 +17,7 @@ ProjectionMappingState * ProjectionMappingState::instance(){
} }
void ProjectionMappingState::draw(Application * app){ void ProjectionMappingState::draw(Application * app){
app->getSurfaceManager()->draw();
app->getGui()->draw(); app->getGui()->draw();
/* /*

1
src/Application/SourceSelectionState.cpp

@ -13,6 +13,7 @@ SourceSelectionState * SourceSelectionState::instance(){
} }
void SourceSelectionState::draw(Application * app){ void SourceSelectionState::draw(Application * app){
app->getSurfaceManager()->draw();
app->getGui()->draw(); app->getGui()->draw();
Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager()); Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager());

1
src/Application/TextureMappingState.cpp

@ -14,6 +14,7 @@ TextureMappingState * TextureMappingState::instance(){
void TextureMappingState::draw(Application * app){ void TextureMappingState::draw(Application * app){
app->getGui()->draw(); app->getGui()->draw();
app->getSurfaceManager()->draw();
Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager()); Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager());
Gui::instance()->getSurfaceHighlightWidget().draw(); Gui::instance()->getSurfaceHighlightWidget().draw();

Loading…
Cancel
Save