From 17d7b95760703ad5ec2b0610b250b53df6b93981 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sat, 28 Jan 2017 18:05:40 +0100 Subject: [PATCH] Remove ProjectionMappingMode::createSurface Leave only Application::createSurface --- src/Application/Modes/ProjectionMappingMode.cpp | 13 ++++--------- src/Application/Modes/ProjectionMappingMode.h | 2 -- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Application/Modes/ProjectionMappingMode.cpp b/src/Application/Modes/ProjectionMappingMode.cpp index c6c74e2..b015ecf 100644 --- a/src/Application/Modes/ProjectionMappingMode.cpp +++ b/src/Application/Modes/ProjectionMappingMode.cpp @@ -53,19 +53,19 @@ void ProjectionMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & arg switch(args.key){ case 't': - createSurface(app, SurfaceType::TRIANGLE_SURFACE); + app->createSurface(SurfaceType::TRIANGLE_SURFACE); break; case 'q': - createSurface(app, SurfaceType::QUAD_SURFACE); + app->createSurface(SurfaceType::QUAD_SURFACE); break; case 'g': - createSurface(app, SurfaceType::GRID_WARP_SURFACE); + app->createSurface(SurfaceType::GRID_WARP_SURFACE); break; case 'h': - createSurface(app, SurfaceType::HEXAGON_SURFACE); + app->createSurface(SurfaceType::HEXAGON_SURFACE); break; case OF_KEY_BACKSPACE: @@ -355,10 +355,5 @@ void ProjectionMappingMode::moveSelection(Application * app, ofVec2f by){ app->getSurfaceManager(), by)); } -void ProjectionMappingMode::createSurface(Application *app, SurfaceType type){ - app->getCmdManager()->exec( - new AddSurfaceCmd(app->getSurfaceManager(), type)); -} - } // namespace piMapper } // namespace ofx \ No newline at end of file diff --git a/src/Application/Modes/ProjectionMappingMode.h b/src/Application/Modes/ProjectionMappingMode.h index eedccc2..275c093 100644 --- a/src/Application/Modes/ProjectionMappingMode.h +++ b/src/Application/Modes/ProjectionMappingMode.h @@ -4,7 +4,6 @@ #include "ofEvents.h" #include "ofLog.h" #include "ofGraphics.h" -#include "AddSurfaceCmd.h" #include "SelNextSurfaceCmd.h" #include "SelPrevSurfaceCmd.h" #include "SelNextVertexCmd.h" @@ -49,7 +48,6 @@ class ProjectionMappingMode : public ApplicationBaseMode { void selectNextVertex(Application * app); void selectPrevVertex(Application * app); void moveSelection(Application * app, ofVec2f by); - void createSurface(Application * app, SurfaceType type); private: ProjectionMappingMode();