add laser to audio project

4 files changed, 20 insertions, 5 deletions

diff --git a/audioin/addons.make b/audioin/addons.make
index e69de29..f179d33 100644
--- a/audioin/addons.make
+++ b/audioin/addons.make
@@ -0,0 +1 @@
+ofxHelios
\ No newline at end of file
diff --git a/audioin/src/ofApp.cpp b/audioin/src/ofApp.cpp
index 9160f65..e6b0e6d 100644
--- a/audioin/src/ofApp.cpp
+++ b/audioin/src/ofApp.cpp
@@ -55,6 +55,7 @@ void ofApp::draw(){
 
     line.draw();
 
+    laser.draw(line);
 
     ofPopMatrix();
     
@@ -81,7 +82,7 @@ void ofApp::audioIn(float * input, int blockSize, int nChannels){
 
 
 void ofApp::printOscParams(){
-    ofLog()<<(1000.0f/(SAMPLERATE/(ofGetWidth()/hScale)))<<"ms, scale: "<<vScale<<", width "<<lineWidth;
+    ofLog()<<(1000.0f/(SAMPLERATE/(ofGetWidth()/hScale)))<<"ms, "<<((int)(ofGetWidth()/hScale))<<" points; scale "<<vScale<<", width "<<lineWidth;
 }
 
 //--------------------------------------------------------------
diff --git a/audioin/src/ofApp.h b/audioin/src/ofApp.h
index 2386ef8..c0bba64 100644
--- a/audioin/src/ofApp.h
+++ b/audioin/src/ofApp.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ofMain.h"
+#include "ofxHelios.h"
 
 //#include <baudvine/ringbuf.h>
 
@@ -12,9 +13,19 @@
 TEXT+SOUND
 oscilloscopes on letters
 what is the message
-text from twitter
+text from twitter/ SMS
+
+transformation of text/ oscilloscopes with animation/ audio animation/ gamepad
+
+colours (audio?)
 
 can we get a sillouette from kinect to laser 
+
+kinect normal stuff
+
+The biggest thing missing:
+A framework to combine these things
+
 */
 class Buffer{
 public:
@@ -28,7 +39,7 @@ public:
     }
     ~Buffer(){
         if (data){
-            //delete[] data; //why is this throwing an error
+            delete[] data; //why is this throwing an error
         }
     } 
     void add(float * input, int num){
@@ -87,4 +98,6 @@ class ofApp : public ofBaseApp{
         float vScale;
 
         float lineWidth;
+
+        ofxHelios laser;
 };
diff --git a/lasertext/src/ofApp.cpp b/lasertext/src/ofApp.cpp
index 89fa856..b5fb1ae 100644
--- a/lasertext/src/ofApp.cpp
+++ b/lasertext/src/ofApp.cpp
@@ -266,7 +266,7 @@ void ofApp::keyPressed(ofKeyEventArgs &args){
 
 //--------------------------------------------------------------
 void ofApp::keyReleased(int key){
-	/*
+
 	if (key>=' '&&key<='~'){
 		banner.addGlyph(key);
 	}
@@ -288,7 +288,7 @@ void ofApp::keyReleased(int key){
 			break;
 		}
 	}
-	*/
+
 	switch(key){
 		case 's':{
 			save_settings();