much progress

1 files changed, 16 insertions, 2 deletions

diff --git a/drawing/src/ofApp.h b/drawing/src/ofApp.h
index 13b3a0b..3cf9de8 100644
--- a/drawing/src/ofApp.h
+++ b/drawing/src/ofApp.h
@@ -35,8 +35,6 @@ class ofApp : public ofBaseApp{
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 
-		ofPolyline polyLineTransform(const ofPolyline& poly, ofMatrix4x4 xform);
-
 		vector <lineSegmenter> segmenters;
 		vector <ofPolyline> mask;
 		
@@ -73,4 +71,20 @@ class ofApp : public ofBaseApp{
         ofFbo syphonFbo;
 
         ofxHelios laser;
+
+        void drawWarpFrame();
+
+        void gaussianElimination(float * input, int n);
+		glm::mat4 getPerspectiveTransformMatrix(const glm::vec2 src[4], const glm::vec2 dst[4]);
+		ofPolyline polyLineTransform(const ofPolyline& poly, ofMatrix4x4 xform);
+		ofPolyline makePolygon(int num,float diam);
+		void drawPoly(ofPolyline poly,float x,float y);
+
+		glm::vec2 warpframe[4];
+		int select_warpframe;
+		float mapping_scale;
+
+		bool bDrawFrame;
+
+
 };