From 69e9ed62bbc899117550d7b9c888e71dd9ede0e2 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Wed, 29 May 2013 09:52:49 +0100
Subject: nearly done

---
 src/testApp.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/testApp.cpp')

diff --git a/src/testApp.cpp b/src/testApp.cpp
index 967d2d1..e9b8403 100755
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -88,7 +88,6 @@ void testApp::createports(int num){
 //--------------------------------------------------------------
 void testApp::setup(){
 
-	windowsize=32;
 	previewscale=5;
 
 	showFPS=false;
@@ -113,6 +112,9 @@ void testApp::setup(){
 	brightSlider=0;
 	gui.add(bS.setup("brightness",brightSlider,0,255,255));
 
+	fadeSlider=0;
+	gui.add(fS.setup("fade",fadeSlider,0,255,255));
+
 	gui.add(create_1.setup("1"));
 	create_1.addListener(this,&testApp::create1port);
 	gui.add(create_2.setup("2"));
@@ -127,8 +129,11 @@ void testApp::setup(){
 	gui.add(sF.setup("freq",slidFreq,0,1.0,255));
 
 	gui.add(wave.setup("wave", false));
+	gui.add(fillwave.setup("wave fill", false));
 	slidThickness=1.0f;
 	gui.add(sT.setup("thickness",slidThickness,0,10.0,255));
+	slidWave=1.0f;
+	gui.add(sT.setup("amplitude",slidWave,0,4.0,255));
 
 /*
 	gui.setup("","panel.xml",0,0);
@@ -167,7 +172,7 @@ void testApp::setup(){
 	soundStream.listDevices();
 	
 	//if you want to set a different device id 
-	//soundStream.setDeviceID(0); //bear in mind the device id corresponds to all audio devices, including  input-only and output-only devices.
+	//soundStream.setDeviceID(4); //bear in mind the device id corresponds to all audio devices, including  input-only and output-only devices.
 	
 	
 	
@@ -218,6 +223,9 @@ void testApp::update(){
 	control.freq=slidFreq;
 	control.wave=wave;
 	control.thickness=slidThickness;
+	control.fillwave=fillwave;
+	control.waveheight=slidWave;
+	control.fade=(uint8_t)fadeSlider;
 }
 
 //--------------------------------------------------------------
@@ -256,6 +264,12 @@ void testApp::keyPressed(int key){
 		if(key == OF_KEY_DOWN){
 			control.yshift++;
 		}
+		if(key == OF_KEY_LEFT){
+			control.xshift--;
+		}
+		if(key == OF_KEY_RIGHT){
+			control.xshift++;
+		}
 
 }
 
-- 
cgit v1.2.3