From 4d813b38a35ac04adece480d8637cf4a810ddce9 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Mon, 12 May 2014 16:18:03 +0200
Subject: [PATCH] Add posibility to move surfaces again

---
 src/ofxProjectionEditor.cpp  |  8 +++++++
 src/ofxProjectionEditor.h    |  1 +
 src/ofxSurfaceManagerGui.cpp | 43 ++++++++++++++++++++++++++++++++++--
 src/ofxSurfaceManagerGui.h   |  6 +++++
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/ofxProjectionEditor.cpp b/src/ofxProjectionEditor.cpp
index cc7f377..6c49856 100644
--- a/src/ofxProjectionEditor.cpp
+++ b/src/ofxProjectionEditor.cpp
@@ -51,6 +51,14 @@ void ofxProjectionEditor::createJoints()
     }
 }
 
+void ofxProjectionEditor::updateJoints()
+{
+    vector<ofVec3f>& vertices = surfaceManager->getSelectedSurface()->getVertices();
+    for ( int i=0; i<vertices.size(); i++ ) {
+        joints[i]->position = ofVec2f(vertices[i].x, vertices[i].y);
+    }
+}
+
 bool ofxProjectionEditor::hitTestJoints(ofVec2f pos)
 {
     for ( int i=0; i<joints.size(); i++ ) {
diff --git a/src/ofxProjectionEditor.h b/src/ofxProjectionEditor.h
index a52edb6..d2b6a80 100644
--- a/src/ofxProjectionEditor.h
+++ b/src/ofxProjectionEditor.h
@@ -14,6 +14,7 @@ public:
     void setSurfaceManager(ofxSurfaceManager* newSurfaceManager);
     void clearJoints();
     void createJoints();
+    void updateJoints();
     bool hitTestJoints(ofVec2f pos);
     
 private:
diff --git a/src/ofxSurfaceManagerGui.cpp b/src/ofxSurfaceManagerGui.cpp
index 5dab6d4..89aa4cd 100644
--- a/src/ofxSurfaceManagerGui.cpp
+++ b/src/ofxSurfaceManagerGui.cpp
@@ -4,6 +4,7 @@ ofxSurfaceManagerGui::ofxSurfaceManagerGui()
 {
     surfaceManager = NULL;
     guiMode = ofxGuiMode::NONE;
+    bDrag = false;
     registerMouseEvents();
 }
 
@@ -16,11 +17,15 @@ ofxSurfaceManagerGui::~ofxSurfaceManagerGui()
 void ofxSurfaceManagerGui::registerMouseEvents()
 {
     ofAddListener(ofEvents().mousePressed, this, &ofxSurfaceManagerGui::mousePressed);
+    ofAddListener(ofEvents().mouseReleased, this, &ofxSurfaceManagerGui::mouseReleased);
+    ofAddListener(ofEvents().mouseDragged, this, &ofxSurfaceManagerGui::mouseDragged);
 }
 
 void ofxSurfaceManagerGui::unregisterMouseEvents()
 {
     ofRemoveListener(ofEvents().mousePressed, this, &ofxSurfaceManagerGui::mousePressed);
+    ofRemoveListener(ofEvents().mouseReleased, this, &ofxSurfaceManagerGui::mouseReleased);
+    ofRemoveListener(ofEvents().mouseDragged, this, &ofxSurfaceManagerGui::mouseDragged);
 }
 
 void ofxSurfaceManagerGui::draw()
@@ -67,7 +72,7 @@ void ofxSurfaceManagerGui::mousePressed(ofMouseEventArgs &args)
     if ( guiMode == ofxGuiMode::NONE ) {
         return;
     } else if ( guiMode == ofxGuiMode::TEXTURE_MAPPING ) {
-        
+        return;
     } else if ( guiMode == ofxGuiMode::PROJECTION_MAPPING ) {
         // attempt to select surface, loop from end to beginning
         bool bSurfaceSelected = false;
@@ -81,9 +86,13 @@ void ofxSurfaceManagerGui::mousePressed(ofMouseEventArgs &args)
             }
         }
         
-        // Check if hitting one of the joints as that also couts as hit when surface is selected
+        // Check if hitting one of the joints as that also counts as hit when surface is selected
         if ( projectionEditor.hitTestJoints(ofVec2f(args.x, args.y)) ) {
             bSurfaceSelected = true;
+        } else if ( bSurfaceSelected ) {
+            // if not hitting the joints, start drag only if we have a selected surface
+            clickPosition = ofVec2f(args.x, args.y);
+            startDrag();
         }
         
         if ( !bSurfaceSelected ) {
@@ -94,6 +103,26 @@ void ofxSurfaceManagerGui::mousePressed(ofMouseEventArgs &args)
     }
 }
 
+void ofxSurfaceManagerGui::mouseReleased(ofMouseEventArgs &args)
+{
+    stopDrag();
+}
+
+void ofxSurfaceManagerGui::mouseDragged(ofMouseEventArgs &args)
+{
+    if (bDrag) {
+        ofVec2f mousePosition = ofVec2f(args.x, args.y);
+        ofVec2f distance = mousePosition - clickPosition;
+        // add this distance to all vertices in surface
+        vector<ofVec3f>& vertices = surfaceManager->getSelectedSurface()->getVertices();
+        for ( int i=0; i<vertices.size(); i++ ) {
+            vertices[i] += distance;
+        }
+        projectionEditor.updateJoints();
+        clickPosition = mousePosition;
+    }
+}
+
 void ofxSurfaceManagerGui::setSurfaceManager(ofxSurfaceManager* newSurfaceManager)
 {
     surfaceManager = newSurfaceManager;
@@ -122,4 +151,14 @@ void ofxSurfaceManagerGui::drawSelectedSurfaceHighlight()
     ofSetColor(255, 255, 255, 255);
     line.draw();
     ofPopStyle();
+}
+
+void ofxSurfaceManagerGui::startDrag()
+{
+    bDrag = true;
+}
+
+void ofxSurfaceManagerGui::stopDrag()
+{
+    bDrag = false;
 }
\ No newline at end of file
diff --git a/src/ofxSurfaceManagerGui.h b/src/ofxSurfaceManagerGui.h
index 062056a..d19cd1c 100644
--- a/src/ofxSurfaceManagerGui.h
+++ b/src/ofxSurfaceManagerGui.h
@@ -18,15 +18,21 @@ public:
     
     void draw();
     void mousePressed(ofMouseEventArgs& args);
+    void mouseReleased(ofMouseEventArgs& args);
+    void mouseDragged(ofMouseEventArgs& args);
     void setSurfaceManager(ofxSurfaceManager* newSurfaceManager);
     void setMode(int newGuiMode);
     void drawSelectedSurfaceHighlight();
+    void startDrag();
+    void stopDrag();
     
 private:
     ofxSurfaceManager* surfaceManager;
     ofxTextureEditor textureEditor;
     ofxProjectionEditor projectionEditor;
     int guiMode;
+    bool bDrag;
+    ofVec2f clickPosition;
 };
 
 #endif
\ No newline at end of file