From 3f2cfe8ba337a776f91f785010ff3bc1c43dc6f9 Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 28 Mar 2017 23:33:42 +0100 Subject: move factor to config --- menuApp/src/ofApp.cpp | 4 ++-- menuApp/src/ofApp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'menuApp/src') diff --git a/menuApp/src/ofApp.cpp b/menuApp/src/ofApp.cpp index 44ebf68..1aadaec 100644 --- a/menuApp/src/ofApp.cpp +++ b/menuApp/src/ofApp.cpp @@ -74,7 +74,7 @@ void ofApp::draw(){ ofSetColor(255,255,255); ofPushMatrix(); //Store the coordinate system nexessary for some reason - background.draw(0,0,1080,1920); //ofGetWidth(),ofGetHeight()); + background.draw(0,0,1080*FACTOR,1920*FACTOR); //ofGetWidth(),ofGetHeight()); ofPopMatrix(); //Restore the coordinate system @@ -116,7 +116,7 @@ ofPopMatrix(); //Restore the coordinate system } ofEnableAlphaBlending(); - overlay.draw(0,0,1080,1920); //ofGetWidth(),ofGetHeight()); + overlay.draw(0,0,1080*FACTOR,1920*FACTOR); //ofGetWidth(),ofGetHeight()); ofDisableAlphaBlending(); float t=ofGetElapsedTimef (); diff --git a/menuApp/src/ofApp.h b/menuApp/src/ofApp.h index 9e5471a..761e6c3 100644 --- a/menuApp/src/ofApp.h +++ b/menuApp/src/ofApp.h @@ -6,7 +6,7 @@ #include "ofxTextSuite.h" #define IMAGE_SLOTS 5 -#define FACTOR 1.0 +//#define FACTOR 1.0 #define POLL_INTERVAL 60.0 class ofApp : public ofBaseApp{ -- cgit v1.2.3