Browse Source

Update example to use `Settings` singleton

Add different way of entering fullscreen. Store -f in Settings and use `ofSetFullscreen()` during `ofApp::setup()`
master
Krisjanis Rijnieks 9 years ago
parent
commit
da594ca141
  1. 10
      example/src/main.cpp
  2. 2
      example/src/ofApp.cpp
  3. 1
      example/src/ofApp.h

10
example/src/main.cpp

@ -2,6 +2,7 @@
#include "ofApp.h" #include "ofApp.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include "Settings.h"
int main(int argc, char * argv[]){ int main(int argc, char * argv[]){
bool fullscreen = false; bool fullscreen = false;
@ -13,12 +14,9 @@ int main(int argc, char * argv[]){
break; break;
} }
} }
Settings::instance()->setFullscreen(fullscreen);
if(fullscreen){ ofSetupOpenGL(800, 450, OF_WINDOW);
ofSetupOpenGL(800, 450, OF_FULLSCREEN);
}else{
ofSetupOpenGL(800, 450, OF_WINDOW);
}
ofRunApp(new ofApp()); ofRunApp(new ofApp());
} }

2
example/src/ofApp.cpp

@ -19,6 +19,8 @@ void ofApp::setup(){
// The info layer is hidden by default, press <i> to toggle // The info layer is hidden by default, press <i> to toggle
// piMapper.showInfo(); // piMapper.showInfo();
ofSetFullscreen(Settings::instance()->getFullscreen());
} }
void ofApp::draw(){ void ofApp::draw(){

1
example/src/ofApp.h

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "ofMain.h" #include "ofMain.h"
#include "Settings.h"
#include "ofxPiMapper.h" #include "ofxPiMapper.h"
#include "CustomSource.h" #include "CustomSource.h"
#include "CrossSource.h" #include "CrossSource.h"

Loading…
Cancel
Save