From 7c169203a6c4c0d9486297add9eba3e057be15d1 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Sat, 10 May 2014 14:30:25 +0200
Subject: [PATCH] Add projection mappint and texture mapping working code to
 the surface GUI

---
 src/ofxBaseSurface.cpp |  5 ++++
 src/ofxBaseSurface.h   |  2 ++
 src/ofxSurfaceGui.cpp  | 65 ++++++++++++++++++++++++++++++++----------
 src/ofxSurfaceGui.h    |  2 +-
 4 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/ofxBaseSurface.cpp b/src/ofxBaseSurface.cpp
index e97938a..ffafbd3 100644
--- a/src/ofxBaseSurface.cpp
+++ b/src/ofxBaseSurface.cpp
@@ -36,4 +36,9 @@ void ofxBaseSurface::createDefaultTexture()
     
     // Assign default texture to texture pointer
     texture = &defaultTexture;
+}
+
+ofTexture* ofxBaseSurface::getTexture()
+{
+    return texture;
 }
\ No newline at end of file
diff --git a/src/ofxBaseSurface.h b/src/ofxBaseSurface.h
index 646ff6d..89bc9c6 100644
--- a/src/ofxBaseSurface.h
+++ b/src/ofxBaseSurface.h
@@ -12,6 +12,8 @@ public:
     virtual void setVertex(int index, ofVec2f p){};
     virtual void setTexCoord(int index, ofVec2f t){};
     
+    ofTexture* getTexture();
+    
 protected:
     ofMesh mesh;
     ofTexture* texture;
diff --git a/src/ofxSurfaceGui.cpp b/src/ofxSurfaceGui.cpp
index 0aca9a3..2461736 100644
--- a/src/ofxSurfaceGui.cpp
+++ b/src/ofxSurfaceGui.cpp
@@ -3,7 +3,7 @@
 ofxSurfaceGui::ofxSurfaceGui()
 {
     surface = NULL;
-    mode = PROJECTION_MAPPING;
+    mode = TEXTURE_MAPPING;
 }
 
 ofxSurfaceGui::~ofxSurfaceGui()
@@ -23,8 +23,14 @@ void ofxSurfaceGui::update()
     if (surface == NULL) return;
     if (mode == NONE) return;
     
-    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
-        projectionMappingJoints[i].update();
+    if (mode == PROJECTION_MAPPING) {
+        for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
+            projectionMappingJoints[i].update();
+        }
+    } else if (mode == TEXTURE_MAPPING) {
+        for ( int i=0; i<textureMappingJoints.size(); i++ ) {
+            textureMappingJoints[i].update();
+        }
     }
 }
 
@@ -33,8 +39,14 @@ void ofxSurfaceGui::draw()
     if (surface == NULL) return;
     if (mode == NONE) return;
     
-    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
-        projectionMappingJoints[i].draw();
+    if (mode == PROJECTION_MAPPING) {
+        for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
+            projectionMappingJoints[i].draw();
+        }
+    } else if (mode == TEXTURE_MAPPING) {
+        for ( int i=0; i<textureMappingJoints.size(); i++ ) {
+            textureMappingJoints[i].draw();
+        }
     }
 }
 
@@ -43,8 +55,14 @@ void ofxSurfaceGui::mousePressed(int x, int y, int button)
     if (surface == NULL) return;
     if (mode == NONE) return;
     
-    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
-        projectionMappingJoints[i].mousePressed(x, y, button);
+    if (mode == PROJECTION_MAPPING) {
+        for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
+            projectionMappingJoints[i].mousePressed(x, y, button);
+        }
+    } else if (mode == TEXTURE_MAPPING) {
+        for ( int i=0; i<textureMappingJoints.size(); i++ ) {
+            textureMappingJoints[i].mousePressed(x, y, button);
+        }
     }
 }
 
@@ -53,8 +71,14 @@ void ofxSurfaceGui::mouseReleased(int x, int y, int button)
     if (surface == NULL) return;
     if (mode == NONE) return;
     
-    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
-        projectionMappingJoints[i].mouseReleased(x, y, button);
+    if (mode == PROJECTION_MAPPING) {
+        for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
+            projectionMappingJoints[i].mouseReleased(x, y, button);
+        }
+    } else if (mode == TEXTURE_MAPPING) {
+        for ( int i=0; i<textureMappingJoints.size(); i++ ) {
+            textureMappingJoints[i].mouseReleased(x, y, button);
+        }
     }
 }
 
@@ -63,10 +87,20 @@ void ofxSurfaceGui::mouseDragged(int x, int y, int button)
     if (surface == NULL) return;
     if (mode == NONE) return;
     
-    for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
-        projectionMappingJoints[i].mouseDragged(x, y, button);
-        if ( projectionMappingJoints[i].isDragged() ) {
-            surface->setVertex(i, projectionMappingJoints[i].position);
+    if (mode == PROJECTION_MAPPING) {
+        for ( int i=0; i<projectionMappingJoints.size(); i++ ) {
+            projectionMappingJoints[i].mouseDragged(x, y, button);
+            if ( projectionMappingJoints[i].isDragged() ) {
+                surface->setVertex(i, projectionMappingJoints[i].position);
+            }
+        }
+    } else if (mode == TEXTURE_MAPPING) {
+        ofVec2f textureSize = ofVec2f( surface->getTexture()->getWidth(), surface->getTexture()->getHeight() );
+        for ( int i=0; i<textureMappingJoints.size(); i++ ) {
+            textureMappingJoints[i].mouseDragged(x, y, button);
+            if ( textureMappingJoints[i].isDragged() ) {
+                surface->setTexCoord(i, textureMappingJoints[i].position/textureSize);
+            }
         }
     }
 }
@@ -100,8 +134,9 @@ void ofxSurfaceGui::addNumProjectionMappingJoints(int num)
 
 void ofxSurfaceGui::addTextureMappingJoint()
 {
-    textureMappingJoings.push_back(ofxCircleJoint());
-    //textureMappingJoings.back().position = surface->getTex
+    textureMappingJoints.push_back(ofxCircleJoint());
+    ofVec2f textureSize = ofVec2f(surface->getTexture()->getWidth(), surface->getTexture()->getHeight());
+    textureMappingJoints.back().position = surface->getTexCoord(textureMappingJoints.size()-1) * textureSize;
 }
 
 void ofxSurfaceGui::addNumTextureMappingJoints(int num)
diff --git a/src/ofxSurfaceGui.h b/src/ofxSurfaceGui.h
index aaf1f12..c383f43 100644
--- a/src/ofxSurfaceGui.h
+++ b/src/ofxSurfaceGui.h
@@ -32,7 +32,7 @@ private:
     ofxTriangleSurface* surface;
     
     vector<ofxCircleJoint> projectionMappingJoints;
-    vector<ofxCircleJoint> textureMappingJoings;
+    vector<ofxCircleJoint> textureMappingJoints;
     
     void addProjectionMappingJoint();
     void addNumProjectionMappingJoints(int num);