From a469046721f9a2267fedec98fe24f22c2a1c1321 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sat, 10 Sep 2016 17:33:51 +0200 Subject: [PATCH] Add setting surface color and opacity in ..State::draw() --- src/Application/States/PresentationState.cpp | 4 ++++ src/Application/States/ProjectionMappingState.cpp | 4 ++++ src/Application/States/SourceSelectionState.cpp | 4 ++++ src/Application/States/TextureMappingState.cpp | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/src/Application/States/PresentationState.cpp b/src/Application/States/PresentationState.cpp index b846c06..eed1edb 100644 --- a/src/Application/States/PresentationState.cpp +++ b/src/Application/States/PresentationState.cpp @@ -13,7 +13,11 @@ PresentationState * PresentationState::instance(){ } void PresentationState::draw(Application * app){ + ofPushStyle(); + ofSetColor(255, 255, 255, 255); app->getSurfaceManager()->draw(); + ofPopStyle(); + app->getGui()->draw(); } diff --git a/src/Application/States/ProjectionMappingState.cpp b/src/Application/States/ProjectionMappingState.cpp index 073a4bf..a8eb605 100644 --- a/src/Application/States/ProjectionMappingState.cpp +++ b/src/Application/States/ProjectionMappingState.cpp @@ -17,7 +17,11 @@ ProjectionMappingState * ProjectionMappingState::instance(){ } void ProjectionMappingState::draw(Application * app){ + ofPushStyle(); + ofSetColor(255, 255, 255, 255); app->getSurfaceManager()->draw(); + ofPopStyle(); + app->getGui()->draw(); /* diff --git a/src/Application/States/SourceSelectionState.cpp b/src/Application/States/SourceSelectionState.cpp index 077bb57..4223822 100644 --- a/src/Application/States/SourceSelectionState.cpp +++ b/src/Application/States/SourceSelectionState.cpp @@ -13,7 +13,11 @@ SourceSelectionState * SourceSelectionState::instance(){ } void SourceSelectionState::draw(Application * app){ + ofPushStyle(); + ofSetColor(255, 255, 255, 255); app->getSurfaceManager()->draw(); + ofPopStyle(); + app->getGui()->draw(); Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager()); diff --git a/src/Application/States/TextureMappingState.cpp b/src/Application/States/TextureMappingState.cpp index 14f4fbd..d5c471e 100644 --- a/src/Application/States/TextureMappingState.cpp +++ b/src/Application/States/TextureMappingState.cpp @@ -14,7 +14,11 @@ TextureMappingState * TextureMappingState::instance(){ void TextureMappingState::draw(Application * app){ app->getGui()->draw(); + + ofPushStyle(); + ofSetColor(255, 255, 255, 150); app->getSurfaceManager()->draw(); + ofPopStyle(); Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager()); Gui::instance()->getSurfaceHighlightWidget().draw();