From 87eadaa8e5a22ed6e79868c074f558d6dc6bdcf2 Mon Sep 17 00:00:00 2001 From: Comment Date: Wed, 11 Sep 2013 22:34:05 +0100 Subject: version for derry --- liveengineUnmapped/bin/data/settings.xml | 0 liveengineUnmapped/src/main.cpp | 1 + liveengineUnmapped/src/viewport.cpp | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) mode change 100755 => 100644 liveengineUnmapped/bin/data/settings.xml diff --git a/liveengineUnmapped/bin/data/settings.xml b/liveengineUnmapped/bin/data/settings.xml old mode 100755 new mode 100644 diff --git a/liveengineUnmapped/src/main.cpp b/liveengineUnmapped/src/main.cpp index d22025f..615da21 100755 --- a/liveengineUnmapped/src/main.cpp +++ b/liveengineUnmapped/src/main.cpp @@ -7,6 +7,7 @@ int main( ){ ofAppGlutWindow window; + //ofSetupOpenGL(ofxFensterManager::get(),1200,300, OF_WINDOW); ofSetupOpenGL(ofxFensterManager::get(),4080,768, OF_WINDOW); //2048,768 //ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context //ofSetupOpenGL(&window, 1024,768, OF_WINDOW); diff --git a/liveengineUnmapped/src/viewport.cpp b/liveengineUnmapped/src/viewport.cpp index 36e7c65..cc2cc25 100755 --- a/liveengineUnmapped/src/viewport.cpp +++ b/liveengineUnmapped/src/viewport.cpp @@ -53,7 +53,7 @@ void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,pla } } - if (fadeBG<255) { + if (fadeBG>0) { //fadeout part ofEnableAlphaBlending(); ofSetColor(0,0,0,fadeBG); @@ -105,6 +105,8 @@ void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,pla //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); + ofDisableAlphaBlending(); + rb2.draw(0,0); ofPopStyle(); -- cgit v1.2.3