summaryrefslogtreecommitdiff
path: root/menuApp/src
diff options
context:
space:
mode:
authortim <tim@eclectronics.org>2017-06-15 00:17:01 +0100
committertim <tim@eclectronics.org>2017-06-15 00:17:01 +0100
commita5a241ae2836881f85fc3a33bdcd673855b27815 (patch)
treef99bd874c2e4df820fdc45f1c892ff1b76b24a21 /menuApp/src
parent2b845b505951c9c9baf6f1ee402d7f7c03882ad2 (diff)
rotate slideshow
Diffstat (limited to 'menuApp/src')
-rw-r--r--menuApp/src/ofApp.cpp23
1 files changed, 13 insertions, 10 deletions
diff --git a/menuApp/src/ofApp.cpp b/menuApp/src/ofApp.cpp
index bdc729a..77abdc8 100644
--- a/menuApp/src/ofApp.cpp
+++ b/menuApp/src/ofApp.cpp
@@ -188,19 +188,21 @@ void ofApp::update(){
void ofApp::draw(){
ofSetColor(255,255,255);
- if (!player.draw()){
+ ofPushMatrix();
- if(ofGetElapsedTimef()-lastPoll>POLL_INTERVAL) {
- loadInstagramFeed();
+ if(ROTATION>0){
+ ofTranslate(540*FACTOR,960*FACTOR);
+ ofRotate(-ROTATION);
+ ofTranslate(-120*FACTOR,-540*FACTOR);
}
- ofPushMatrix();
+ if (!player.draw()){
- if(ROTATION>0){
- ofTranslate(540*FACTOR,960*FACTOR);
- ofRotate(-ROTATION);
- ofTranslate(-120*FACTOR,-540*FACTOR);
+ if(ofGetElapsedTimef()-lastPoll>POLL_INTERVAL) {
+ loadInstagramFeed();
}
+
+
ofPushMatrix(); //Store the coordinate system nexessary for some reason
background.draw(0,0,1080*FACTOR,1920*FACTOR); //ofGetWidth(),ofGetHeight());
@@ -278,8 +280,9 @@ void ofApp::draw(){
isGrabbed=true;
}
- ofPopMatrix();
- }
+ }
+
+ ofPopMatrix();
}