From c28bf33277ef6a7d9ac901f76f6c0e5c4fcbc83d Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@getdrop.com>
Date: Thu, 31 May 2018 18:48:56 +0100
Subject: transform and rotate centred

---
 gistanalysis/notes        |  2 +-
 gui/bin/data/settings.xml | 45 +++++++++++++++++++++++++++------------------
 gui/src/ofApp.cpp         |  5 ++++-
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/gistanalysis/notes b/gistanalysis/notes
index ad7d756..0a8ec94 100644
--- a/gistanalysis/notes
+++ b/gistanalysis/notes
@@ -98,7 +98,7 @@ make new project with bones of that project? np - add in positioning interface?
 
 X get audio working in gui project
 -> get audio input with fft
-fix plotting bug not filling width 
+X fix plotting bug not filling width 
 is it being clipped?
 fix transformer within audioplotter
 audioplot mirror & random sampling
diff --git a/gui/bin/data/settings.xml b/gui/bin/data/settings.xml
index 4b758e7..3332e37 100644
--- a/gui/bin/data/settings.xml
+++ b/gui/bin/data/settings.xml
@@ -1,23 +1,32 @@
+<?xml version="1.0"?>
 <WARP>
-    <p0>
-        <X>0.000000000</X>
-        <Y>0.000000000</Y>
-    </p0>
-    <p1>
-        <X>1200.000000000</X>
-        <Y>0.000000000</Y>
-    </p1>
-    <p2>
-        <X>1200.000000000</X>
-        <Y>900.000000000</Y>
-    </p2>
-    <p3>
-        <X>0.000000000</X>
-        <Y>900.000000000</Y>
-    </p3>
+	<p0>
+		<X>0.000000000</X>
+		<Y>0.000000000</Y>
+	</p0>
+	<p1>
+		<X>1200.000000000</X>
+		<Y>0.000000000</Y>
+	</p1>
+	<p2>
+		<X>1200.000000000</X>
+		<Y>900.000000000</Y>
+	</p2>
+	<p3>
+		<X>0.000000000</X>
+		<Y>900.000000000</Y>
+	</p3>
 </WARP>
 <POSITION>
-    <X>0.000000000</X>
-    <Y>0.000000000</Y>
+	<X>0.000000000</X>
+	<Y>0.000000000</Y>
 </POSITION>
 <SCALE>1.000000000</SCALE>
+<laser>
+	<power>0</power>
+	<intensity>30</intensity>
+	<points>30000</points>
+	<subdivide>15</subdivide>
+	<blank_points>8</blank_points>
+	<max_angle>15</max_angle>
+</laser>
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index e684254..0c5ed9c 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -99,6 +99,9 @@ void ofApp::setup(){
     audiogui.add(plotter.width.set("point width", 2, 1, 256));
     audiogui.add(plotter.num_points.set("num points", 50, 1, 512));
     audiogui.add(plotter.history_size.set("num plots", 5, 1, 100));
+    audiogui.add(plotter.translate.set("translate",ofVec2f(0,0),ofVec2f(-50,-50),ofVec2f(50,50)));
+    audiogui.add(plotter.rotate.set("rotate",0.0f,-10.0f,10.0f));
+    audiogui.add(plotter.scale.set("scale",ofVec2f(1.0f,1.0f),ofVec2f(0.5f,0.5f),ofVec2f(2.0f,2.0f)));
     audiogui.add(plotter.startColour.set("start",ofColor(255,255,255)));
     audiogui.add(plotter.endColour.set("end",ofColor(0,0,0)));
 
@@ -754,7 +757,7 @@ void ofApp::drawOutput(ofEventArgs & args){
 		        0.0f,1.0f,0.0f,0.0f,
 		        0.0f,0.0f,1.0f,0.0f,
 		        0.0f,0.0f,0.0f,1.0f);
-			polyOutput=plotter.output(x,scalePlot,decayPlot);
+			polyOutput=plotter.output(scalePlot,decayPlot);
 			break;
 		}
 		default: {
-- 
cgit v1.2.3