Browse Source

Add setting surface color and opacity in ..State::draw()

master
Krisjanis Rijnieks 9 years ago
parent
commit
a469046721
  1. 4
      src/Application/States/PresentationState.cpp
  2. 4
      src/Application/States/ProjectionMappingState.cpp
  3. 4
      src/Application/States/SourceSelectionState.cpp
  4. 4
      src/Application/States/TextureMappingState.cpp

4
src/Application/States/PresentationState.cpp

@ -13,7 +13,11 @@ PresentationState * PresentationState::instance(){
} }
void PresentationState::draw(Application * app){ void PresentationState::draw(Application * app){
ofPushStyle();
ofSetColor(255, 255, 255, 255);
app->getSurfaceManager()->draw(); app->getSurfaceManager()->draw();
ofPopStyle();
app->getGui()->draw(); app->getGui()->draw();
} }

4
src/Application/States/ProjectionMappingState.cpp

@ -17,7 +17,11 @@ ProjectionMappingState * ProjectionMappingState::instance(){
} }
void ProjectionMappingState::draw(Application * app){ void ProjectionMappingState::draw(Application * app){
ofPushStyle();
ofSetColor(255, 255, 255, 255);
app->getSurfaceManager()->draw(); app->getSurfaceManager()->draw();
ofPopStyle();
app->getGui()->draw(); app->getGui()->draw();
/* /*

4
src/Application/States/SourceSelectionState.cpp

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

4
src/Application/States/TextureMappingState.cpp

@ -14,7 +14,11 @@ TextureMappingState * TextureMappingState::instance(){
void TextureMappingState::draw(Application * app){ void TextureMappingState::draw(Application * app){
app->getGui()->draw(); app->getGui()->draw();
ofPushStyle();
ofSetColor(255, 255, 255, 150);
app->getSurfaceManager()->draw(); app->getSurfaceManager()->draw();
ofPopStyle();
Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager()); Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager());
Gui::instance()->getSurfaceHighlightWidget().draw(); Gui::instance()->getSurfaceHighlightWidget().draw();

Loading…
Cancel
Save