From 23879cc5bf88de215f10de14f1a3de9b6b2f586a Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@getdrop.com>
Date: Thu, 31 May 2018 18:18:28 +0100
Subject: fixed rounding bug

---
 gistanalysis/src/ofApp.h | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'gistanalysis/src/ofApp.h')

diff --git a/gistanalysis/src/ofApp.h b/gistanalysis/src/ofApp.h
index 11ddbb6..780b042 100644
--- a/gistanalysis/src/ofApp.h
+++ b/gistanalysis/src/ofApp.h
@@ -2,22 +2,23 @@
 
 #include "ofMain.h"
 #include "ofxHelios.h"
-#include "ofxAChaoslib.h"
 #include "lineTransformer.h"
 
+#include "ofxMidi.h"
+#include "ofxGui.h"
+#include "ofxXmlSettings.h"
+
+#include "ofxGist.h"
 //This is included only as a way of getting buffer out of loaded sound.
 //There are many other ways you can do that.
 //This player includes a version of kissFFT. You can remove the one included in Gist.
 //https://github.com/borg/ofxOpenALSoundPlayer
 #include "ofxOpenALSoundPlayer.h"
-#include "ofxMidi.h"
-#include "ofxGui.h"
-
 //Slightly modified to add a dynamic getVariable method to be able to plot based on
 //gist feature list
 //https://github.com/local-projects/ofxHistoryPlot
 #include "ofxHistoryPlot.h"
-#include "ofxGist.h"
+#include "ofxAChaoslib.h"
 
 //audioplot draws from 0 to ofGetWidth
 //change to -ofGetWidth/2 to ofGetWidth/2
@@ -247,19 +248,30 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 
         ofxPanel lasergui;
         ofParameter<int> intensity;
+        ofParameter<int> points;
         ofParameter<int> subdivide;
         ofParameter<int> blank_num;
         ofParameter<float> max_angle;
 
         //======================================= //positioning interface
 
-        ofParameter<bool> drawWarpFrame;
+        bool bShowPositionInterface;
+        bool bOutputSelected;
+        ofPoint outputSelectionPoint;
+        ofPoint outputPosition;
+        ofPoint outputOffset;
+        float outputScale;
+        float outputOffsetScale;
+
+        //======================================= //warping interface
 
         glm::vec2 warpframe[4];
         int select_warpframe;
         
-        float outputScale;
 
+        //======================================= //saving settings
+
+        ofxXmlSettings XML;
 
     
 };
-- 
cgit v1.2.3