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/viewport.h | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/viewport.h')

diff --git a/src/viewport.h b/src/viewport.h
index b786fe9..1e3e8a8 100755
--- a/src/viewport.h
+++ b/src/viewport.h
@@ -4,8 +4,11 @@
 #include "ofMain.h"
 #include "ofxXmlSettings.h"
 
-static int bufferSize = 1024;
-static int bufferscale = 4;	
+static int bufferSize = 2048;
+static int oversample = 8;	
+static int windowsize = 32;
+
+//make sure that windowsize*oversample*8 <= buffersize
 
 class palette {
 	public:
@@ -71,7 +74,10 @@ class vpcontrol {
 			yshift=0;
 			fscale=1.0f;
 			wave=false;
+			fillwave=false;
 			thickness=1.0f;
+			waveheight=1.0f;
+			fade=0;
 
 			left.assign(bufferSize, 0.0);
 			right.assign(bufferSize, 0.0);
@@ -99,8 +105,9 @@ class vpcontrol {
 		float freq;
 		int xshift,yshift;
 		float fscale,scale;
-		bool wave;
-		float thickness;
+		bool wave,fillwave;
+		float thickness,waveheight;
+		uint8_t fade;
 
 		vector <float> left;
 		vector <float> right;
@@ -126,7 +133,7 @@ class viewport
 		palette Palette;
     protected:
     private:
-		int x,y,w,h,ox,oy,num;
+		int x,y,w,h,bw,bh,ox,oy,num;
 		float seed;
 };
 
-- 
cgit v1.2.3