From 636d803d900ed4af77dfe9c770c632bf48796c32 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Fri, 30 Mar 2018 20:19:10 +0200 Subject: [PATCH] Simplify FBO sources example by removing Settings --- .../project.pbxproj | 8 +------ example_fbo-sources/src/Settings.cpp | 22 ------------------- example_fbo-sources/src/Settings.h | 18 --------------- example_fbo-sources/src/main.cpp | 17 +------------- example_fbo-sources/src/ofApp.cpp | 8 ++++--- example_fbo-sources/src/ofApp.h | 1 - 6 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 example_fbo-sources/src/Settings.cpp delete mode 100644 example_fbo-sources/src/Settings.h diff --git a/example_fbo-sources/example_fbo-sources.xcodeproj/project.pbxproj b/example_fbo-sources/example_fbo-sources.xcodeproj/project.pbxproj index c4f86f5..083375f 100644 --- a/example_fbo-sources/example_fbo-sources.xcodeproj/project.pbxproj +++ b/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 = ""; }; 397EFC801A09047C0009286E /* CustomSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomSource.cpp; sourceTree = ""; }; 397EFC811A09047C0009286E /* CustomSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomSource.h; sourceTree = ""; }; - 3995C2081C79069B00123352 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = ""; }; - 3995C2091C79069B00123352 /* Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Settings.cpp; sourceTree = ""; }; BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = ""; }; 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 = ""; }; @@ -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 */, diff --git a/example_fbo-sources/src/Settings.cpp b/example_fbo-sources/src/Settings.cpp deleted file mode 100644 index 509371e..0000000 --- a/example_fbo-sources/src/Settings.cpp +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/example_fbo-sources/src/Settings.h b/example_fbo-sources/src/Settings.h deleted file mode 100644 index db3db66..0000000 --- a/example_fbo-sources/src/Settings.h +++ /dev/null @@ -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; -}; diff --git a/example_fbo-sources/src/main.cpp b/example_fbo-sources/src/main.cpp index 64e63d1..d191606 100644 --- a/example_fbo-sources/src/main.cpp +++ b/example_fbo-sources/src/main.cpp @@ -1,22 +1,7 @@ #include "ofMain.h" #include "ofApp.h" -#include -#include -#include "Settings.h" - -int main(int argc, char * argv[]){ - bool fullscreen = false; - - std::vector arguments = std::vector(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()); } diff --git a/example_fbo-sources/src/ofApp.cpp b/example_fbo-sources/src/ofApp.cpp index 433a6b6..48ce2bc 100644 --- a/example_fbo-sources/src/ofApp.cpp +++ b/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(); } diff --git a/example_fbo-sources/src/ofApp.h b/example_fbo-sources/src/ofApp.h index 62331f0..d89c8bd 100644 --- a/example_fbo-sources/src/ofApp.h +++ b/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"