1 files changed, 23 insertions, 8 deletions
diff --git a/liveengineUnmapped/src/viewport.cpp b/liveengineUnmapped/src/viewport.cpp
index cc2cc25..a169146 100755
--- a/liveengineUnmapped/src/viewport.cpp
+++ b/liveengineUnmapped/src/viewport.cpp
@@ -26,7 +26,7 @@ void viewport::setup(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy) {
 
 void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift,int fadeBG){
 	
-	
+	//http://forum.xfce.org/viewtopic.php?id=6580
 		
 		// test screen shape
 		/*
@@ -37,6 +37,8 @@ void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,pla
 		ofRect(0,h/2,w/2,h/2);
 		ofRect(w/2,0,w/2,h/2);
 		*/
+
+		ofPushMatrix();
 		
 		rb1.begin();
 
@@ -57,7 +59,7 @@ void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,pla
 			//fadeout part
 			ofEnableAlphaBlending();
 			ofSetColor(0,0,0,fadeBG);
-			ofRect(0,0,ofGetWidth(),ofGetHeight());
+			ofRect(0,0,w,h);
 			ofDisableAlphaBlending();
 		}
 
@@ -92,26 +94,39 @@ void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,pla
 				}
 			}
 
+			ofPopStyle();
+
 			rb1.end();
 
 			rb2.begin();
 			ofSetColor(255,255,255);
 			rb1.draw(0,0);
 			rb2.end();
+
+			ofPopMatrix();
 			
 			ofPushMatrix();
-			ofTranslate(x+(w/2),y+(h/2));
+			//ofTranslate(x+(w/2),y+(h/2)); this was the one that was working
+			//ofTranslate(abs(sin(ofDegToRad(r))*h/2)+abs(cos(ofDegToRad(r))*w/2),abs(sin(ofDegToRad(r))*w/2)+abs(cos(ofDegToRad(r))*h/2));
+			ofTranslate(x,y);
+
+			ofTranslate(((w/2)*abs(cos(ofDegToRad(r))))+((h/2)*abs(sin(ofDegToRad(r)))),
+				((w/2)*abs(sin(ofDegToRad(r))))+((h/2)*abs(cos(ofDegToRad(r)))));
+
 			ofRotate(r);
+			ofTranslate(-w/2,-h/2);
 			//ofTranslate(-abs(sin(ofDegToRad(r))*h/2)-abs(cos(ofDegToRad(r))*w/2),-abs(sin(ofDegToRad(r))*w/2)-abs(cos(ofDegToRad(r))*h/2));
-			ofTranslate(ox,oy);
-
+			//ofTranslate(ox,oy); get rid of this and get the rotation right
+			
 			ofDisableAlphaBlending();
 
-			rb2.draw(0,0);
+			rb2.draw(0,0);	
+
+			ofPopMatrix();
 			
-		ofPopStyle();
+		
+	
 	
-	ofPopMatrix();
 
 }