diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt deleted file mode 100755 index 3cf049a..0000000 --- a/example/CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -#THIS FILE SHOULD BE PUT INTO THE OF PROJECT FOLDER - -# ======================================================== -# ===================== CMake Settings =================== -# ======================================================== -cmake_minimum_required( VERSION 3.3 ) - -project( openframeworks ) - -# ======================================================== -# ===================== User Settings ==================== -# ======================================================== -# ---------------------- App name ----------------------- -set( APP_NAME example_ofxPiMapper ) - -# ------------------------ OF Path ----------------------- -# --- If outside the OF stucture, set an absolute OF path -set( OF_DIRECTORY_BY_USER "../../.." ) - -# --------------------- Source Files --------------------- - -file( GLOB_RECURSE - APP_SRC - "src/*.cpp" - ) - -set( ${APP_NAME}_SOURCE_FILES - ${APP_SRC} ) - - -# ------------------------ AddOns ----------------------- -set( OFX_ADDONS_ACTIVE - ofxXmlSettings - ofxGui - ofxPiMapper -# ofxIO - ) - -# ========================================================================= -# ============================== OpenFrameworks =========================== -# ========================================================================= -include( ${OF_DIRECTORY_BY_USER}/addons/ofxCMake/modules/main.cmake ) -# ========================================================================= - diff --git a/example/README.md b/example/README.md deleted file mode 100644 index c12424d..0000000 --- a/example/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Base Example - -This example demonstrates basic functionality of ofxPiMapper. - -- Adding and editing mapping surfaces -- Texture cropping -- Video and image source -- Generative FBO sources -- Default keyboard shortcuts - -Click once to enter projection mapping mode. Then click and click to do the mapping. The `src/CrossSource` and `src/CustomSource` classes are custom FBO source examples. You can re-use them as starting points for your own generative, data-driven or interactive sources. - -There should be no problem compiling this on the Raspberry Pi. On other systems supporting **make** one should change the `addons.make` file and remove the `ofxOMXPlayer` line. For Mac OS with openFrameworks 0.9.8, delete the `ofxGui` files that are marked red from the project pane under `addons/ofxGui`. diff --git a/example/bin/.gitignore b/example/bin/.gitignore deleted file mode 100644 index 970655f..0000000 --- a/example/bin/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.app -data/*.jpg -data/settings.xml -data/surfaces.xml -example -example_debug -libs -readMe.txt diff --git a/example/bin/data/sources/images/blending.png b/example/bin/data/sources/images/blending.png deleted file mode 100644 index a5c8f65..0000000 Binary files a/example/bin/data/sources/images/blending.png and /dev/null differ diff --git a/example/bin/data/sources/images/ofxpimapper-pic.jpg b/example/bin/data/sources/images/ofxpimapper-pic.jpg deleted file mode 100644 index 68e27b2..0000000 Binary files a/example/bin/data/sources/images/ofxpimapper-pic.jpg and /dev/null differ diff --git a/example/bin/data/sources/videos/control-panel-and-operation.mp4 b/example/bin/data/sources/videos/control-panel-and-operation.mp4 deleted file mode 100644 index ebffeba..0000000 Binary files a/example/bin/data/sources/videos/control-panel-and-operation.mp4 and /dev/null differ diff --git a/example/bin/data/sources/videos/earth-and-technicians.mp4 b/example/bin/data/sources/videos/earth-and-technicians.mp4 deleted file mode 100644 index f245470..0000000 Binary files a/example/bin/data/sources/videos/earth-and-technicians.mp4 and /dev/null differ diff --git a/example/bin/data/sources/videos/launch-pad-after-rocket.mp4 b/example/bin/data/sources/videos/launch-pad-after-rocket.mp4 deleted file mode 100644 index 8671d95..0000000 Binary files a/example/bin/data/sources/videos/launch-pad-after-rocket.mp4 and /dev/null differ diff --git a/example/bin/data/sources/videos/spinning-gyroscope-during-aste.mp4 b/example/bin/data/sources/videos/spinning-gyroscope-during-aste.mp4 deleted file mode 100644 index 7e0bd8d..0000000 Binary files a/example/bin/data/sources/videos/spinning-gyroscope-during-aste.mp4 and /dev/null differ diff --git a/example/bin/data/sources/videos/spinning-gyroscope-during-astr.mp4 b/example/bin/data/sources/videos/spinning-gyroscope-during-astr.mp4 deleted file mode 100644 index bff8736..0000000 Binary files a/example/bin/data/sources/videos/spinning-gyroscope-during-astr.mp4 and /dev/null differ diff --git a/example/bin/data/sources/videos/test.mov b/example/bin/data/sources/videos/test.mov deleted file mode 100644 index 48a307b..0000000 Binary files a/example/bin/data/sources/videos/test.mov and /dev/null differ diff --git a/example/example.qbs b/example/example.qbs deleted file mode 100644 index bda70b8..0000000 --- a/example/example.qbs +++ /dev/null @@ -1,64 +0,0 @@ -import qbs -import qbs.Process -import qbs.File -import qbs.FileInfo -import qbs.TextFile -import "../../../libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp - -Project{ - property string of_root: "../../.." - - ofApp { - name: { return FileInfo.baseName(path) } - - files: [ - "src/CrossSource.cpp", - "src/CrossSource.h", - "src/CustomSource.cpp", - "src/CustomSource.h", - "src/Settings.cpp", - "src/Settings.h", - 'src/main.cpp', - 'src/ofApp.cpp', - 'src/ofApp.h', - ] - - of.addons: [ - 'ofxGui', - 'ofxPiMapper', - 'ofxXmlSettings', - ] - - // additional flags for the project. the of module sets some - // flags by default to add the core libraries, search paths... - // this flags can be augmented through the following properties: - of.pkgConfigs: [] // list of additional system pkgs to include - of.includePaths: [] // include search paths - of.cFlags: [] // flags passed to the c compiler - of.cxxFlags: [] // flags passed to the c++ compiler - of.linkerFlags: [] // flags passed to the linker - of.defines: [] // defines are passed as -D to the compiler - // and can be checked with #ifdef or #if in the code - - // other flags can be set through the cpp module: http://doc.qt.io/qbs/cpp-module.html - // eg: this will enable ccache when compiling - // - // cpp.compilerWrapper: 'ccache' - - Depends{ - name: "cpp" - } - - // common rules that parse the include search paths, core libraries... - Depends{ - name: "of" - } - - // dependency with the OF library - Depends{ - name: "openFrameworks" - } - } - - references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] -} diff --git a/example/src/CrossSource.cpp b/example/src/CrossSource.cpp deleted file mode 100644 index a7b6c4a..0000000 --- a/example/src/CrossSource.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include "CrossSource.h" - -CrossSource::CrossSource(){ - name = "Cross FBO Source"; - allocate(500, 500); -} - -void CrossSource::draw(){ - ofClear(0); - ofSetColor(255, 255, 0, 255); - #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 - ofDrawRectangle(0, 0, getWidth(), getHeight()); - #else - ofRect(0, 0, getWidth(), getHeight()); - #endif - ofSetColor(0, 0, 0, 255); - ofSetLineWidth(5); - - float y = sin(float(ofGetFrameNum()) / 10.0f) * 100.0f; - - ofPoint startPoint = ofPoint(10, y); - ofPoint endPoint = ofPoint(getWidth() - 10, getHeight() - y); - #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 - ofDrawLine(startPoint, endPoint); - #else - ofLine(startPoint, endPoint); - #endif - float tempY = startPoint.y; - startPoint.y = endPoint.y; - endPoint.y = tempY; - #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 - ofDrawLine(startPoint, endPoint); - #else - ofLine(startPoint, endPoint); - #endif -} \ No newline at end of file diff --git a/example/src/CrossSource.h b/example/src/CrossSource.h deleted file mode 100644 index bc0d2b2..0000000 --- a/example/src/CrossSource.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "ofMain.h" -#include "FboSource.h" - -class CrossSource : public ofx::piMapper::FboSource { - public: - CrossSource(); - - void draw(); -}; \ No newline at end of file diff --git a/example/.gitignore b/example_fbo-sources/.gitignore similarity index 100% rename from example/.gitignore rename to example_fbo-sources/.gitignore diff --git a/example/Makefile b/example_fbo-sources/Makefile similarity index 100% rename from example/Makefile rename to example_fbo-sources/Makefile diff --git a/example/Project.xcconfig b/example_fbo-sources/Project.xcconfig similarity index 100% rename from example/Project.xcconfig rename to example_fbo-sources/Project.xcconfig diff --git a/example_fbo-sources/README.md b/example_fbo-sources/README.md new file mode 100644 index 0000000..caa2024 --- /dev/null +++ b/example_fbo-sources/README.md @@ -0,0 +1,8 @@ +# Base Example + +This example shows how to use custom (FBO) source functionality with ofxPiMapper. Below you can see a list of custom sources and feel free to add your own via pull requests! + +- ScanlineSource +- SlideShowSource + +To build your own source, one should start by extending the `FboSource` class. When the source is ready, it should be instantiated in the `ofApp` class and passed via `mapper.registerFboSource(...source)` function before the `mapper.setup()` call. This will make the source name to appear under **FBO Sources** category in the source selection mode. diff --git a/example/addons.make b/example_fbo-sources/addons.make similarity index 100% rename from example/addons.make rename to example_fbo-sources/addons.make diff --git a/example/bin/data/magslideshow_settings.xml b/example_fbo-sources/bin/data/magslideshow_settings.xml similarity index 100% rename from example/bin/data/magslideshow_settings.xml rename to example_fbo-sources/bin/data/magslideshow_settings.xml diff --git a/example/bin/data/ofxpimapper.xml b/example_fbo-sources/bin/data/ofxpimapper.xml similarity index 97% rename from example/bin/data/ofxpimapper.xml rename to example_fbo-sources/bin/data/ofxpimapper.xml index fcea673..bd79dc9 100644 --- a/example/bin/data/ofxpimapper.xml +++ b/example_fbo-sources/bin/data/ofxpimapper.xml @@ -82,8 +82,8 @@ - fbo - Slide Show Source + image + image1.jpg 1 diff --git a/example/bin/data/sources/images/image1.jpg b/example_fbo-sources/bin/data/sources/images/image1.jpg similarity index 100% rename from example/bin/data/sources/images/image1.jpg rename to example_fbo-sources/bin/data/sources/images/image1.jpg diff --git a/example/bin/data/sources/images/image2.jpg b/example_fbo-sources/bin/data/sources/images/image2.jpg similarity index 100% rename from example/bin/data/sources/images/image2.jpg rename to example_fbo-sources/bin/data/sources/images/image2.jpg diff --git a/example/bin/data/sources/images/image3.jpg b/example_fbo-sources/bin/data/sources/images/image3.jpg similarity index 100% rename from example/bin/data/sources/images/image3.jpg rename to example_fbo-sources/bin/data/sources/images/image3.jpg diff --git a/example/bin/data/sources/images/image4.jpg b/example_fbo-sources/bin/data/sources/images/image4.jpg similarity index 100% rename from example/bin/data/sources/images/image4.jpg rename to example_fbo-sources/bin/data/sources/images/image4.jpg diff --git a/example/bin/data/sources/images/image5.jpg b/example_fbo-sources/bin/data/sources/images/image5.jpg similarity index 100% rename from example/bin/data/sources/images/image5.jpg rename to example_fbo-sources/bin/data/sources/images/image5.jpg diff --git a/example/example.xcodeproj/project.pbxproj b/example_fbo-sources/example_fbo-sources.xcodeproj/project.pbxproj similarity index 94% rename from example/example.xcodeproj/project.pbxproj rename to example_fbo-sources/example_fbo-sources.xcodeproj/project.pbxproj index c5d67a9..c4f86f5 100644 --- a/example/example.xcodeproj/project.pbxproj +++ b/example_fbo-sources/example_fbo-sources.xcodeproj/project.pbxproj @@ -9,11 +9,13 @@ /* Begin PBXBuildFile section */ 010E92E21FEEEE9D0015B02B /* Vec2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 010E92DE1FEEEE8D0015B02B /* Vec2.cpp */; }; 010E92E31FEEEE9D0015B02B /* Vec3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 010E92E01FEEEE8D0015B02B /* Vec3.cpp */; }; + 011C1A5D206EAF89005D7848 /* magSlide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011C1A55206EAF89005D7848 /* magSlide.cpp */; }; + 011C1A5E206EAF89005D7848 /* magSlideShowSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011C1A57206EAF89005D7848 /* magSlideShowSource.cpp */; }; + 011C1A5F206EAF89005D7848 /* magSlideTransition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011C1A59206EAF89005D7848 /* magSlideTransition.cpp */; }; + 011C1A60206EAF89005D7848 /* magSlideTransitionFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011C1A5B206EAF89005D7848 /* magSlideTransitionFactory.cpp */; }; 01372D7D1FF2E7D4006D41AC /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D6B1FF2E7B4006D41AC /* ofxBaseGui.cpp */; }; 01372D7E1FF2E7D4006D41AC /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D751FF2E7B4006D41AC /* ofxButton.cpp */; }; - 01372D7F1FF2E7D4006D41AC /* ofxColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D781FF2E7B4006D41AC /* ofxColorPicker.cpp */; }; 01372D801FF2E7D4006D41AC /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D771FF2E7B4006D41AC /* ofxGuiGroup.cpp */; }; - 01372D811FF2E7D4006D41AC /* ofxInputField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D7A1FF2E7B4006D41AC /* ofxInputField.cpp */; }; 01372D821FF2E7D4006D41AC /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D791FF2E7B4006D41AC /* ofxLabel.cpp */; }; 01372D831FF2E7D4006D41AC /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D6E1FF2E7B4006D41AC /* ofxPanel.cpp */; }; 01372D841FF2E7D4006D41AC /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01372D7B1FF2E7B5006D41AC /* ofxSlider.cpp */; }; @@ -78,10 +80,6 @@ 01815EC41FE7D59200C35E93 /* BaseSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E5A1FE7D53700C35E93 /* BaseSource.cpp */; }; 01815EC51FE7D59200C35E93 /* FboSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E5C1FE7D53700C35E93 /* FboSource.cpp */; }; 01815EC61FE7D59200C35E93 /* ImageSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E5E1FE7D53700C35E93 /* ImageSource.cpp */; }; - 01815EC71FE7D59200C35E93 /* magSlide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E601FE7D53700C35E93 /* magSlide.cpp */; }; - 01815EC81FE7D59200C35E93 /* magSlideShowSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E621FE7D53700C35E93 /* magSlideShowSource.cpp */; }; - 01815EC91FE7D59200C35E93 /* magSlideTransition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E641FE7D53700C35E93 /* magSlideTransition.cpp */; }; - 01815ECA1FE7D59200C35E93 /* magSlideTransitionFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E661FE7D53700C35E93 /* magSlideTransitionFactory.cpp */; }; 01815ECB1FE7D59200C35E93 /* OMXPlayerCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E681FE7D53700C35E93 /* OMXPlayerCache.cpp */; }; 01815ECC1FE7D59200C35E93 /* VideoSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E6C1FE7D53700C35E93 /* VideoSource.cpp */; }; 01815ECD1FE7D59200C35E93 /* BaseSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01815E6F1FE7D53700C35E93 /* BaseSurface.cpp */; }; @@ -103,7 +101,6 @@ 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 */; }; - 399953691BD54FF600D5B1F1 /* CrossSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 399953671BD54FF600D5B1F1 /* CrossSource.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 */; }; @@ -158,12 +155,18 @@ 010E92DF1FEEEE8D0015B02B /* Vec2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Vec2.h; sourceTree = ""; }; 010E92E01FEEEE8D0015B02B /* Vec3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Vec3.cpp; sourceTree = ""; }; 010E92E11FEEEE8D0015B02B /* Vec3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Vec3.h; sourceTree = ""; }; + 011C1A55206EAF89005D7848 /* magSlide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = magSlide.cpp; sourceTree = ""; }; + 011C1A56206EAF89005D7848 /* magSlide.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = magSlide.h; sourceTree = ""; }; + 011C1A57206EAF89005D7848 /* magSlideShowSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = magSlideShowSource.cpp; sourceTree = ""; }; + 011C1A58206EAF89005D7848 /* magSlideShowSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = magSlideShowSource.h; sourceTree = ""; }; + 011C1A59206EAF89005D7848 /* magSlideTransition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = magSlideTransition.cpp; sourceTree = ""; }; + 011C1A5A206EAF89005D7848 /* magSlideTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = magSlideTransition.h; sourceTree = ""; }; + 011C1A5B206EAF89005D7848 /* magSlideTransitionFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = magSlideTransitionFactory.cpp; sourceTree = ""; }; + 011C1A5C206EAF89005D7848 /* magSlideTransitionFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = magSlideTransitionFactory.h; sourceTree = ""; }; 01372D681FF2E7B4006D41AC /* ofxToggle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxToggle.cpp; sourceTree = ""; }; 01372D691FF2E7B4006D41AC /* ofxButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxButton.h; sourceTree = ""; }; 01372D6A1FF2E7B4006D41AC /* ofxSliderGroup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxSliderGroup.h; sourceTree = ""; }; 01372D6B1FF2E7B4006D41AC /* ofxBaseGui.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxBaseGui.cpp; sourceTree = ""; }; - 01372D6C1FF2E7B4006D41AC /* ofxColorPicker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxColorPicker.h; sourceTree = ""; }; - 01372D6D1FF2E7B4006D41AC /* ofxInputField.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxInputField.h; sourceTree = ""; }; 01372D6E1FF2E7B4006D41AC /* ofxPanel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxPanel.cpp; sourceTree = ""; }; 01372D6F1FF2E7B4006D41AC /* ofxGui.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxGui.h; sourceTree = ""; }; 01372D701FF2E7B4006D41AC /* ofxPanel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxPanel.h; sourceTree = ""; }; @@ -174,9 +177,7 @@ 01372D751FF2E7B4006D41AC /* ofxButton.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxButton.cpp; sourceTree = ""; }; 01372D761FF2E7B4006D41AC /* ofxBaseGui.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxBaseGui.h; sourceTree = ""; }; 01372D771FF2E7B4006D41AC /* ofxGuiGroup.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxGuiGroup.cpp; sourceTree = ""; }; - 01372D781FF2E7B4006D41AC /* ofxColorPicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxColorPicker.cpp; sourceTree = ""; }; 01372D791FF2E7B4006D41AC /* ofxLabel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxLabel.cpp; sourceTree = ""; }; - 01372D7A1FF2E7B4006D41AC /* ofxInputField.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxInputField.cpp; sourceTree = ""; }; 01372D7B1FF2E7B5006D41AC /* ofxSlider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxSlider.cpp; sourceTree = ""; }; 01372D7C1FF2E7B5006D41AC /* ofxLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxLabel.h; sourceTree = ""; }; 01815DE01FE7D53700C35E93 /* Application.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Application.cpp; sourceTree = ""; }; @@ -300,14 +301,6 @@ 01815E5D1FE7D53700C35E93 /* FboSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FboSource.h; sourceTree = ""; }; 01815E5E1FE7D53700C35E93 /* ImageSource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ImageSource.cpp; sourceTree = ""; }; 01815E5F1FE7D53700C35E93 /* ImageSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ImageSource.h; sourceTree = ""; }; - 01815E601FE7D53700C35E93 /* magSlide.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = magSlide.cpp; sourceTree = ""; }; - 01815E611FE7D53700C35E93 /* magSlide.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = magSlide.h; sourceTree = ""; }; - 01815E621FE7D53700C35E93 /* magSlideShowSource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = magSlideShowSource.cpp; sourceTree = ""; }; - 01815E631FE7D53700C35E93 /* magSlideShowSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = magSlideShowSource.h; sourceTree = ""; }; - 01815E641FE7D53700C35E93 /* magSlideTransition.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = magSlideTransition.cpp; sourceTree = ""; }; - 01815E651FE7D53700C35E93 /* magSlideTransition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = magSlideTransition.h; sourceTree = ""; }; - 01815E661FE7D53700C35E93 /* magSlideTransitionFactory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = magSlideTransitionFactory.cpp; sourceTree = ""; }; - 01815E671FE7D53700C35E93 /* magSlideTransitionFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = magSlideTransitionFactory.h; sourceTree = ""; }; 01815E681FE7D53700C35E93 /* OMXPlayerCache.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OMXPlayerCache.cpp; sourceTree = ""; }; 01815E691FE7D53700C35E93 /* OMXPlayerCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OMXPlayerCache.h; sourceTree = ""; }; 01815E6A1FE7D53700C35E93 /* SourceType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SourceType.h; sourceTree = ""; }; @@ -353,8 +346,6 @@ 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 = ""; }; - 399953671BD54FF600D5B1F1 /* CrossSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossSource.cpp; sourceTree = ""; }; - 399953681BD54FF600D5B1F1 /* CrossSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossSource.h; 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 = ""; }; @@ -365,7 +356,7 @@ E45BE9770E8CC7DD009D7055 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; E45BE9790E8CC7DD009D7055 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; - E4B69B5B0A3A1756003C02F2 /* exampleDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = exampleDebug.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E4B69B5B0A3A1756003C02F2 /* example_fbo-sourcesDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "example_fbo-sourcesDebug.app"; sourceTree = BUILT_PRODUCTS_DIR; }; E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; }; E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofApp.cpp; path = src/ofApp.cpp; sourceTree = SOURCE_ROOT; }; E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; }; @@ -418,6 +409,21 @@ path = Types; sourceTree = ""; }; + 011C1A54206EAF89005D7848 /* SlideShowSource */ = { + isa = PBXGroup; + children = ( + 011C1A55206EAF89005D7848 /* magSlide.cpp */, + 011C1A56206EAF89005D7848 /* magSlide.h */, + 011C1A57206EAF89005D7848 /* magSlideShowSource.cpp */, + 011C1A58206EAF89005D7848 /* magSlideShowSource.h */, + 011C1A59206EAF89005D7848 /* magSlideTransition.cpp */, + 011C1A5A206EAF89005D7848 /* magSlideTransition.h */, + 011C1A5B206EAF89005D7848 /* magSlideTransitionFactory.cpp */, + 011C1A5C206EAF89005D7848 /* magSlideTransitionFactory.h */, + ); + path = SlideShowSource; + sourceTree = ""; + }; 01815DDE1FE7D53700C35E93 /* src */ = { isa = PBXGroup; children = ( @@ -611,14 +617,6 @@ 01815E5D1FE7D53700C35E93 /* FboSource.h */, 01815E5E1FE7D53700C35E93 /* ImageSource.cpp */, 01815E5F1FE7D53700C35E93 /* ImageSource.h */, - 01815E601FE7D53700C35E93 /* magSlide.cpp */, - 01815E611FE7D53700C35E93 /* magSlide.h */, - 01815E621FE7D53700C35E93 /* magSlideShowSource.cpp */, - 01815E631FE7D53700C35E93 /* magSlideShowSource.h */, - 01815E641FE7D53700C35E93 /* magSlideTransition.cpp */, - 01815E651FE7D53700C35E93 /* magSlideTransition.h */, - 01815E661FE7D53700C35E93 /* magSlideTransitionFactory.cpp */, - 01815E671FE7D53700C35E93 /* magSlideTransitionFactory.h */, 01815E681FE7D53700C35E93 /* OMXPlayerCache.cpp */, 01815E691FE7D53700C35E93 /* OMXPlayerCache.h */, 01815E6A1FE7D53700C35E93 /* SourceType.h */, @@ -724,13 +722,9 @@ 01372D761FF2E7B4006D41AC /* ofxBaseGui.h */, 01372D751FF2E7B4006D41AC /* ofxButton.cpp */, 01372D691FF2E7B4006D41AC /* ofxButton.h */, - 01372D781FF2E7B4006D41AC /* ofxColorPicker.cpp */, - 01372D6C1FF2E7B4006D41AC /* ofxColorPicker.h */, 01372D6F1FF2E7B4006D41AC /* ofxGui.h */, 01372D771FF2E7B4006D41AC /* ofxGuiGroup.cpp */, 01372D721FF2E7B4006D41AC /* ofxGuiGroup.h */, - 01372D7A1FF2E7B4006D41AC /* ofxInputField.cpp */, - 01372D6D1FF2E7B4006D41AC /* ofxInputField.h */, 01372D791FF2E7B4006D41AC /* ofxLabel.cpp */, 01372D7C1FF2E7B5006D41AC /* ofxLabel.h */, 01372D6E1FF2E7B4006D41AC /* ofxPanel.cpp */, @@ -819,7 +813,7 @@ E4EEC9E9138DF44700A80321 /* openFrameworks */, BB4B014C10F69532006C3DED /* addons */, E45BE5980E8CC70C009D7055 /* frameworks */, - E4B69B5B0A3A1756003C02F2 /* exampleDebug.app */, + E4B69B5B0A3A1756003C02F2 /* example_fbo-sourcesDebug.app */, ); sourceTree = ""; }; @@ -831,10 +825,9 @@ E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */, 397EFC811A09047C0009286E /* CustomSource.h */, 397EFC801A09047C0009286E /* CustomSource.cpp */, - 399953681BD54FF600D5B1F1 /* CrossSource.h */, - 399953671BD54FF600D5B1F1 /* CrossSource.cpp */, 3995C2081C79069B00123352 /* Settings.h */, 3995C2091C79069B00123352 /* Settings.cpp */, + 011C1A54206EAF89005D7848 /* SlideShowSource */, ); path = src; sourceTree = SOURCE_ROOT; @@ -851,9 +844,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - E4B69B5A0A3A1756003C02F2 /* example */ = { + E4B69B5A0A3A1756003C02F2 /* example_fbo-sources */ = { isa = PBXNativeTarget; - buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "example" */; + buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "example_fbo-sources" */; buildPhases = ( E4B69B580A3A1756003C02F2 /* Sources */, E4B69B590A3A1756003C02F2 /* Frameworks */, @@ -865,9 +858,9 @@ dependencies = ( E4EEB9AC138B136A00A80321 /* PBXTargetDependency */, ); - name = example; + name = "example_fbo-sources"; productName = myOFApp; - productReference = E4B69B5B0A3A1756003C02F2 /* exampleDebug.app */; + productReference = E4B69B5B0A3A1756003C02F2 /* example_fbo-sourcesDebug.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -878,7 +871,7 @@ attributes = { LastUpgradeCheck = 0720; }; - buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "example" */; + buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "example_fbo-sources" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -899,7 +892,7 @@ ); projectRoot = ""; targets = ( - E4B69B5A0A3A1756003C02F2 /* example */, + E4B69B5A0A3A1756003C02F2 /* example_fbo-sources */, ); }; /* End PBXProject section */ @@ -937,9 +930,7 @@ files = ( 01372D7D1FF2E7D4006D41AC /* ofxBaseGui.cpp in Sources */, 01372D7E1FF2E7D4006D41AC /* ofxButton.cpp in Sources */, - 01372D7F1FF2E7D4006D41AC /* ofxColorPicker.cpp in Sources */, 01372D801FF2E7D4006D41AC /* ofxGuiGroup.cpp in Sources */, - 01372D811FF2E7D4006D41AC /* ofxInputField.cpp in Sources */, 01372D821FF2E7D4006D41AC /* ofxLabel.cpp in Sources */, 01372D831FF2E7D4006D41AC /* ofxPanel.cpp in Sources */, 01372D841FF2E7D4006D41AC /* ofxSlider.cpp in Sources */, @@ -958,7 +949,9 @@ 01815E941FE7D59200C35E93 /* AddGridRowCmd.cpp in Sources */, 01815E951FE7D59200C35E93 /* AddSurfaceCmd.cpp in Sources */, 01815E961FE7D59200C35E93 /* ClearSurfacesCmd.cpp in Sources */, + 011C1A5E206EAF89005D7848 /* magSlideShowSource.cpp in Sources */, 01815E971FE7D59200C35E93 /* CmdManager.cpp in Sources */, + 011C1A60206EAF89005D7848 /* magSlideTransitionFactory.cpp in Sources */, 01815E981FE7D59200C35E93 /* DeselectSurfaceCmd.cpp in Sources */, 01815E991FE7D59200C35E93 /* DeselectTexCoordCmd.cpp in Sources */, 01815E9A1FE7D59200C35E93 /* DuplicateSurfaceCmd.cpp in Sources */, @@ -1007,12 +1000,10 @@ 01815EC41FE7D59200C35E93 /* BaseSource.cpp in Sources */, 01815EC51FE7D59200C35E93 /* FboSource.cpp in Sources */, 01815EC61FE7D59200C35E93 /* ImageSource.cpp in Sources */, - 01815EC71FE7D59200C35E93 /* magSlide.cpp in Sources */, - 01815EC81FE7D59200C35E93 /* magSlideShowSource.cpp in Sources */, - 01815EC91FE7D59200C35E93 /* magSlideTransition.cpp in Sources */, - 01815ECA1FE7D59200C35E93 /* magSlideTransitionFactory.cpp in Sources */, 01815ECB1FE7D59200C35E93 /* OMXPlayerCache.cpp in Sources */, + 011C1A5D206EAF89005D7848 /* magSlide.cpp in Sources */, 01815ECC1FE7D59200C35E93 /* VideoSource.cpp in Sources */, + 011C1A5F206EAF89005D7848 /* magSlideTransition.cpp in Sources */, 01815ECD1FE7D59200C35E93 /* BaseSurface.cpp in Sources */, 01815ECE1FE7D59200C35E93 /* GridWarpSurface.cpp in Sources */, 01815ECF1FE7D59200C35E93 /* HexagonSurface.cpp in Sources */, @@ -1029,7 +1020,6 @@ E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, 39264843192224F90008A7F5 /* tinyxmlparser.cpp in Sources */, 39264841192224F90008A7F5 /* tinyxml.cpp in Sources */, - 399953691BD54FF600D5B1F1 /* CrossSource.cpp in Sources */, E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */, 39264842192224F90008A7F5 /* tinyxmlerror.cpp in Sources */, 3926483B192224DA0008A7F5 /* ofxXmlSettings.cpp in Sources */, @@ -1224,7 +1214,7 @@ "$(OF_CORE_FRAMEWORKS)", ); PRODUCT_BUNDLE_IDENTIFIER = cc.openFrameworks.ofapp; - PRODUCT_NAME = exampleDebug; + PRODUCT_NAME = "example_fbo-sourcesDebug"; SDKROOT = macosx; WRAPPER_EXTENSION = app; }; @@ -1320,7 +1310,7 @@ "$(OF_CORE_FRAMEWORKS)", ); PRODUCT_BUNDLE_IDENTIFIER = cc.openFrameworks.ofapp; - PRODUCT_NAME = example; + PRODUCT_NAME = "example_fbo-sourcesDebug"; SDKROOT = macosx; WRAPPER_EXTENSION = app; }; @@ -1329,7 +1319,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "example" */ = { + E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "example_fbo-sources" */ = { isa = XCConfigurationList; buildConfigurations = ( E4B69B4E0A3A1720003C02F2 /* Debug */, @@ -1338,7 +1328,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "example" */ = { + E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "example_fbo-sources" */ = { isa = XCConfigurationList; buildConfigurations = ( E4B69B600A3A1757003C02F2 /* Debug */, diff --git a/example/example.xcodeproj/xcshareddata/xcschemes/example Debug.xcscheme b/example_fbo-sources/example_fbo-sources.xcodeproj/xcshareddata/xcschemes/example_fbo-sources Debug.xcscheme similarity index 83% rename from example/example.xcodeproj/xcshareddata/xcschemes/example Debug.xcscheme rename to example_fbo-sources/example_fbo-sources.xcodeproj/xcshareddata/xcschemes/example_fbo-sources Debug.xcscheme index b040463..231ac8e 100644 --- a/example/example.xcodeproj/xcshareddata/xcschemes/example Debug.xcscheme +++ b/example_fbo-sources/example_fbo-sources.xcodeproj/xcshareddata/xcschemes/example_fbo-sources Debug.xcscheme @@ -16,8 +16,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -34,8 +35,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> @@ -45,6 +46,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -57,8 +59,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> @@ -76,8 +78,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> diff --git a/example/example.xcodeproj/xcshareddata/xcschemes/example Release.xcscheme b/example_fbo-sources/example_fbo-sources.xcodeproj/xcshareddata/xcschemes/example_fbo-sources Release.xcscheme similarity index 83% rename from example/example.xcodeproj/xcshareddata/xcschemes/example Release.xcscheme rename to example_fbo-sources/example_fbo-sources.xcodeproj/xcshareddata/xcschemes/example_fbo-sources Release.xcscheme index 1584e8a..8134e41 100644 --- a/example/example.xcodeproj/xcshareddata/xcschemes/example Release.xcscheme +++ b/example_fbo-sources/example_fbo-sources.xcodeproj/xcshareddata/xcschemes/example_fbo-sources Release.xcscheme @@ -16,8 +16,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> @@ -26,6 +26,7 @@ buildConfiguration = "Release" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -34,8 +35,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> @@ -45,6 +46,7 @@ buildConfiguration = "Release" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -57,8 +59,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> @@ -76,8 +78,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2" BuildableName = "example.app" - BlueprintName = "example" - ReferencedContainer = "container:example.xcodeproj"> + BlueprintName = "example_fbo-sources" + ReferencedContainer = "container:example_fbo-sources.xcodeproj"> diff --git a/example/openFrameworks-Info.plist b/example_fbo-sources/openFrameworks-Info.plist similarity index 100% rename from example/openFrameworks-Info.plist rename to example_fbo-sources/openFrameworks-Info.plist diff --git a/example/src/CustomSource.cpp b/example_fbo-sources/src/CustomSource.cpp similarity index 100% rename from example/src/CustomSource.cpp rename to example_fbo-sources/src/CustomSource.cpp diff --git a/example/src/CustomSource.h b/example_fbo-sources/src/CustomSource.h similarity index 100% rename from example/src/CustomSource.h rename to example_fbo-sources/src/CustomSource.h diff --git a/example/src/Settings.cpp b/example_fbo-sources/src/Settings.cpp similarity index 100% rename from example/src/Settings.cpp rename to example_fbo-sources/src/Settings.cpp diff --git a/example/src/Settings.h b/example_fbo-sources/src/Settings.h similarity index 100% rename from example/src/Settings.h rename to example_fbo-sources/src/Settings.h diff --git a/src/Sources/magSlide.cpp b/example_fbo-sources/src/SlideShowSource/magSlide.cpp similarity index 100% rename from src/Sources/magSlide.cpp rename to example_fbo-sources/src/SlideShowSource/magSlide.cpp diff --git a/src/Sources/magSlide.h b/example_fbo-sources/src/SlideShowSource/magSlide.h similarity index 100% rename from src/Sources/magSlide.h rename to example_fbo-sources/src/SlideShowSource/magSlide.h diff --git a/src/Sources/magSlideShowSource.cpp b/example_fbo-sources/src/SlideShowSource/magSlideShowSource.cpp similarity index 99% rename from src/Sources/magSlideShowSource.cpp rename to example_fbo-sources/src/SlideShowSource/magSlideShowSource.cpp index 48b9359..897ce93 100644 --- a/src/Sources/magSlideShowSource.cpp +++ b/example_fbo-sources/src/SlideShowSource/magSlideShowSource.cpp @@ -145,7 +145,7 @@ void magSlideShowSource::draw() { ofPushMatrix(); ofPushStyle(); ofTranslate(getWidth()/2.0f, getHeight()/2.0f); - ofEnableAlphaBlending(); + //ofEnableAlphaBlending(); ofSetRectMode(OF_RECTMODE_CENTER); ofFill(); ofSetColor(255, 255); @@ -155,7 +155,7 @@ void magSlideShowSource::draw() { } ofPopStyle(); ofPopMatrix(); - ofDisableAlphaBlending(); + //ofDisableAlphaBlending(); } bool magSlideShowSource::createFromFolderContents(std::string path) { diff --git a/src/Sources/magSlideShowSource.h b/example_fbo-sources/src/SlideShowSource/magSlideShowSource.h similarity index 100% rename from src/Sources/magSlideShowSource.h rename to example_fbo-sources/src/SlideShowSource/magSlideShowSource.h diff --git a/src/Sources/magSlideTransition.cpp b/example_fbo-sources/src/SlideShowSource/magSlideTransition.cpp similarity index 100% rename from src/Sources/magSlideTransition.cpp rename to example_fbo-sources/src/SlideShowSource/magSlideTransition.cpp diff --git a/src/Sources/magSlideTransition.h b/example_fbo-sources/src/SlideShowSource/magSlideTransition.h similarity index 100% rename from src/Sources/magSlideTransition.h rename to example_fbo-sources/src/SlideShowSource/magSlideTransition.h diff --git a/src/Sources/magSlideTransitionFactory.cpp b/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.cpp similarity index 100% rename from src/Sources/magSlideTransitionFactory.cpp rename to example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.cpp diff --git a/src/Sources/magSlideTransitionFactory.h b/example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.h similarity index 100% rename from src/Sources/magSlideTransitionFactory.h rename to example_fbo-sources/src/SlideShowSource/magSlideTransitionFactory.h diff --git a/example/src/main.cpp b/example_fbo-sources/src/main.cpp similarity index 100% rename from example/src/main.cpp rename to example_fbo-sources/src/main.cpp diff --git a/example/src/ofApp.cpp b/example_fbo-sources/src/ofApp.cpp similarity index 64% rename from example/src/ofApp.cpp rename to example_fbo-sources/src/ofApp.cpp index d4d9395..433a6b6 100644 --- a/example/src/ofApp.cpp +++ b/example_fbo-sources/src/ofApp.cpp @@ -8,30 +8,17 @@ void ofApp::setup(){ ofx::piMapper::VideoSource::enableAudio = true; ofx::piMapper::VideoSource::useHDMIForAudio = false; - // Add our CustomSource to list of fbo sources of the piMapper - // FBO sources should be added before piMapper.setup() so the - // piMapper is able to load the source if it is assigned to - // a surface in XML settings. - crossSource = new CrossSource(); - customSource = new CustomSource(); - - // Create the slide show source. - slideShowSource = new magSlideShowSource(); - - // Register our sources: - piMapper.registerFboSource(crossSource); + // Register our sources. + // This should be done before mapper.setup(). piMapper.registerFboSource(customSource); piMapper.registerFboSource(slideShowSource); piMapper.setup(); - // The info layer is hidden by default, press to toggle - // piMapper.showInfo(); - ofSetFullscreen(Settings::instance()->getFullscreen()); ofSetEscapeQuitsApp(false); ofSetLogLevel(OF_LOG_VERBOSE); - slideShowSource->play(); + slideShowSource.play(); } void ofApp::update(){ diff --git a/example/src/ofApp.h b/example_fbo-sources/src/ofApp.h similarity index 83% rename from example/src/ofApp.h rename to example_fbo-sources/src/ofApp.h index aa07e98..62331f0 100644 --- a/example/src/ofApp.h +++ b/example_fbo-sources/src/ofApp.h @@ -4,7 +4,6 @@ #include "Settings.h" #include "ofxPiMapper.h" #include "CustomSource.h" -#include "CrossSource.h" #include "VideoSource.h" #include "magSlideShowSource.h" @@ -25,8 +24,7 @@ public: // By using a custom source that is derived from FboSource // you will be able to see the source listed in sources editor - CustomSource *customSource; - CrossSource *crossSource; - magSlideShowSource *slideShowSource; + CustomSource customSource; + magSlideShowSource slideShowSource; };