From cb996aea8daaed108048745cee2dc84be5d110bf Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Wed, 29 May 2013 12:35:22 +0100
Subject: good mostly

---
 src/testApp.cpp  | 2 +-
 src/viewport.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/testApp.cpp b/src/testApp.cpp
index e9b8403..18e7255 100755
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -133,7 +133,7 @@ void testApp::setup(){
 	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.add(sW.setup("amplitude",slidWave,0,4.0,255));
 
 /*
 	gui.setup("","panel.xml",0,0);
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 5a246e0..369d176 100755
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -59,11 +59,16 @@ void viewport::drawport(vpcontrol &control){
 			ofSetColor(f,f,f);
 		}
 
+
 		if (control.fill){
 			ofRect(0,0,bw,bh);
 		}
 
-		ofSetLineWidth(3); //control.thickness);
+		ofSetLineWidth(control.thickness);
+
+		if (!control.fillwave) {
+			ofNoFill();
+		}
 
 		if(control.wave){
 			if (h>w){
@@ -82,6 +87,7 @@ void viewport::drawport(vpcontrol &control){
 			}
 		}
 		
+		ofFill();
 
 		rb1.end();
 
-- 
cgit v1.2.3