From 1aef8df9feeff8c76411bb4f4faa2e51d3ee252e Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Wed, 24 Sep 2014 18:20:30 +0100
Subject: any changes

---
 le_new/src/main.cpp  |  2 +-
 le_new/src/ofApp.cpp | 19 ++++++++++++++-----
 le_new/src/ofApp.h   | 12 +++---------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/le_new/src/main.cpp b/le_new/src/main.cpp
index 4beb7c9..7d1820d 100644
--- a/le_new/src/main.cpp
+++ b/le_new/src/main.cpp
@@ -7,7 +7,7 @@
 int main( ){
 
 	//ofxFensterManager::setup(4080,768,OF_WINDOW);
-	ofxFensterManager::setup(250,400,OF_WINDOW);
+	ofxFensterManager::setup(225,400,OF_WINDOW);
 	
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
diff --git a/le_new/src/ofApp.cpp b/le_new/src/ofApp.cpp
index 36cd9aa..6537012 100644
--- a/le_new/src/ofApp.cpp
+++ b/le_new/src/ofApp.cpp
@@ -240,9 +240,18 @@ 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));
+	gui.add(fadeScale.set("decay draw",128,0,255));
+	gui.add(decayTime.set("decay time",1.0,0.0,10.0));
+	gui.add(fadeBackground.set("decay background",0,0,255));
 
-/*
+	gui.add(oscScale.set("scale size LFO", false));
+	gui.add(breakOsc.set("break oscillators", false));
+	gui.add(randomOsc.set("randomise oscillators", false));
+
+	gui.add(scaleAmplitude.set("fade scale",0.5f,0.0f,2.0f));
+	gui.add(scaleFrequency.set("fade freq",1.0f,0.0f,5.0f));
+
+/*.
 	fadeScale=128;
 	gui.add(fS.setup("decay draw",fadeScale,0,255,255));
 	decayTime=1.0f;
@@ -274,6 +283,7 @@ void ofApp::setup(){
 	ofAddListener(outWin->onKeyPressed, this, &ofApp::keyPressedEvent);
 
 	//debug=true;
+	//ofAddListener(onDrag, baseApp, &ofBaseApp::dragged);
 
 
 }
@@ -417,9 +427,6 @@ void ofApp::gotMessage(ofMessage msg){
 
 //--------------------------------------------------------------
 
-void ofApp::dragEvent(ofDragInfo dragInfo, ofxFenster* win){
-    dragEvent(dragInfo);
-}
 void ofApp::dragEvent(ofDragInfo dragInfo){
     printf("got draginfo: %s\n",dragInfo.files[0].c_str());
     int sta=dragInfo.files[0].find_last_of("\\/")+1;
@@ -434,6 +441,8 @@ void ofApp::windowEvent(ofResizeEventArgs &args){
 }
 
 void ofApp::mousePressed( int x, int y, int button ) {
+	printf("%d %d %d %d %d\n",x,y,button,ofGetKeyPressed(OF_KEY_SHIFT),ofGetKeyPressed(OF_KEY_CONTROL));
+	//hmm fenster doesn't pass on modifer keys or buttons
 	switch (button) {
 		case 0:
 			xshift=x-(prevWin->getWidth()/2);
diff --git a/le_new/src/ofApp.h b/le_new/src/ofApp.h
index 6d6a616..bff4ec2 100644
--- a/le_new/src/ofApp.h
+++ b/le_new/src/ofApp.h
@@ -35,7 +35,6 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 		void windowResized(int w, int h);
 		void gotMessage(ofMessage msg);
 		void dragEvent(ofDragInfo dragInfo);
-		void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 
 		void previewMouse(int x, int y, int button);
 
@@ -97,18 +96,13 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 		ofParameter<bool> transparentBlack;
 		ofxButton resetDrawscale;
 		ofxButton resetFBscale;
-		ofxIntSlider fS;
 		ofParameter<int> fadeScale;
-		ofxIntSlider fB;
 		ofParameter<int> fadeBackground;
-		ofxFloatSlider dT;
 		ofParameter<float> decayTime;
-		ofxToggle oscScale;
-		ofxToggle breakOsc;
-		ofxToggle randomOsc;
-		ofxFloatSlider sA;
+		ofParameter<bool> oscScale;
+		ofParameter<bool> breakOsc;
+		ofParameter<bool> randomOsc;
 		ofParameter<float> scaleAmplitude;
-		ofxFloatSlider sF;
 		ofParameter<float> scaleFrequency;
 
 		float randOffs;
-- 
cgit v1.2.3