From fca7b4e5a9ed1b29a700e2437f049e9aa7d9d96d Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Tue, 20 Sep 2016 12:16:54 +0200 Subject: [PATCH] Remove SurfaceManagerGui::mousePressed() --- src/Surfaces/SurfaceManagerGui.cpp | 46 ------------------------------ src/Surfaces/SurfaceManagerGui.h | 2 -- 2 files changed, 48 deletions(-) diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp index e70421e..25e0606 100644 --- a/src/Surfaces/SurfaceManagerGui.cpp +++ b/src/Surfaces/SurfaceManagerGui.cpp @@ -11,51 +11,6 @@ SurfaceManagerGui::SurfaceManagerGui(){ _cmdManager = 0; } -void SurfaceManagerGui::mousePressed(ofMouseEventArgs & args){ - if(guiMode == GuiMode::NONE){ - return; - }else if(guiMode == GuiMode::TEXTURE_MAPPING){ - - if(surfaceManager->getSelectedSurface() == 0){ - return; - } - - CircleJoint * hitJoint = textureEditor.hitTestJoints(ofVec2f(args.x, args.y)); - - if(hitJoint != 0){ - - hitJoint->mousePressed(args); - - textureEditor.unselectAllJoints(); - hitJoint->select(); - hitJoint->startDrag(); - int jointIndex; - - for(int i = 0; i < textureEditor.getJoints().size(); i++){ - if(textureEditor.getJoints()[i] == hitJoint){ - jointIndex = i; - break; - } - } - - _cmdManager->exec(new MvTexCoordCmd(jointIndex, &textureEditor)); - - }else if(surfaceManager->getSelectedSurface()->getTextureHitArea().inside(args.x, args.y)){ - - clickPosition = ofVec2f(args.x, args.y); - startDrag(); - - // TODO: emit event through the gui singleton - _cmdManager->exec(new MvAllTexCoordsCmd( - surfaceManager->getSelectedSurface(), - &textureEditor)); - - }else{ - Gui::instance()->notifyBackgroundPressed(args); - } - } -} - void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){ if(surfaceManager == 0){ ofRemoveListener(newSurfaceManager->vertexChangedEvent, this, &SurfaceManagerGui::onVertexChanged); @@ -63,7 +18,6 @@ void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){ ofRemoveListener(newSurfaceManager->surfaceSelectedEvent, this, &SurfaceManagerGui::onSurfaceSelected); ofRemoveListener(newSurfaceManager->vertexSelectedEvent, this, &SurfaceManagerGui::onVertexSelected); ofRemoveListener(newSurfaceManager->vertexUnselectedEvent, this, &SurfaceManagerGui::onVertexUnselected); - } surfaceManager = newSurfaceManager; diff --git a/src/Surfaces/SurfaceManagerGui.h b/src/Surfaces/SurfaceManagerGui.h index a0a485a..206bbc5 100644 --- a/src/Surfaces/SurfaceManagerGui.h +++ b/src/Surfaces/SurfaceManagerGui.h @@ -27,8 +27,6 @@ class SurfaceManagerGui { public: SurfaceManagerGui(); - void mousePressed(ofMouseEventArgs & args); - void setSurfaceManager(SurfaceManager * newSurfaceManager); void setMediaServer(MediaServer * newMediaServer); void setCmdManager(CmdManager * cmdManager);