summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-05-29 12:35:22 +0100
committerComment <tim@gray.(none)>2013-05-29 12:35:22 +0100
commitcb996aea8daaed108048745cee2dc84be5d110bf (patch)
tree022b1a21a48e208ada192cbe69345234bf14daf3
parent69e9ed62bbc899117550d7b9c888e71dd9ede0e2 (diff)
good mostly
-rwxr-xr-xsrc/testApp.cpp2
-rwxr-xr-xsrc/viewport.cpp8
2 files changed, 8 insertions, 2 deletions
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();