diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp index 0351444..fb18751 100644 --- a/src/Application/Application.cpp +++ b/src/Application/Application.cpp @@ -378,6 +378,22 @@ void Application::selectPrevVertex(){ } } +void Application::selectNextTexCoord(){ + if(getSurfaceManager()->getSelectedSurface() != 0){ + getCmdManager()->exec( + new SelNextTexCoordCmd( + &Gui::instance()->getTextureEditorWidget())); + } +} + +void Application::selectPrevTexCoord(){ + if(getSurfaceManager()->getSelectedSurface() != 0){ + getCmdManager()->exec( + new SelPrevTexCoordCmd( + &Gui::instance()->getTextureEditorWidget())); + } +} + void Application::moveSelection(ofVec2f by){ getCmdManager()->exec(new MvSelectionCmd(getSurfaceManager(), by)); } diff --git a/src/Application/Application.h b/src/Application/Application.h index 41e15a7..ad62955 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -35,6 +35,8 @@ #include "SelSurfaceCmd.h" #include "MvSelectionCmd.h" #include "ToggleAnimatedSourceCmd.h" +#include "SelNextTexCoordCmd.h" +#include "SelPrevTexCoordCmd.h" // Modes #include "ApplicationBaseMode.h" @@ -105,6 +107,8 @@ class Application : public KeyListener { void selectPrevSurface(); void selectNextVertex(); void selectPrevVertex(); + void selectNextTexCoord(); + void selectPrevTexCoord(); void moveSelection(ofVec2f by); void setPresentationMode(); diff --git a/src/Application/Modes/TextureMappingMode.cpp b/src/Application/Modes/TextureMappingMode.cpp index dfc96e4..b3c990a 100644 --- a/src/Application/Modes/TextureMappingMode.cpp +++ b/src/Application/Modes/TextureMappingMode.cpp @@ -109,11 +109,11 @@ void TextureMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & args){ break; case '>': - selectNextVertex(app); + app->selectNextTexCoord(); break; case '<': - selectPrevVertex(app); + app->selectPrevTexCoord(); break; case ' ': @@ -294,22 +294,6 @@ void TextureMappingMode::moveSelection(Application * app, ofVec2f by){ } } -void TextureMappingMode::selectNextVertex(Application * app){ - if(app->getSurfaceManager()->getSelectedSurface() != 0){ - app->getCmdManager()->exec( - new SelNextTexCoordCmd( - &Gui::instance()->getTextureEditorWidget())); - } -} - -void TextureMappingMode::selectPrevVertex(Application * app){ - if(app->getSurfaceManager()->getSelectedSurface() != 0){ - app->getCmdManager()->exec( - new SelPrevTexCoordCmd( - &Gui::instance()->getTextureEditorWidget())); - } -} - ofPoint TextureMappingMode::getTranslation(){ return _canvasTranslate; } diff --git a/src/Application/Modes/TextureMappingMode.h b/src/Application/Modes/TextureMappingMode.h index daeed2f..74eb882 100644 --- a/src/Application/Modes/TextureMappingMode.h +++ b/src/Application/Modes/TextureMappingMode.h @@ -4,8 +4,6 @@ #include "ofEvents.h" #include "ofLog.h" #include "ofGraphics.h" -#include "SelNextTexCoordCmd.h" -#include "SelPrevTexCoordCmd.h" #include "DeselectTexCoordCmd.h" #include "SelNextSurfaceCmd.h" #include "TranslateCanvasCmd.h"