From b5c318adf9645f976193bf72c113746264bf6073 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Sun, 11 May 2014 23:46:44 +0200
Subject: [PATCH] Fix non updating surface joint locations after custom surface
 setup as well as texture and projection area updates

---
 src/ofxSurfaceGui.cpp     | 57 ++++++++++++++++++++++++++-------------
 src/ofxSurfaceGui.h       |  7 +++--
 src/ofxSurfaceManager.cpp |  2 ++
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/ofxSurfaceGui.cpp b/src/ofxSurfaceGui.cpp
index 1d590a3..f44a7af 100644
--- a/src/ofxSurfaceGui.cpp
+++ b/src/ofxSurfaceGui.cpp
@@ -213,6 +213,45 @@ void ofxSurfaceGui::unselect()
     bSelected = false;
 }
 
+void ofxSurfaceGui::updateTextureHitarea()
+{
+    textureHitarea.clear();
+    for ( int i=0; i<textureMappingJoints.size(); i++ ) {
+        textureHitarea.addVertex( ofPoint(textureMappingJoints[i].position.x,
+                                          textureMappingJoints[i].position.y) );
+    }
+}
+
+void ofxSurfaceGui::updateProjectionHitarea()
+{
+    projectionHitarea.clear();
+    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
+        projectionHitarea.addVertex( ofPoint(projectionMappingJoints[i].position.x,
+                                             projectionMappingJoints[i].position.y) );
+    }
+}
+
+void ofxSurfaceGui::updateHitarea()
+{
+    updateProjectionHitarea();
+    updateTextureHitarea();
+}
+
+void ofxSurfaceGui::updateJoints()
+{
+    // move joints to their positions
+    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
+        projectionMappingJoints[i].position = surface->getVertex(i);
+    }
+    updateProjectionHitarea();
+    
+    ofVec2f textureSize = ofVec2f(surface->getTexture()->getWidth(), surface->getTexture()->getHeight());
+    for ( int i=0; i<textureMappingJoints.size(); i++ ) {
+        textureMappingJoints[i].position = surface->getTexCoord(i) * textureSize;
+    }
+    updateTextureHitarea();
+}
+
 bool ofxSurfaceGui::hitTest(float x, float y)
 {
     if (mode == PROJECTION_MAPPING){
@@ -300,24 +339,6 @@ void ofxSurfaceGui::addNumTextureMappingJoints(int num)
     }
 }
 
-void ofxSurfaceGui::updateTextureHitarea()
-{
-    textureHitarea.clear();
-    for ( int i=0; i<textureMappingJoints.size(); i++ ) {
-        textureHitarea.addVertex( ofPoint(textureMappingJoints[i].position.x,
-                                          textureMappingJoints[i].position.y) );
-    }
-}
-
-void ofxSurfaceGui::updateProjectionHitarea()
-{
-    projectionHitarea.clear();
-    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
-        projectionHitarea.addVertex( ofPoint(projectionMappingJoints[i].position.x,
-                                             projectionMappingJoints[i].position.y) );
-    }
-}
-
 void ofxSurfaceGui::dragTextureArea()
 {
     bTextureDragging = true;
diff --git a/src/ofxSurfaceGui.h b/src/ofxSurfaceGui.h
index 81c0bc6..3964dff 100644
--- a/src/ofxSurfaceGui.h
+++ b/src/ofxSurfaceGui.h
@@ -26,6 +26,11 @@ public:
     void setMode(editMode newMode);
     void select();
     void unselect();
+    void updateTextureHitarea();
+    void updateProjectionHitarea();
+    void updateHitarea(); // update both
+    void updateJoints();
+    
     bool hitTest(float x, float y);
     bool hitTestTextureArea(float x, float y);
     bool hitTestProjectionArea(float x, float y);
@@ -58,8 +63,6 @@ private:
     void addNumProjectionMappingJoints(int num);
     void addTextureMappingJoint();
     void addNumTextureMappingJoints(int num);
-    void updateTextureHitarea();
-    void updateProjectionHitarea();
     void dragTextureArea();
     void dragProjectionArea();
     void stopDrag();
diff --git a/src/ofxSurfaceManager.cpp b/src/ofxSurfaceManager.cpp
index c56f2ec..7c42413 100644
--- a/src/ofxSurfaceManager.cpp
+++ b/src/ofxSurfaceManager.cpp
@@ -184,10 +184,12 @@ void ofxSurfaceManager::addTriangleSurface(ofVec2f v1, ofVec2f v2, ofVec2f v3, o
 {
     addTriangleSurface();
     triangleSurfaces.back()->setup(v1, v2, v3, t1, t2, t3, triangleSurfaces.back()->getTexture());
+    surfaceGuis.back()->updateJoints();
 }
 
 void ofxSurfaceManager::addTriangleSurface(ofVec2f v1, ofVec2f v2, ofVec2f v3, ofVec2f t1, ofVec2f t2, ofVec2f t3, ofTexture* texturePtr)
 {
     addTriangleSurface();
     triangleSurfaces.back()->setup(v1, v2, v3, t1, t2, t3, texturePtr);
+    surfaceGuis.back()->updateJoints();
 }
\ No newline at end of file