From 48b4153afdded09c48933074574e40207da59784 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Thu, 2 Feb 2017 19:12:27 +0100 Subject: [PATCH] Replace TextureMappingMode::moveSelection with moveSelectedTexCoord() --- src/Application/Modes/TextureMappingMode.cpp | 32 +++++--------------- src/Application/Modes/TextureMappingMode.h | 2 +- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/Application/Modes/TextureMappingMode.cpp b/src/Application/Modes/TextureMappingMode.cpp index b3c990a..874caba 100644 --- a/src/Application/Modes/TextureMappingMode.cpp +++ b/src/Application/Modes/TextureMappingMode.cpp @@ -85,27 +85,19 @@ void TextureMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & args){ switch(args.key){ case OF_KEY_LEFT: - if(app->getSurfaceManager()->getSelectedSurface() != 0){ - moveSelection(app, ofVec2f(-moveStep, 0.0f)); - } + moveSelectedTexCoord(app, ofVec2f(-moveStep, 0.0f)); break; case OF_KEY_RIGHT: - if(app->getSurfaceManager()->getSelectedSurface() != 0){ - moveSelection(app, ofVec2f(moveStep, 0.0f)); - } + moveSelectedTexCoord(app, ofVec2f(moveStep, 0.0f)); break; case OF_KEY_UP: - if(app->getSurfaceManager()->getSelectedSurface() != 0){ - moveSelection(app, ofVec2f(0.0f, -moveStep)); - } + moveSelectedTexCoord(app, ofVec2f(0.0f, -moveStep)); break; case OF_KEY_DOWN: - if(app->getSurfaceManager()->getSelectedSurface() != 0){ - moveSelection(app, ofVec2f(0.0f, moveStep)); - } + moveSelectedTexCoord(app, ofVec2f(0.0f, moveStep)); break; case '>': @@ -279,18 +271,10 @@ void TextureMappingMode::drawTexture(Application * app){ } } -void TextureMappingMode::moveSelection(Application * app, ofVec2f by){ - int selectedTexCoord = Gui::instance()->getTextureEditorWidget().getSelectedTexCoord(); - - if(selectedTexCoord >= 0){ - app->getCmdManager()->exec( - new MvTexCoordCmd(selectedTexCoord, by)); - }else{ - app->getCmdManager()->exec(new MvAllTexCoordsCmd( - app->getSurfaceManager()->getSelectedSurface(), - &Gui::instance()->getTextureEditorWidget())); - - Gui::instance()->getTextureEditorWidget().moveSelection(by); +void TextureMappingMode::moveSelectedTexCoord(Application * app, ofVec2f by){ + if(app->getSurfaceManager()->getSelectedSurface() != 0){ + int selectedTexCoord = Gui::instance()->getTextureEditorWidget().getSelectedTexCoord(); + app->moveTexCoord(selectedTexCoord, by); } } diff --git a/src/Application/Modes/TextureMappingMode.h b/src/Application/Modes/TextureMappingMode.h index 74eb882..ac3e5af 100644 --- a/src/Application/Modes/TextureMappingMode.h +++ b/src/Application/Modes/TextureMappingMode.h @@ -34,7 +34,7 @@ class TextureMappingMode : public ApplicationBaseMode { void onGuiEvent(Application * app, GuiEvent & e){} void drawTexture(Application * app); - void moveSelection(Application * app, ofVec2f by); + void moveSelectedTexCoord(Application * app, ofVec2f by); void selectNextVertex(Application * app); void selectPrevVertex(Application * app);