buttons

2 files changed, 6 insertions, 10 deletions

diff --git a/le_new/src/ofApp.cpp b/le_new/src/ofApp.cpp
index d2df54c..36cd9aa 100644
--- a/le_new/src/ofApp.cpp
+++ b/le_new/src/ofApp.cpp
@@ -240,6 +240,8 @@ void ofApp::setup(){
 	gui.add(resetDrawscale.setup("reset draw scale"));
 	gui.add(resetFBscale.setup("reset FB scale"));
 
+	gui.add(fadeScale.set("decay draw",0,255,255));
+
 /*
 	fadeScale=128;
 	gui.add(fS.setup("decay draw",fadeScale,0,255,255));
@@ -255,8 +257,7 @@ void ofApp::setup(){
 	scaleFrequency=1.0f;
 	gui.add(sF.setup("fade freq",scaleFrequency,0,5.0,255));
 
-	resetDrawscale.addListener(this,&ofApp::resetDrawscalePressed);
-	resetFBscale.addListener(this,&ofApp::resetFBscalePressed);
+	
 	*/
 
 	//gui window stuff
@@ -277,12 +278,6 @@ void ofApp::setup(){
 
 }
 
-void ofApp::resetDrawscalePressed(bool & pressed){
-	scale=1.0f;
-}
-void ofApp::resetFBscalePressed(bool & pressed){
-	fscale=1.0f;
-}
 
 void ofApp::makeColours() {
 	controller_colours=new ofColor[NUM_CONTROLLERS];
@@ -292,6 +287,9 @@ void ofApp::makeColours() {
 //--------------------------------------------------------------
 void ofApp::update(){
 	//for (int i=0;i<numLayers;i++) layers[i]->update();
+	if (resetDrawscale) scale=1.0f;
+	if (resetFBscale) fscale=1.0f;
+
 }
 
 //--------------------------------------------------------------
diff --git a/le_new/src/ofApp.h b/le_new/src/ofApp.h
index 4830665..6d6a616 100644
--- a/le_new/src/ofApp.h
+++ b/le_new/src/ofApp.h
@@ -113,8 +113,6 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 
 		float randOffs;
 
-		void resetDrawscalePressed(bool & pressed);
-		void resetFBscalePressed(bool & pressed);
 
 
 };