diff options
| author | tim <tim@eclectronics.org> | 2017-03-28 22:42:54 +0100 |
|---|---|---|
| committer | tim <tim@eclectronics.org> | 2017-03-28 22:42:54 +0100 |
| commit | d3aa7d233596c7d4dae649df90e1176ed6be2c68 (patch) | |
| tree | af26472972534fbcd806f18b4c2e5eb7ecaf6808 /menuApp | |
| parent | dd79b3578128b0bb82b42b71db99487775b60489 (diff) | |
starting deploy system
Diffstat (limited to 'menuApp')
| -rw-r--r-- | menuApp/config.default | 2 | ||||
| -rw-r--r-- | menuApp/src/main.cpp | 5 | ||||
| -rw-r--r-- | menuApp/src/ofApp.cpp | 2 | ||||
| -rw-r--r-- | menuApp/src/ofApp.h | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/menuApp/config.default b/menuApp/config.default index c261fc7..cda4610 100644 --- a/menuApp/config.default +++ b/menuApp/config.default @@ -87,7 +87,7 @@ # # Note: Leave a leading space when adding list items with the += operator ################################################################################ -# PROJECT_DEFINES = +#PROJECT_DEFINES = FULLSCREEN ################################################################################ # PROJECT CFLAGS diff --git a/menuApp/src/main.cpp b/menuApp/src/main.cpp index dfd29a5..e0837f0 100644 --- a/menuApp/src/main.cpp +++ b/menuApp/src/main.cpp @@ -4,8 +4,11 @@ //======================================================================== int main( ){ +#ifdef FULLSCREEN + ofSetupOpenGL(1080*FACTOR, 1920*FACTOR,OF_FULLSCREEN); +#else ofSetupOpenGL(1080*FACTOR, 1920*FACTOR,OF_WINDOW); // <-------- setup the GL context - +#endif // this kicks off the running of my app // can be OF_WINDOW or OF_FULLSCREEN // pass in width and height too: diff --git a/menuApp/src/ofApp.cpp b/menuApp/src/ofApp.cpp index d65e7e2..5d36000 100644 --- a/menuApp/src/ofApp.cpp +++ b/menuApp/src/ofApp.cpp @@ -119,6 +119,8 @@ ofPopMatrix(); //Restore the coordinate system overlay.draw(0,0,ofGetWidth(),ofGetHeight()); ofDisableAlphaBlending(); + float t=ofGetElapsedTimef(); + } //-------------------------------------------------------------- diff --git a/menuApp/src/ofApp.h b/menuApp/src/ofApp.h index 21d84de..247d811 100644 --- a/menuApp/src/ofApp.h +++ b/menuApp/src/ofApp.h @@ -7,6 +7,7 @@ #define IMAGE_SLOTS 5 #define FACTOR 0.9 +#define POLL_INTERVAL 60.0 class ofApp : public ofBaseApp{ |