From 636ac92100bd78a9a13bbd1df8153027d0ceadae Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Mon, 24 Oct 2016 17:44:08 +0200 Subject: [PATCH] Add ProjectionMappingMode::selectNext and PrevSurface methods --- .../Modes/ProjectionMappingMode.cpp | 20 +++++++++++++------ src/Application/Modes/ProjectionMappingMode.h | 4 ++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/Application/Modes/ProjectionMappingMode.cpp b/src/Application/Modes/ProjectionMappingMode.cpp index f2a1177..de4d7e2 100644 --- a/src/Application/Modes/ProjectionMappingMode.cpp +++ b/src/Application/Modes/ProjectionMappingMode.cpp @@ -158,15 +158,11 @@ void ProjectionMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & arg break; case '.': - if(app->getSurfaceManager()->size()){ - app->getCmdManager()->exec(new SelNextSurfaceCmd(app->getSurfaceManager())); - } + selectNextSurface(app); break; case ',': - if(app->getSurfaceManager()->size()){ - app->getCmdManager()->exec(new SelPrevSurfaceCmd(app->getSurfaceManager())); - } + selectPrevSurface(app); break; case '>': @@ -414,5 +410,17 @@ void ProjectionMappingMode::onGuiEvent(Application * app, GuiEvent & e){ } } +void ProjectionMappingMode::selectNextSurface(Application * app){ + if(app->getSurfaceManager()->size()){ + app->getCmdManager()->exec(new SelNextSurfaceCmd(app->getSurfaceManager())); + } +} + +void ProjectionMappingMode::selectPrevSurface(Application * app){ + if(app->getSurfaceManager()->size()){ + app->getCmdManager()->exec(new SelPrevSurfaceCmd(app->getSurfaceManager())); + } +} + } // 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 1f72d5e..8d6fa68 100644 --- a/src/Application/Modes/ProjectionMappingMode.h +++ b/src/Application/Modes/ProjectionMappingMode.h @@ -53,6 +53,10 @@ class ProjectionMappingMode : public ApplicationBaseMode { void onBackgroundPressed(Application * app, GuiBackgroundEvent & e); void onGuiEvent(Application * app, GuiEvent & e); + + // Undoable public methods + void selectNextSurface(Application * app); + void selectPrevSurface(Application * app); private: ProjectionMappingMode();