summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/testApp.cpp6
-rwxr-xr-xsrc/testApp.h3
-rwxr-xr-xsrc/viewport.cpp21
-rwxr-xr-xsrc/viewport.h7
4 files changed, 28 insertions, 9 deletions
diff --git a/src/testApp.cpp b/src/testApp.cpp
index b58971d..70d4f86 100755
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -213,10 +213,12 @@ void testApp::setup(){
gui.add(wave.setup("wave", false));
gui.add(fillwave.setup("wave fill", false));
slidThickness=1.0f;
- gui.add(sT.setup("thickness",slidThickness,0,10.0,255));
+ gui.add(sT.setup("thickness",slidThickness,0,20.0,255));
slidWave=1.0f;
gui.add(sW.setup("amplitude",slidWave,0,4.0,255));
+ gui.add(reverse.setup("reverse", false));
+ gui.add(drawkeys.setup("draw keys", false));
/*
gui.setup("","panel.xml",0,0);
gui.add(reversemain.setup("reverse main", false));
@@ -321,6 +323,8 @@ void testApp::update(){
control.fillwave=fillwave;
control.waveheight=slidWave;
control.fade=(uint8_t)fadeSlider;
+ control.reverse=reverse;
+ control.drawkeys=drawkeys;
//if (vamphost.feat.size()) cerr<<"found "<<vamphost.feat.size()<<" feature(s)\n";
diff --git a/src/testApp.h b/src/testApp.h
index bd34832..59a48f8 100755
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -81,6 +81,9 @@ class testApp : public ofxFensterListener {
ofxFloatSlider sW;
ofxParameter<float> slidWave;
+ ofxToggle reverse;
+ ofxToggle drawkeys;
+
void create1port(bool & pressed);
void create2port(bool & pressed);
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 35f2641..e70155c 100755
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -27,11 +27,18 @@ void viewport::drawport(vpcontrol &control){
rb1.begin();
+ //if (control.fade>0){
+ // ofEnableAlphaBlending();
+ // ofSetColor(255,255,255,255-control.fade);
+ //}
+
//can be done with texture offset?
+ int xshift=control.reverse?(num%2==0?control.xshift:-control.xshift):control.xshift;
+ int yshift=control.reverse?(num%2==0?control.yshift:-control.yshift):control.yshift;
- int startx=((bw-(bw*control.fscale))/2)+control.xshift;
+ int startx=((bw-(bw*control.fscale))/2)+xshift;
while (startx>0) startx-=(bw*control.fscale);
- int starty=((bh-(bh*control.fscale))/2)+control.yshift;
+ int starty=((bh-(bh*control.fscale))/2)+yshift;
while (starty>0) starty-=(bh*control.fscale);
for (int i=startx;i<bw*2;i+=(bw*control.fscale)) {
@@ -64,9 +71,11 @@ void viewport::drawport(vpcontrol &control){
ofRect(0,0,bw,bh);
}
- //for (int i=0;i<control.feats.size();i++){
- // ofCircle(bw*0.2*i,bh*0.5,control.feats[i]*w);
- //}
+ if (control.drawkeys) {
+ for (int i=0;i<control.feats.size();i++){
+ ofCircle(bw*0.16*(i+1),bh*0.5,control.feats[i]*(w/4));
+ }
+ }
ofSetLineWidth(control.thickness);
@@ -94,7 +103,7 @@ void viewport::drawport(vpcontrol &control){
ofFill();
if (control.drawseconds>-1){
- ofCircle(control.bx*bw,control.by*bh,(control.drawseconds*bh*.02)+(bh*.01));
+ ofCircle(control.bx*bw,control.by*bh,(control.drawseconds*bh*.04)+(bh*.02));
}
rb1.end();
diff --git a/src/viewport.h b/src/viewport.h
index 072ec7a..9587f6d 100755
--- a/src/viewport.h
+++ b/src/viewport.h
@@ -4,8 +4,8 @@
#include "ofMain.h"
#include "ofxXmlSettings.h"
-static int bufferSize = 1024;
-static int oversample = 4;
+static int bufferSize = 2048;
+static int oversample = 8;
static int windowsize = 32;
static int previewscale = 5;
@@ -80,6 +80,7 @@ class vpcontrol {
waveheight=1.0f;
fade=0;
drawseconds=-1.0f;
+ reverse=drawkeys=false;
left.assign(bufferSize, 0.0);
right.assign(bufferSize, 0.0);
@@ -124,6 +125,8 @@ class vpcontrol {
float scaledVol;
float bx,by,drawseconds;
+
+ bool reverse,drawkeys;
};
class viewport