summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-09-11 22:34:05 +0100
committerComment <tim@gray.(none)>2013-09-11 22:34:05 +0100
commit87eadaa8e5a22ed6e79868c074f558d6dc6bdcf2 (patch)
treea5a5837fc2e524fcb6727c3c568b2d177eb76bba
parent22543820c41fd5f0052d7a035df96f20c7662949 (diff)
version for derry
-rw-r--r--[-rwxr-xr-x]liveengineUnmapped/bin/data/settings.xml0
-rwxr-xr-xliveengineUnmapped/src/main.cpp1
-rwxr-xr-xliveengineUnmapped/src/viewport.cpp4
3 files changed, 4 insertions, 1 deletions
diff --git a/liveengineUnmapped/bin/data/settings.xml b/liveengineUnmapped/bin/data/settings.xml
index 4330b31..4330b31 100755..100644
--- a/liveengineUnmapped/bin/data/settings.xml
+++ b/liveengineUnmapped/bin/data/settings.xml
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();