first performanceHEADmaster

1 files changed, 15 insertions, 6 deletions

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();