adding PONK to gui

7 files changed, 15 insertions, 16 deletions

diff --git a/animtext/bin/data/xentrix.txt b/animtext/bin/data/xentrix.txt
index 61d9d27..1d1bb30 100644
--- a/animtext/bin/data/xentrix.txt
+++ b/animtext/bin/data/xentrix.txt
@@ -1,7 +1 @@
-I have a story to tell.
-
-Once there was a boy who had a large dog; the dog was called Xentrix. One day the boy was walking in the woods with Xentrix; he stumbled on a wooden door. Xentrix opened the door, and the boy followed him inside.
-
-What the boy saw amazed him: there was a cave one mile long, and inside the cave were one million other children and a million dogs. The boy could not hold back his tears when he heard Xentrix say,
-
-"Welcome my friend. These are my people; now they are your people too."
+I have a story to tell. Once there was a boy who had a large dog; the dog was called Xentrix. One day the boy was walking in the woods with Xentrix; he stumbled on a wooden door. Xentrix opened the door, and the boy followed him inside. What the boy saw amazed him: there was a cave one mile long, and inside the cave were one million other children and a million dogs. The boy could not hold back his tears when he heard Xentrix say, Welcome my friend. These are my people; now they are your people too.
\ No newline at end of file
diff --git a/audioin/src/ofApp.cpp b/audioin/src/ofApp.cpp
index a6fa8d1..682e5ea 100644
--- a/audioin/src/ofApp.cpp
+++ b/audioin/src/ofApp.cpp
@@ -52,15 +52,14 @@ void ofApp::draw(){
 
     float scale=ofGetHeight()*vScale;
 
-    colourPolyline line;
-
+    ofPolyline line;
 
     line.addVertex(0,vpos+(buffer[0]*scale));
-    
+
     float i=0.0f;
     while (i<(ofGetWidth()+hScale)){
         i+=max(1.0f,hScale);
-        line.curveTo(i,vpos+(buffer[(int)i]*scale));
+        line.lineTo(i,vpos+(buffer[(int)i]*scale));
     }
 
     line.draw();
diff --git a/gui/addons.make b/gui/addons.make
index c3fef44..f908086 100644
--- a/gui/addons.make
+++ b/gui/addons.make
@@ -8,5 +8,5 @@ ofxMidi
 ofxGist
 ofxOpenALSoundPlayer
 ofxHistoryPlot
-ofxAChaoslib
 ofxOsc
+ofxPONK
diff --git a/gui/config.make b/gui/config.make
index 469c495..9fb30a2 100644
--- a/gui/config.make
+++ b/gui/config.make
@@ -37,7 +37,7 @@
 #
 #   Note: Leave a leading space when adding list items with the += operator
 ################################################################################
-# PROJECT_EXTERNAL_SOURCE_PATHS = 
+PROJECT_EXTERNAL_SOURCE_PATHS = libs
 
 ################################################################################
 # PROJECT EXCLUSIONS
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 6ff5d9e..ee406af 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -67,7 +67,7 @@ void ofApp::setup(){
 
     //============================ gui
 
-	lasergui.setup(	);
+	lasergui.setup("laser","",230,820);
 	lasergui.add(laser_power.set("power", false));
     lasergui.add(laser_intensity.set("intensity", 30, 0, 255));
     lasergui.add(laser_points.set("points", 30000, 0, 40000));
@@ -75,7 +75,9 @@ void ofApp::setup(){
     lasergui.add(laser_blank_num.set("blank points", 8, 0, 32));
     lasergui.add(laser_max_angle.set("max angle", 15.0f, 1.0f, 90.0f));
 
-    responsegui.setup("audio response","",230,970);
+ 	madlaser.setup("madlaser",140,820);
+
+    responsegui.setup("audio response","",10,970);
     responsegui.add(onset_threshold.set("onset threshold", 0.05f, 0.0f, 1.0f ));
     responsegui.add(use_onset.set("trigger onset",false));
     responsegui.add(onset_duration.set("duration", 10, 1, 100));
@@ -534,6 +536,7 @@ void ofApp::draw(){
 	}
 	else {
 		lasergui.draw();
+		madlaser.panel.draw();
 		drawgui.draw();
 		audiogui.draw();
 		chaosgui.draw();
diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index 6d6932c..faad049 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -15,6 +15,8 @@
 #include "lineTransformer.h"
 #include "lineSegmenter.h"
 
+#include "ofxPONK.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.
@@ -105,6 +107,7 @@ class ofApp: public ofBaseApp, public ofxMidiListener {
 
 
 		ofxHelios laser;
+		ofxPONKSenderPanel madlaser;
 
 		int source;
 
diff --git a/ofxHelios/addon_config.mk b/ofxHelios/addon_config.mk
index 3d6a965..d11f71c 100644
--- a/ofxHelios/addon_config.mk
+++ b/ofxHelios/addon_config.mk
@@ -33,7 +33,7 @@ common:
 
 	# any special flag that should be passed to the compiler when using this
 	# addon
-	ADDON_CFLAGS = -fPIC	
+	ADDON_CFLAGS = -fPIC -std=c++14
 
 	# any special flag that should be passed to the linker when using this
 	# addon, also used for system libraries with -lname