From c4f9cf50052e82c1cca9a52bac2de4cc396dfec6 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Fri, 9 Sep 2016 16:05:09 +0200 Subject: [PATCH] Remove surfaceManager->draw() from SurfaceManagerGui::draw() --- src/Surfaces/SurfaceManagerGui.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp index 5e519c5..0b3acb8 100644 --- a/src/Surfaces/SurfaceManagerGui.cpp +++ b/src/Surfaces/SurfaceManagerGui.cpp @@ -41,9 +41,7 @@ void SurfaceManagerGui::draw(){ return; } - if(guiMode == GuiMode::NONE){ - surfaceManager->draw(); - }else if(guiMode == GuiMode::TEXTURE_MAPPING){ + if(guiMode == GuiMode::TEXTURE_MAPPING){ // draw the texture of the selected surface if(surfaceManager->getSelectedSurface() != 0){ bool normalizedTexCoords = ofGetUsingNormalizedTexCoords(); @@ -58,26 +56,11 @@ void SurfaceManagerGui::draw(){ } } - // draw surfaces with opacity - ofPushStyle(); - ofSetColor(255, 255, 255, 200); - surfaceManager->draw(); - ofPopStyle(); - // draw texture editing GUI on top textureEditor.draw(); - }else if(guiMode == GuiMode::PROJECTION_MAPPING){ - // draw projection surfaces first - surfaceManager->draw(); - - // draw projection mapping editing gui projectionEditor.draw(); - }else if(guiMode == GuiMode::SOURCE_SELECTION){ - // draw projection surfaces first - surfaceManager->draw(); - sourcesEditor.draw(); } }