Simplify FBO sources example by removing Settings

example_fbo-sources/example_fbo-sources.xcodeproj/project.pbxproj

@@ -100,7 +100,6 @@
 		39264842192224F90008A7F5 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3926483F192224F90008A7F5 /* tinyxmlerror.cpp */; };
 		39264843192224F90008A7F5 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39264840192224F90008A7F5 /* tinyxmlparser.cpp */; };
 		397EFC821A09047C0009286E /* CustomSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397EFC801A09047C0009286E /* CustomSource.cpp */; };
-		3995C20A1C79069B00123352 /* Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3995C2091C79069B00123352 /* Settings.cpp */; };
 		E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; };
 		E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; };
 		E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; };
@@ -344,8 +343,6 @@
 		39264840192224F90008A7F5 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlparser.cpp; sourceTree = "<group>"; };
 		397EFC801A09047C0009286E /* CustomSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomSource.cpp; sourceTree = "<group>"; };
 		397EFC811A09047C0009286E /* CustomSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomSource.h; sourceTree = "<group>"; };
-		3995C2081C79069B00123352 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; };
-		3995C2091C79069B00123352 /* Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Settings.cpp; sourceTree = "<group>"; };
 		BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
 		E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
 		E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
@@ -823,10 +820,8 @@
 				E4B69E1D0A3A1BDC003C02F2 /* main.cpp */,
 				E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */,
 				E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */,
-				397EFC811A09047C0009286E /* CustomSource.h */,
 				397EFC801A09047C0009286E /* CustomSource.cpp */,
-				3995C2081C79069B00123352 /* Settings.h */,
-				3995C2091C79069B00123352 /* Settings.cpp */,
+				397EFC811A09047C0009286E /* CustomSource.h */,
 				011C1A54206EAF89005D7848 /* SlideShowSource */,
 			);
 			path = src;
@@ -1016,7 +1011,6 @@
 				01815ED61FE7D59200C35E93 /* CircleJoint.cpp in Sources */,
 				01815ED71FE7D59200C35E93 /* RadioList.cpp in Sources */,
 				01815ED81FE7D59200C35E93 /* HomographyHelper.cpp in Sources */,
-				3995C20A1C79069B00123352 /* Settings.cpp in Sources */,
 				E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */,
 				39264843192224F90008A7F5 /* tinyxmlparser.cpp in Sources */,
 				39264841192224F90008A7F5 /* tinyxml.cpp in Sources */,

example_fbo-sources/src/Settings.cpp

@@ -1,22 +0,0 @@
-#include "Settings.h"
-
-Settings * Settings::_instance = 0;
-
-Settings * Settings::instance(){
-	if(_instance == 0){
-		_instance = new Settings();
-	}
-	return _instance;
-}
-
-Settings::Settings(){
-	_fullscreen = false;
-}
-
-void Settings::setFullscreen(bool f){
-	_fullscreen = f;
-}
-
-bool Settings::getFullscreen(){
-	return _fullscreen;
-}

example_fbo-sources/src/Settings.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include "ofMain.h"
-
-class Settings {
-	public:
-		static Settings * instance();
-	
-		void setFullscreen(bool f);
-		bool getFullscreen();
-	
-	private:
-		static Settings * _instance;
-	
-		Settings();
-
-		bool _fullscreen;
-};

example_fbo-sources/src/main.cpp

@@ -1,22 +1,7 @@
 #include "ofMain.h"
 #include "ofApp.h"
-#include <string>
-#include <vector>
-#include "Settings.h"
-
-int main(int argc, char * argv[]){
-	bool fullscreen = false;
-
-	std::vector<std::string> arguments = std::vector<std::string>(argv, argv + argc);
-	for(int i = 0; i < arguments.size(); ++i){
-		if(arguments.at(i) == "-f"){
-			fullscreen = true;
-			break;
-		}
-	}
-
-	Settings::instance()->setFullscreen(fullscreen);
 
+int main(){
 	ofSetupOpenGL(1024, 768, OF_WINDOW);
 	ofRunApp(new ofApp());
 }

example_fbo-sources/src/ofApp.cpp

@@ -14,10 +14,12 @@ void ofApp::setup(){
 	piMapper.registerFboSource(slideShowSource);
 	piMapper.setup();
 
-	ofSetFullscreen(Settings::instance()->getFullscreen());
-	ofSetEscapeQuitsApp(false);
-    ofSetLogLevel(OF_LOG_VERBOSE);
+	// This will set the app fullscreen if compiled on Raspberry Pi.
+	#ifdef TARGET_RASPBERRY_PI
+		ofSetFullscreen(true);
+	#endif
 
+	// Start slideshow.
     slideShowSource.play();
 }
 

example_fbo-sources/src/ofApp.h

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