From 45112357455b15c23c11dee567c31448a987bced Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 13:05:14 +0300 Subject: [PATCH 01/12] updated gitignore --- .gitignore | 220 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 196 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 4d1b50e..bafb9dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,209 @@ -build/ -obj/ -bin/ +######################### +# openFrameworks patterns +######################### + +# build files +openFrameworks.a +openFrameworksDebug.a +openFrameworksUniversal.a +libs/openFrameworksCompiled/lib/*/* +!libs/openFrameworksCompiled/lib/*/.gitkeep + +# apothecary +scripts/apothecary + +# rule to avoid non-official addons going into git +# see addons/.gitignore +addons/* + +# rule to avoid non-official apps going into git +# see apps/.gitignore +apps/* + +# rule to ignore compiled / downloaded libs +/libs/* +!/libs/openFrameworks +!/libs/openFrameworksCompiled + +# also, see examples/.gitignore + +######################### +# general +######################### + +[Bb]uild/ +[Oo]bj/ *.o +examples/**/[Dd]ebug*/ +examples/**/[Rr]elease*/ +examples/**/gcc-debug/ +examples/**/gcc-release/ +tests/**/[Dd]ebug*/ +tests/**/[Rr]elease*/ +tests/**/gcc-debug/ +tests/**/gcc-release/ +*.mode* *.app/ -*.DS_Store -/Dev -*.svn - -#XCode -*.xcscheme -*.xcsettings -*.xcworkspacedata -*.xcworkspace -*.xcuserdatad -*.mode1v3 -*.pbxuser +*.pyc +.svn/ +*.log +*.cpp.eep +*.cpp.elf +*.cpp.hex + +######################### +# IDE +######################### +# XCode +*.pbxuser +*.perspective +*.perspectivev3 +*.mode1v3 +*.mode2v3 +# XCode 4 +xcuserdata +*.xcworkspace -#Code::Blocks +# Code::Blocks *.depend *.layout -#Visual Studio +# Visual Studio *.sdf *.opensdf *.suo +*.pdb +*.ilk +*.aps ipch/ +**/.vs/* +# Eclipse +.metadata +local.properties +.externalToolBuilders -################### -*.com -*.class -*.dll -*.exe -*.o -*.app \ No newline at end of file +# Android Studio +.idea +.gradle +gradle +gradlew +gradlew.bat + +# QtCreator +*.qbs.user +*.pro.user +*.pri + + +######################### +# operating system +######################### + +# Linux +*~ +# KDE +.directory +.AppleDouble + +# OSX +.DS_Store +*.swp +*~.nib +# Thumbnails +._* +examples/ios/**/mediaAssets + +# Windows +# Windows image file caches +Thumbs.db +# Folder config file +Desktop.ini + +# Android +.csettings +/libs/openFrameworksCompiled/project/android/paths.make + +# Android Studio +*.iml + +######################### +# miscellaneous +######################### + +.mailmap +/apps*/ + +######################### +# core examples +######################### + +bin/* +!bin/data/ + +**/bin/* +!**/bin/data/ + +######################### +# IDE +######################### + +# XCode +*.xcodeproj +Project.xcconfig +openFrameworks-Info.plist +ofxiOS-Info.plist +ofxiOS_Prefix.pch +*/*/Default*.png +*/*/Icon*.png + +# Code::Blocks +# *.cbp +# *.workspace + +# Visual Studio +# *.sln +# *.vcxproj +*.vcxproj.user +*.vcxproj.filters +icon.rc + +# Eclipse +.cproject +.project +.settings/ + +# QtCreator +# *.qbs +*.qbs.user* +*.pro +*.pro.user +qtc_Desktop_* + +######################### +# operating system +######################### + +# Linux +# Makefile +# config.make +# Leave Android files in until project generation works +!/android/*/Makefile +!/android/*/config.make + +# Android +android/*/test link +android/*/gen +android/*/res/raw +libOFAndroidApp*.so +gdbserver +gdb.setup +libneondetection.so +Application.mk +Android.mk + +!android/*/.cproject +!android/*/.project +!android/*/.settings +!android/*/.settings/* From 20031201573b656d555a272987aedd9ed2be5cf0 Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 13:08:49 +0300 Subject: [PATCH 02/12] qtcreator projects --- 01_twoScreens/01_twoScreens.qbs | 74 ++++++++++++++ 01_twoScreens/Makefile | 13 +++ 01_twoScreens/config.make | 141 ++++++++++++++++++++++++++ 02_threeVertical/02_threeVertical.qbs | 74 ++++++++++++++ 02_threeVertical/Makefile | 13 +++ 02_threeVertical/config.make | 141 ++++++++++++++++++++++++++ 03_guiControls/03_guiControls.qbs | 74 ++++++++++++++ 03_guiControls/Makefile | 13 +++ 03_guiControls/config.make | 141 ++++++++++++++++++++++++++ 04_blendClown/04_blendClown.qbs | 74 ++++++++++++++ 04_blendClown/Makefile | 13 +++ 04_blendClown/config.make | 141 ++++++++++++++++++++++++++ 12 files changed, 912 insertions(+) create mode 100644 01_twoScreens/01_twoScreens.qbs create mode 100644 01_twoScreens/Makefile create mode 100644 01_twoScreens/config.make create mode 100644 02_threeVertical/02_threeVertical.qbs create mode 100644 02_threeVertical/Makefile create mode 100644 02_threeVertical/config.make create mode 100644 03_guiControls/03_guiControls.qbs create mode 100644 03_guiControls/Makefile create mode 100644 03_guiControls/config.make create mode 100644 04_blendClown/04_blendClown.qbs create mode 100644 04_blendClown/Makefile create mode 100644 04_blendClown/config.make diff --git a/01_twoScreens/01_twoScreens.qbs b/01_twoScreens/01_twoScreens.qbs new file mode 100644 index 0000000..e2a124f --- /dev/null +++ b/01_twoScreens/01_twoScreens.qbs @@ -0,0 +1,74 @@ +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(sourceDirectory) } + + files: [ + 'src/*', + ] + + // This project is using addons.make to include the addons + // since it was imported from old code. To change it to include + // the addons from the qbs file change the following lines to + // the list of used addons in array format. eg: + // + // of.addons: [ + // 'ofxGui', + // 'ofxOpenCv', + // ] + + // 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 + of.frameworks: [] // osx only, additional frameworks to link with the project + of.staticLibraries: [] // static libraries + of.dynamicLibraries: [] // dynamic libraries + + // create a console window when the application start + consoleApplication: true + + // 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" + } + } + + property bool makeOF: true // use makfiles to compile the OF library + // will compile OF only once for all your projects + // otherwise compiled per project with qbs + + property bool precompileOfMain: false // precompile ofMain.h + // faster to recompile when including ofMain.h + // but might use a lot of space per project + + references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] +} diff --git a/01_twoScreens/Makefile b/01_twoScreens/Makefile new file mode 100644 index 0000000..177e172 --- /dev/null +++ b/01_twoScreens/Makefile @@ -0,0 +1,13 @@ +# Attempt to load a config.make file. +# If none is found, project defaults in config.project.make will be used. +ifneq ($(wildcard config.make),) + include config.make +endif + +# make sure the the OF_ROOT location is defined +ifndef OF_ROOT + OF_ROOT=$(realpath ../../..) +endif + +# call the project makefile! +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/01_twoScreens/config.make b/01_twoScreens/config.make new file mode 100644 index 0000000..836fce7 --- /dev/null +++ b/01_twoScreens/config.make @@ -0,0 +1,141 @@ +################################################################################ +# CONFIGURE PROJECT MAKEFILE (optional) +# This file is where we make project specific configurations. +################################################################################ + +################################################################################ +# OF ROOT +# The location of your root openFrameworks installation +# (default) OF_ROOT = ../../.. +################################################################################ +# OF_ROOT = ../../.. + +################################################################################ +# PROJECT ROOT +# The location of the project - a starting place for searching for files +# (default) PROJECT_ROOT = . (this directory) +# +################################################################################ +# PROJECT_ROOT = . + +################################################################################ +# PROJECT SPECIFIC CHECKS +# This is a project defined section to create internal makefile flags to +# conditionally enable or disable the addition of various features within +# this makefile. For instance, if you want to make changes based on whether +# GTK is installed, one might test that here and create a variable to check. +################################################################################ +# None + +################################################################################ +# PROJECT EXTERNAL SOURCE PATHS +# These are fully qualified paths that are not within the PROJECT_ROOT folder. +# Like source folders in the PROJECT_ROOT, these paths are subject to +# exlclusion via the PROJECT_EXLCUSIONS list. +# +# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXTERNAL_SOURCE_PATHS = + +################################################################################ +# PROJECT EXCLUSIONS +# These makefiles assume that all folders in your current project directory +# and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations +# to look for source code. The any folders or files that match any of the +# items in the PROJECT_EXCLUSIONS list below will be ignored. +# +# Each item in the PROJECT_EXCLUSIONS list will be treated as a complete +# string unless teh user adds a wildcard (%) operator to match subdirectories. +# GNU make only allows one wildcard for matching. The second wildcard (%) is +# treated literally. +# +# (default) PROJECT_EXCLUSIONS = (blank) +# +# Will automatically exclude the following: +# +# $(PROJECT_ROOT)/bin% +# $(PROJECT_ROOT)/obj% +# $(PROJECT_ROOT)/%.xcodeproj +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXCLUSIONS = + +################################################################################ +# PROJECT LINKER FLAGS +# These flags will be sent to the linker when compiling the executable. +# +# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs +# +# Note: Leave a leading space when adding list items with the += operator +# +# Currently, shared libraries that are needed are copied to the +# $(PROJECT_ROOT)/bin/libs directory. The following LDFLAGS tell the linker to +# add a runtime path to search for those shared libraries, since they aren't +# incorporated directly into the final executable application binary. +################################################################################ +# PROJECT_LDFLAGS=-Wl,-rpath=./libs + +################################################################################ +# PROJECT DEFINES +# Create a space-delimited list of DEFINES. The list will be converted into +# CFLAGS with the "-D" flag later in the makefile. +# +# (default) PROJECT_DEFINES = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_DEFINES = + +################################################################################ +# PROJECT CFLAGS +# This is a list of fully qualified CFLAGS required when compiling for this +# project. These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS +# defined in your platform specific core configuration files. These flags are +# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below. +# +# (default) PROJECT_CFLAGS = (blank) +# +# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in +# your platform specific configuration file will be applied by default and +# further flags here may not be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CFLAGS = + +################################################################################ +# PROJECT OPTIMIZATION CFLAGS +# These are lists of CFLAGS that are target-specific. While any flags could +# be conditionally added, they are usually limited to optimization flags. +# These flags are added BEFORE the PROJECT_CFLAGS. +# +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank) +# +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank) +# +# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the +# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration +# file will be applied by default and further optimization flags here may not +# be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE = +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG = + +################################################################################ +# PROJECT COMPILERS +# Custom compilers can be set for CC and CXX +# (default) PROJECT_CXX = (blank) +# (default) PROJECT_CC = (blank) +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CXX = +# PROJECT_CC = diff --git a/02_threeVertical/02_threeVertical.qbs b/02_threeVertical/02_threeVertical.qbs new file mode 100644 index 0000000..0fa8af5 --- /dev/null +++ b/02_threeVertical/02_threeVertical.qbs @@ -0,0 +1,74 @@ +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(sourceDirectory) } + + files: [ + 'src/*', + ] + + // This project is using addons.make to include the addons + // since it was imported from old code. To change it to include + // the addons from the qbs file change the following lines to + // the list of used addons in array format. eg: + // + // of.addons: [ + // 'ofxGui', + // 'ofxOpenCv', + // ] + + // 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 + of.frameworks: [] // osx only, additional frameworks to link with the project + of.staticLibraries: [] // static libraries + of.dynamicLibraries: [] // dynamic libraries + + // create a console window when the application start + consoleApplication: false + + // 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" + } + } + + property bool makeOF: true // use makfiles to compile the OF library + // will compile OF only once for all your projects + // otherwise compiled per project with qbs + + property bool precompileOfMain: false // precompile ofMain.h + // faster to recompile when including ofMain.h + // but might use a lot of space per project + + references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] +} diff --git a/02_threeVertical/Makefile b/02_threeVertical/Makefile new file mode 100644 index 0000000..177e172 --- /dev/null +++ b/02_threeVertical/Makefile @@ -0,0 +1,13 @@ +# Attempt to load a config.make file. +# If none is found, project defaults in config.project.make will be used. +ifneq ($(wildcard config.make),) + include config.make +endif + +# make sure the the OF_ROOT location is defined +ifndef OF_ROOT + OF_ROOT=$(realpath ../../..) +endif + +# call the project makefile! +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/02_threeVertical/config.make b/02_threeVertical/config.make new file mode 100644 index 0000000..836fce7 --- /dev/null +++ b/02_threeVertical/config.make @@ -0,0 +1,141 @@ +################################################################################ +# CONFIGURE PROJECT MAKEFILE (optional) +# This file is where we make project specific configurations. +################################################################################ + +################################################################################ +# OF ROOT +# The location of your root openFrameworks installation +# (default) OF_ROOT = ../../.. +################################################################################ +# OF_ROOT = ../../.. + +################################################################################ +# PROJECT ROOT +# The location of the project - a starting place for searching for files +# (default) PROJECT_ROOT = . (this directory) +# +################################################################################ +# PROJECT_ROOT = . + +################################################################################ +# PROJECT SPECIFIC CHECKS +# This is a project defined section to create internal makefile flags to +# conditionally enable or disable the addition of various features within +# this makefile. For instance, if you want to make changes based on whether +# GTK is installed, one might test that here and create a variable to check. +################################################################################ +# None + +################################################################################ +# PROJECT EXTERNAL SOURCE PATHS +# These are fully qualified paths that are not within the PROJECT_ROOT folder. +# Like source folders in the PROJECT_ROOT, these paths are subject to +# exlclusion via the PROJECT_EXLCUSIONS list. +# +# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXTERNAL_SOURCE_PATHS = + +################################################################################ +# PROJECT EXCLUSIONS +# These makefiles assume that all folders in your current project directory +# and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations +# to look for source code. The any folders or files that match any of the +# items in the PROJECT_EXCLUSIONS list below will be ignored. +# +# Each item in the PROJECT_EXCLUSIONS list will be treated as a complete +# string unless teh user adds a wildcard (%) operator to match subdirectories. +# GNU make only allows one wildcard for matching. The second wildcard (%) is +# treated literally. +# +# (default) PROJECT_EXCLUSIONS = (blank) +# +# Will automatically exclude the following: +# +# $(PROJECT_ROOT)/bin% +# $(PROJECT_ROOT)/obj% +# $(PROJECT_ROOT)/%.xcodeproj +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXCLUSIONS = + +################################################################################ +# PROJECT LINKER FLAGS +# These flags will be sent to the linker when compiling the executable. +# +# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs +# +# Note: Leave a leading space when adding list items with the += operator +# +# Currently, shared libraries that are needed are copied to the +# $(PROJECT_ROOT)/bin/libs directory. The following LDFLAGS tell the linker to +# add a runtime path to search for those shared libraries, since they aren't +# incorporated directly into the final executable application binary. +################################################################################ +# PROJECT_LDFLAGS=-Wl,-rpath=./libs + +################################################################################ +# PROJECT DEFINES +# Create a space-delimited list of DEFINES. The list will be converted into +# CFLAGS with the "-D" flag later in the makefile. +# +# (default) PROJECT_DEFINES = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_DEFINES = + +################################################################################ +# PROJECT CFLAGS +# This is a list of fully qualified CFLAGS required when compiling for this +# project. These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS +# defined in your platform specific core configuration files. These flags are +# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below. +# +# (default) PROJECT_CFLAGS = (blank) +# +# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in +# your platform specific configuration file will be applied by default and +# further flags here may not be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CFLAGS = + +################################################################################ +# PROJECT OPTIMIZATION CFLAGS +# These are lists of CFLAGS that are target-specific. While any flags could +# be conditionally added, they are usually limited to optimization flags. +# These flags are added BEFORE the PROJECT_CFLAGS. +# +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank) +# +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank) +# +# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the +# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration +# file will be applied by default and further optimization flags here may not +# be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE = +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG = + +################################################################################ +# PROJECT COMPILERS +# Custom compilers can be set for CC and CXX +# (default) PROJECT_CXX = (blank) +# (default) PROJECT_CC = (blank) +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CXX = +# PROJECT_CC = diff --git a/03_guiControls/03_guiControls.qbs b/03_guiControls/03_guiControls.qbs new file mode 100644 index 0000000..0fa8af5 --- /dev/null +++ b/03_guiControls/03_guiControls.qbs @@ -0,0 +1,74 @@ +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(sourceDirectory) } + + files: [ + 'src/*', + ] + + // This project is using addons.make to include the addons + // since it was imported from old code. To change it to include + // the addons from the qbs file change the following lines to + // the list of used addons in array format. eg: + // + // of.addons: [ + // 'ofxGui', + // 'ofxOpenCv', + // ] + + // 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 + of.frameworks: [] // osx only, additional frameworks to link with the project + of.staticLibraries: [] // static libraries + of.dynamicLibraries: [] // dynamic libraries + + // create a console window when the application start + consoleApplication: false + + // 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" + } + } + + property bool makeOF: true // use makfiles to compile the OF library + // will compile OF only once for all your projects + // otherwise compiled per project with qbs + + property bool precompileOfMain: false // precompile ofMain.h + // faster to recompile when including ofMain.h + // but might use a lot of space per project + + references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] +} diff --git a/03_guiControls/Makefile b/03_guiControls/Makefile new file mode 100644 index 0000000..177e172 --- /dev/null +++ b/03_guiControls/Makefile @@ -0,0 +1,13 @@ +# Attempt to load a config.make file. +# If none is found, project defaults in config.project.make will be used. +ifneq ($(wildcard config.make),) + include config.make +endif + +# make sure the the OF_ROOT location is defined +ifndef OF_ROOT + OF_ROOT=$(realpath ../../..) +endif + +# call the project makefile! +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/03_guiControls/config.make b/03_guiControls/config.make new file mode 100644 index 0000000..836fce7 --- /dev/null +++ b/03_guiControls/config.make @@ -0,0 +1,141 @@ +################################################################################ +# CONFIGURE PROJECT MAKEFILE (optional) +# This file is where we make project specific configurations. +################################################################################ + +################################################################################ +# OF ROOT +# The location of your root openFrameworks installation +# (default) OF_ROOT = ../../.. +################################################################################ +# OF_ROOT = ../../.. + +################################################################################ +# PROJECT ROOT +# The location of the project - a starting place for searching for files +# (default) PROJECT_ROOT = . (this directory) +# +################################################################################ +# PROJECT_ROOT = . + +################################################################################ +# PROJECT SPECIFIC CHECKS +# This is a project defined section to create internal makefile flags to +# conditionally enable or disable the addition of various features within +# this makefile. For instance, if you want to make changes based on whether +# GTK is installed, one might test that here and create a variable to check. +################################################################################ +# None + +################################################################################ +# PROJECT EXTERNAL SOURCE PATHS +# These are fully qualified paths that are not within the PROJECT_ROOT folder. +# Like source folders in the PROJECT_ROOT, these paths are subject to +# exlclusion via the PROJECT_EXLCUSIONS list. +# +# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXTERNAL_SOURCE_PATHS = + +################################################################################ +# PROJECT EXCLUSIONS +# These makefiles assume that all folders in your current project directory +# and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations +# to look for source code. The any folders or files that match any of the +# items in the PROJECT_EXCLUSIONS list below will be ignored. +# +# Each item in the PROJECT_EXCLUSIONS list will be treated as a complete +# string unless teh user adds a wildcard (%) operator to match subdirectories. +# GNU make only allows one wildcard for matching. The second wildcard (%) is +# treated literally. +# +# (default) PROJECT_EXCLUSIONS = (blank) +# +# Will automatically exclude the following: +# +# $(PROJECT_ROOT)/bin% +# $(PROJECT_ROOT)/obj% +# $(PROJECT_ROOT)/%.xcodeproj +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXCLUSIONS = + +################################################################################ +# PROJECT LINKER FLAGS +# These flags will be sent to the linker when compiling the executable. +# +# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs +# +# Note: Leave a leading space when adding list items with the += operator +# +# Currently, shared libraries that are needed are copied to the +# $(PROJECT_ROOT)/bin/libs directory. The following LDFLAGS tell the linker to +# add a runtime path to search for those shared libraries, since they aren't +# incorporated directly into the final executable application binary. +################################################################################ +# PROJECT_LDFLAGS=-Wl,-rpath=./libs + +################################################################################ +# PROJECT DEFINES +# Create a space-delimited list of DEFINES. The list will be converted into +# CFLAGS with the "-D" flag later in the makefile. +# +# (default) PROJECT_DEFINES = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_DEFINES = + +################################################################################ +# PROJECT CFLAGS +# This is a list of fully qualified CFLAGS required when compiling for this +# project. These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS +# defined in your platform specific core configuration files. These flags are +# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below. +# +# (default) PROJECT_CFLAGS = (blank) +# +# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in +# your platform specific configuration file will be applied by default and +# further flags here may not be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CFLAGS = + +################################################################################ +# PROJECT OPTIMIZATION CFLAGS +# These are lists of CFLAGS that are target-specific. While any flags could +# be conditionally added, they are usually limited to optimization flags. +# These flags are added BEFORE the PROJECT_CFLAGS. +# +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank) +# +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank) +# +# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the +# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration +# file will be applied by default and further optimization flags here may not +# be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE = +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG = + +################################################################################ +# PROJECT COMPILERS +# Custom compilers can be set for CC and CXX +# (default) PROJECT_CXX = (blank) +# (default) PROJECT_CC = (blank) +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CXX = +# PROJECT_CC = diff --git a/04_blendClown/04_blendClown.qbs b/04_blendClown/04_blendClown.qbs new file mode 100644 index 0000000..0fa8af5 --- /dev/null +++ b/04_blendClown/04_blendClown.qbs @@ -0,0 +1,74 @@ +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(sourceDirectory) } + + files: [ + 'src/*', + ] + + // This project is using addons.make to include the addons + // since it was imported from old code. To change it to include + // the addons from the qbs file change the following lines to + // the list of used addons in array format. eg: + // + // of.addons: [ + // 'ofxGui', + // 'ofxOpenCv', + // ] + + // 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 + of.frameworks: [] // osx only, additional frameworks to link with the project + of.staticLibraries: [] // static libraries + of.dynamicLibraries: [] // dynamic libraries + + // create a console window when the application start + consoleApplication: false + + // 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" + } + } + + property bool makeOF: true // use makfiles to compile the OF library + // will compile OF only once for all your projects + // otherwise compiled per project with qbs + + property bool precompileOfMain: false // precompile ofMain.h + // faster to recompile when including ofMain.h + // but might use a lot of space per project + + references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] +} diff --git a/04_blendClown/Makefile b/04_blendClown/Makefile new file mode 100644 index 0000000..177e172 --- /dev/null +++ b/04_blendClown/Makefile @@ -0,0 +1,13 @@ +# Attempt to load a config.make file. +# If none is found, project defaults in config.project.make will be used. +ifneq ($(wildcard config.make),) + include config.make +endif + +# make sure the the OF_ROOT location is defined +ifndef OF_ROOT + OF_ROOT=$(realpath ../../..) +endif + +# call the project makefile! +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/04_blendClown/config.make b/04_blendClown/config.make new file mode 100644 index 0000000..836fce7 --- /dev/null +++ b/04_blendClown/config.make @@ -0,0 +1,141 @@ +################################################################################ +# CONFIGURE PROJECT MAKEFILE (optional) +# This file is where we make project specific configurations. +################################################################################ + +################################################################################ +# OF ROOT +# The location of your root openFrameworks installation +# (default) OF_ROOT = ../../.. +################################################################################ +# OF_ROOT = ../../.. + +################################################################################ +# PROJECT ROOT +# The location of the project - a starting place for searching for files +# (default) PROJECT_ROOT = . (this directory) +# +################################################################################ +# PROJECT_ROOT = . + +################################################################################ +# PROJECT SPECIFIC CHECKS +# This is a project defined section to create internal makefile flags to +# conditionally enable or disable the addition of various features within +# this makefile. For instance, if you want to make changes based on whether +# GTK is installed, one might test that here and create a variable to check. +################################################################################ +# None + +################################################################################ +# PROJECT EXTERNAL SOURCE PATHS +# These are fully qualified paths that are not within the PROJECT_ROOT folder. +# Like source folders in the PROJECT_ROOT, these paths are subject to +# exlclusion via the PROJECT_EXLCUSIONS list. +# +# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXTERNAL_SOURCE_PATHS = + +################################################################################ +# PROJECT EXCLUSIONS +# These makefiles assume that all folders in your current project directory +# and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations +# to look for source code. The any folders or files that match any of the +# items in the PROJECT_EXCLUSIONS list below will be ignored. +# +# Each item in the PROJECT_EXCLUSIONS list will be treated as a complete +# string unless teh user adds a wildcard (%) operator to match subdirectories. +# GNU make only allows one wildcard for matching. The second wildcard (%) is +# treated literally. +# +# (default) PROJECT_EXCLUSIONS = (blank) +# +# Will automatically exclude the following: +# +# $(PROJECT_ROOT)/bin% +# $(PROJECT_ROOT)/obj% +# $(PROJECT_ROOT)/%.xcodeproj +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXCLUSIONS = + +################################################################################ +# PROJECT LINKER FLAGS +# These flags will be sent to the linker when compiling the executable. +# +# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs +# +# Note: Leave a leading space when adding list items with the += operator +# +# Currently, shared libraries that are needed are copied to the +# $(PROJECT_ROOT)/bin/libs directory. The following LDFLAGS tell the linker to +# add a runtime path to search for those shared libraries, since they aren't +# incorporated directly into the final executable application binary. +################################################################################ +# PROJECT_LDFLAGS=-Wl,-rpath=./libs + +################################################################################ +# PROJECT DEFINES +# Create a space-delimited list of DEFINES. The list will be converted into +# CFLAGS with the "-D" flag later in the makefile. +# +# (default) PROJECT_DEFINES = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_DEFINES = + +################################################################################ +# PROJECT CFLAGS +# This is a list of fully qualified CFLAGS required when compiling for this +# project. These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS +# defined in your platform specific core configuration files. These flags are +# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below. +# +# (default) PROJECT_CFLAGS = (blank) +# +# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in +# your platform specific configuration file will be applied by default and +# further flags here may not be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CFLAGS = + +################################################################################ +# PROJECT OPTIMIZATION CFLAGS +# These are lists of CFLAGS that are target-specific. While any flags could +# be conditionally added, they are usually limited to optimization flags. +# These flags are added BEFORE the PROJECT_CFLAGS. +# +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank) +# +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank) +# +# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the +# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration +# file will be applied by default and further optimization flags here may not +# be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE = +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG = + +################################################################################ +# PROJECT COMPILERS +# Custom compilers can be set for CC and CXX +# (default) PROJECT_CXX = (blank) +# (default) PROJECT_CC = (blank) +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CXX = +# PROJECT_CC = From 722681e5e4d3325858c26d82c526d171ebc4c6f3 Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 13:12:24 +0300 Subject: [PATCH 03/12] first version of gl3 compatibility --- 01_twoScreens/src/main.cpp | 15 ++++----- 01_twoScreens/src/testApp.cpp | 14 +++++--- 01_twoScreens/src/testApp.h | 1 + 02_threeVertical/src/main.cpp | 15 ++++----- 03_guiControls/src/main.cpp | 15 ++++----- 04_blendClown/src/main.cpp | 15 ++++----- src/ofxProjectorBlend.cpp | 55 ++++++++++++++------------------ src/ofxProjectorBlend.h | 3 +- src/ofxProjectorBlendShader.h | 60 +++++++++++++++++++++++++++++------ 9 files changed, 110 insertions(+), 83 deletions(-) diff --git a/01_twoScreens/src/main.cpp b/01_twoScreens/src/main.cpp index 2b66fd1..09eeb85 100644 --- a/01_twoScreens/src/main.cpp +++ b/01_twoScreens/src/main.cpp @@ -4,13 +4,10 @@ //======================================================================== int main( ){ - - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1280, 480, OF_WINDOW); // <-------- setup the GL context - - // this kicks off the running of my app - // can be OF_WINDOW or OF_FULLSCREEN - // pass in width and height too: - ofRunApp( new testApp()); - + ofGLFWWindowSettings settings; + settings.setGLVersion(3, 3); +// settings.windowMode = OF_FULLSCREEN; + settings.multiMonitorFullScreen = true; + ofCreateWindow(settings); // <-------- setup the GL context + ofRunApp(new testApp()); } diff --git a/01_twoScreens/src/testApp.cpp b/01_twoScreens/src/testApp.cpp index ce08ed0..021c9a4 100644 --- a/01_twoScreens/src/testApp.cpp +++ b/01_twoScreens/src/testApp.cpp @@ -11,11 +11,13 @@ void testApp::setup(){ cout << "display size: " << blender.getDisplayWidth() << " x " << blender.getDisplayHeight() << endl; ofSetWindowShape(blender.getDisplayWidth(), blender.getDisplayHeight()); + + videoGrabber.setup(640, 480); } //-------------------------------------------------------------- void testApp::update(){ - + videoGrabber.update(); } //-------------------------------------------------------------- @@ -23,12 +25,16 @@ void testApp::draw() { blender.begin(); //call blender.begin() to draw onto the blendable canvas { + ofDisableAlphaBlending(); + videoGrabber.draw(0, 0, blender.getCanvasWidth(), blender.getCanvasHeight()); + + ofEnableAlphaBlending(); //light gray backaground - ofSetColor(100, 100, 100); + ofSetColor(100, 100, 100, 100); ofRect(0, 0, blender.getCanvasWidth(), blender.getCanvasHeight()); //thick grid lines for blending - ofSetColor(255, 255, 255); + ofSetColor(255, 255, 255, 100); ofSetLineWidth(3); //vertical line @@ -124,4 +130,4 @@ void testApp::gotMessage(ofMessage msg){ //-------------------------------------------------------------- void testApp::dragEvent(ofDragInfo dragInfo){ -} \ No newline at end of file +} diff --git a/01_twoScreens/src/testApp.h b/01_twoScreens/src/testApp.h index 918e905..4b74962 100644 --- a/01_twoScreens/src/testApp.h +++ b/01_twoScreens/src/testApp.h @@ -43,4 +43,5 @@ class testApp : public ofBaseApp{ void gotMessage(ofMessage msg); ofxProjectorBlend blender; + ofVideoGrabber videoGrabber; }; diff --git a/02_threeVertical/src/main.cpp b/02_threeVertical/src/main.cpp index 6a32c6a..09eeb85 100644 --- a/02_threeVertical/src/main.cpp +++ b/02_threeVertical/src/main.cpp @@ -4,13 +4,10 @@ //======================================================================== int main( ){ - - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context - - // this kicks off the running of my app - // can be OF_WINDOW or OF_FULLSCREEN - // pass in width and height too: - ofRunApp( new testApp()); - + ofGLFWWindowSettings settings; + settings.setGLVersion(3, 3); +// settings.windowMode = OF_FULLSCREEN; + settings.multiMonitorFullScreen = true; + ofCreateWindow(settings); // <-------- setup the GL context + ofRunApp(new testApp()); } diff --git a/03_guiControls/src/main.cpp b/03_guiControls/src/main.cpp index 6a32c6a..09eeb85 100644 --- a/03_guiControls/src/main.cpp +++ b/03_guiControls/src/main.cpp @@ -4,13 +4,10 @@ //======================================================================== int main( ){ - - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context - - // this kicks off the running of my app - // can be OF_WINDOW or OF_FULLSCREEN - // pass in width and height too: - ofRunApp( new testApp()); - + ofGLFWWindowSettings settings; + settings.setGLVersion(3, 3); +// settings.windowMode = OF_FULLSCREEN; + settings.multiMonitorFullScreen = true; + ofCreateWindow(settings); // <-------- setup the GL context + ofRunApp(new testApp()); } diff --git a/04_blendClown/src/main.cpp b/04_blendClown/src/main.cpp index 6a32c6a..09eeb85 100644 --- a/04_blendClown/src/main.cpp +++ b/04_blendClown/src/main.cpp @@ -4,13 +4,10 @@ //======================================================================== int main( ){ - - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context - - // this kicks off the running of my app - // can be OF_WINDOW or OF_FULLSCREEN - // pass in width and height too: - ofRunApp( new testApp()); - + ofGLFWWindowSettings settings; + settings.setGLVersion(3, 3); +// settings.windowMode = OF_FULLSCREEN; + settings.multiMonitorFullScreen = true; + ofCreateWindow(settings); // <-------- setup the GL context + ofRunApp(new testApp()); } diff --git a/src/ofxProjectorBlend.cpp b/src/ofxProjectorBlend.cpp index 6d939da..52f9d2e 100644 --- a/src/ofxProjectorBlend.cpp +++ b/src/ofxProjectorBlend.cpp @@ -79,7 +79,8 @@ void ofxProjectorBlend::setup(int resolutionWidth, blendShader.unload(); blendShader.setupShaderFromSource(GL_FRAGMENT_SHADER, ofxProjectorBlendFragShader(numProjectors-1)); - blendShader.setupShaderFromSource(GL_VERTEX_SHADER, ofxProjectorBlendVertShader); + blendShader.setupShaderFromSource(GL_VERTEX_SHADER, ofxProjectorBlendVertShader()); + blendShader.bindDefaults(); blendShader.linkProgram(); gamma.resize(numProjectors-1, 0.5); @@ -174,8 +175,8 @@ void ofxProjectorBlend::updateShaderUniforms() // -------------------------------------------------- void ofxProjectorBlend::draw(float x, float y) { ofSetHexColor(0xFFFFFF); - glPushMatrix(); - glTranslatef(x, y, 0); + ofPushMatrix(); + ofTranslate(x, y, 0); if(showBlend) { blendShader.begin(); blendShader.setUniform1f("width", singleChannelWidth); @@ -194,9 +195,9 @@ void ofxProjectorBlend::draw(float x, float y) { ofVec2f offset(0,0); - glPushMatrix(); + ofPushMatrix(); - // loop through each projector and glTranslatef() to its position and draw. + // loop through each projector and ofTranslate() to its position and draw. for(int i = 0; i < numProjectors; i++) { blendShader.setUniform2f("texCoordOffset", offset.x, offset.y); @@ -221,37 +222,27 @@ void ofxProjectorBlend::draw(float x, float y) { } } - glPushMatrix(); { + ofPushMatrix(); { if(rotation == ofxProjectorBlend_RotatedRight) { - glRotatef(90, 0, 0, 1); - glTranslatef(0, -singleChannelHeight, 0); + ofRotate(90, 0, 0, 1); + ofTranslate(0, -singleChannelHeight, 0); } else if(rotation == ofxProjectorBlend_RotatedLeft) { - glRotatef(-90, 0, 0, 1); - glTranslatef(-singleChannelWidth, 0, 0); + ofRotate(-90, 0, 0, 1); + ofTranslate(-singleChannelWidth, 0, 0); } - glTranslatef(0, (float)projectorHeightOffset[i], 0); + ofTranslate(0, (float)projectorHeightOffset[i], 0); - glBegin(GL_QUADS); - - glTexCoord2f(0, 0); - glVertex2f(0, 0); - - glTexCoord2f(singleChannelWidth, 0); - glVertex2f(singleChannelWidth, 0); - - glTexCoord2f(singleChannelWidth, singleChannelHeight); - glVertex2f(singleChannelWidth, singleChannelHeight); - - glTexCoord2f(0, singleChannelHeight); - glVertex2f(0, singleChannelHeight); - - glEnd(); + float w=singleChannelWidth, h=singleChannelHeight; + quad.set(w, -h, 2, 2); // vertical flip + quad.setPosition(w/2, h/2, 0); + quad.mapTexCoords(1, 1, w, h); + quad.draw(); } - glPopMatrix(); + ofPopMatrix(); - // move the texture offset and where we're drawing to. + // move the texture offset and where we're drawing to. if(layout == ofxProjectorBlend_Horizontal) { offset.x += singleChannelWidth - pixelOverlap; } @@ -261,20 +252,20 @@ void ofxProjectorBlend::draw(float x, float y) { } if(rotation == ofxProjectorBlend_RotatedLeft || rotation == ofxProjectorBlend_RotatedRight) { - glTranslatef(singleChannelHeight, 0, 0); + ofTranslate(singleChannelHeight, 0, 0); } else { - glTranslatef(singleChannelWidth, 0, 0); + ofTranslate(singleChannelWidth, 0, 0); } } - glPopMatrix(); + ofPopMatrix(); blendShader.end(); } else { fullTexture.draw(x, y); } - glPopMatrix(); + ofPopMatrix(); } diff --git a/src/ofxProjectorBlend.h b/src/ofxProjectorBlend.h index d37de00..3d198a1 100644 --- a/src/ofxProjectorBlend.h +++ b/src/ofxProjectorBlend.h @@ -98,6 +98,7 @@ class ofxProjectorBlend ofxProjectorBlendRotation rotation; ofShader blendShader; ofFbo fullTexture; + ofPlanePrimitive quad; void updateShaderUniforms(); -}; \ No newline at end of file +}; diff --git a/src/ofxProjectorBlendShader.h b/src/ofxProjectorBlendShader.h index cc61527..70a71f0 100644 --- a/src/ofxProjectorBlendShader.h +++ b/src/ofxProjectorBlendShader.h @@ -8,21 +8,61 @@ #pragma once -#define STRINGIFY(A) #A -string ofxProjectorBlendVertShader = STRINGIFY( -void main(void) { - gl_Position = ftransform(); - gl_TexCoord[0] = gl_MultiTexCoord0; -}); +string ofxProjectorBlendVertShader(){ + string shaderProgram0 = R"( + void main() + { + gl_Position = ftransform(); + gl_TexCoord[0] = gl_MultiTexCoord0; + } + )"; + string shaderProgram3 = R"( + #version 150 + + uniform mat4 modelViewProjectionMatrix; + in vec4 position; + in vec2 texcoord; + out vec2 varyingtexcoord; + + void main(){ + varyingtexcoord = texcoord; + gl_Position = modelViewProjectionMatrix * position; + } + )"; + return ofIsGLProgrammableRenderer() ? shaderProgram3 : shaderProgram0; +} + + +string prepShader(string header1, string header3, string body) { + string str; + if (ofIsGLProgrammableRenderer()) { + str = header3 + body; + ofStringReplace(str, "gl_FragColor", "outColor"); + ofStringReplace(str, "gl_TexCoord[0]", "varyingtexcoord"); } + else { + str = header1 + body; + } + return str; +} string ofxProjectorBlendFragShader(int blends) { + string shaderHeader1 = R"( + varying vec2 varyingtexcoord; + )"; + string shaderHeader3 = R"( + #version 150 + in vec2 varyingtexcoord; + out vec4 outColor; + )"; +// string shaderBody = R"( string shader = "uniform float BlendPower["+ofToString(blends)+"]; \ uniform float SomeLuminanceControl["+ofToString(blends)+"]; \ - uniform float GammaCorrection["+ofToString(blends)+"];"+STRINGIFY( + uniform float GammaCorrection["+ofToString(blends)+"];"; + shader += R"( uniform sampler2DRect Tex0; uniform float width; uniform float height; @@ -178,12 +218,12 @@ string ofxProjectorBlendFragShader(int blends) { { vec4 overlap = vec4 (OverlapLeft, OverlapRight, OverlapBottom, OverlapTop); vec4 blankout = vec4 (BlackOutLeft, BlackOutRight, BlackOutBottom, BlackOutTop); - gl_FragData[0] = (SolidEdgeEnable == 1.0) ? + gl_FragColor = (SolidEdgeEnable == 1.0) ? drawSolidEdges(overlap, blankout, SolidEdgeColor) : drawSmoothEdges(overlap, blankout, SolidEdgeColor); } - ); - return shader; + )"; + return prepShader(shaderHeader1, shaderHeader3, shader);; } From b3bd38f3520868a536591f34461c0eae3109af62 Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 13:26:13 +0300 Subject: [PATCH 04/12] tidy up --- README.md | 11 +- src/ofxProjectorBlend.cpp | 314 +++++++++++++++---------------- src/ofxProjectorBlend.h | 174 ++++++++--------- src/ofxProjectorBlendShader.h | 344 +++++++++++++++++----------------- 4 files changed, 422 insertions(+), 421 deletions(-) diff --git a/README.md b/README.md index df3c758..97d5458 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ This addon is used to take a normal openFrameworks project and split it into 2 o copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -33,9 +33,10 @@ This addon is used to take a normal openFrameworks project and split it into 2 o - Based on Paul Bourke's paper, ["Edge blending using commodity projectors"](http://paulbourke.net/texture_colour/edgeblend/) - Quartz Shader implemenation by Matthias Oostrik ( http://www.oostrik.net ) - Original openFrameworks addon adaptation by [James George](http://www.jamesgeorge.org) -- in collaboration with [FlightPhase](http://www.flightphase.com) +- in collaboration with [FlightPhase](http://www.flightphase.com) - additions by [Marek Bereza](http://www.mazbox.com/) - This fork was created by [Jeff Crouse](http://www.jeffcrouse.info) specifically for the [Interactive openFrameworks workshop at Kitchen Table Coders](http://kitchentablecoders.com/2012/10/20/intermediate-of-a/). It is simplified in a few minor ways. +- Updated by Memo Akten for GL3 / programmable pipeline compatibility ### Used in @@ -53,7 +54,7 @@ This app shows the simplest usage of the addon: a typical 2-screen horizontal la ![Two Screens](http://4u.jeffcrouse.info/of/pblend/two_screens.png) -#### Three Vertical +#### Three Vertical ![Three Vertical](http://4u.jeffcrouse.info/of/pblend/three_vertical.png) @@ -67,4 +68,4 @@ For this example, get to additional addons: [ofxMSAInteractiveObject](https://gi This example shows a stupid little technique that has come in very handy for me when aligning multiple projectors. The uniform grid isn't ideal for alignment because you might be overlapping too many grid squares. With the clown, you can be sure that you are aligning properly. -![The Blend Clown](http://4u.jeffcrouse.info/of/pblend/blend_clown.png) \ No newline at end of file +![The Blend Clown](http://4u.jeffcrouse.info/of/pblend/blend_clown.png) diff --git a/src/ofxProjectorBlend.cpp b/src/ofxProjectorBlend.cpp index 52f9d2e..92ce206 100644 --- a/src/ofxProjectorBlend.cpp +++ b/src/ofxProjectorBlend.cpp @@ -5,77 +5,77 @@ // -------------------------------------------------- ofxProjectorBlend::ofxProjectorBlend() { - showBlend = true; - //gamma = gamma2 = 0.5; - //blendPower = blendPower2 = 1; - //luminance = luminance2 = 0; + showBlend = true; + //gamma = gamma2 = 0.5; + //blendPower = blendPower2 = 1; + //luminance = luminance2 = 0; gamma.resize(2, 0.5); blendPower.resize(2, 1); luminance.resize(2, 0); - numProjectors = 0; - threshold = 0; + numProjectors = 0; + threshold = 0; } // -------------------------------------------------- void ofxProjectorBlend::setup(int resolutionWidth, - int resolutionHeight, - int _numProjectors, - int _pixelOverlap, - ofxProjectorBlendLayout _layout, - ofxProjectorBlendRotation _rotation) + int resolutionHeight, + int _numProjectors, + int _pixelOverlap, + ofxProjectorBlendLayout _layout, + ofxProjectorBlendRotation _rotation) { - string l = "horizontal"; - if(layout==ofxProjectorBlend_Vertical) l = "vertical"; - - string r = "normal"; - if(rotation==ofxProjectorBlend_RotatedLeft) r = "rotated left"; - else if(rotation==ofxProjectorBlend_RotatedRight) r = "rotated right"; - - ofLog(OF_LOG_NOTICE, "ofxProjectorBlend: res: %d x %d * %d, overlap: %d pixels, layout: %s, rotation: %s\n", resolutionWidth, resolutionHeight, _numProjectors, _pixelOverlap, l.c_str(), r.c_str()); - numProjectors = _numProjectors; - layout = _layout; - rotation = _rotation; - - if(numProjectors <= 0){ - ofLog(OF_LOG_ERROR, "Cannot initialize with " + ofToString(this->numProjectors) + " projectors."); - return; - } - - //allow editing projector heights - for(int i = 0; i < numProjectors; i++){ - projectorHeightOffset.push_back( 0 ); - } - - pixelOverlap = _pixelOverlap; - - if(rotation == ofxProjectorBlend_NoRotation) { - singleChannelWidth = resolutionWidth; - singleChannelHeight = resolutionHeight; - } - else { - singleChannelWidth = resolutionHeight; - singleChannelHeight = resolutionWidth; - } - - if(layout == ofxProjectorBlend_Vertical) { - fullTextureWidth = singleChannelWidth; - fullTextureHeight = singleChannelHeight*numProjectors - pixelOverlap*(numProjectors-1); - } - else if(layout == ofxProjectorBlend_Horizontal) { - fullTextureWidth = singleChannelWidth*numProjectors - pixelOverlap*(numProjectors-1); - fullTextureHeight = singleChannelHeight; - } else { - ofLog(OF_LOG_ERROR, "ofxProjectorBlend: You have used an invalid ofxProjectorBlendLayout in ofxProjectorBlend::setup()"); - return; - } - - - displayWidth = resolutionWidth*numProjectors; - displayHeight = resolutionHeight; - - fullTexture.allocate(fullTextureWidth, fullTextureHeight, GL_RGB, 4); + string l = "horizontal"; + if(layout==ofxProjectorBlend_Vertical) l = "vertical"; + + string r = "normal"; + if(rotation==ofxProjectorBlend_RotatedLeft) r = "rotated left"; + else if(rotation==ofxProjectorBlend_RotatedRight) r = "rotated right"; + + ofLog(OF_LOG_NOTICE, "ofxProjectorBlend: res: %d x %d * %d, overlap: %d pixels, layout: %s, rotation: %s\n", resolutionWidth, resolutionHeight, _numProjectors, _pixelOverlap, l.c_str(), r.c_str()); + numProjectors = _numProjectors; + layout = _layout; + rotation = _rotation; + + if(numProjectors <= 0){ + ofLog(OF_LOG_ERROR, "Cannot initialize with " + ofToString(this->numProjectors) + " projectors."); + return; + } + + //allow editing projector heights + for(int i = 0; i < numProjectors; i++){ + projectorHeightOffset.push_back( 0 ); + } + + pixelOverlap = _pixelOverlap; + + if(rotation == ofxProjectorBlend_NoRotation) { + singleChannelWidth = resolutionWidth; + singleChannelHeight = resolutionHeight; + } + else { + singleChannelWidth = resolutionHeight; + singleChannelHeight = resolutionWidth; + } + + if(layout == ofxProjectorBlend_Vertical) { + fullTextureWidth = singleChannelWidth; + fullTextureHeight = singleChannelHeight*numProjectors - pixelOverlap*(numProjectors-1); + } + else if(layout == ofxProjectorBlend_Horizontal) { + fullTextureWidth = singleChannelWidth*numProjectors - pixelOverlap*(numProjectors-1); + fullTextureHeight = singleChannelHeight; + } else { + ofLog(OF_LOG_ERROR, "ofxProjectorBlend: You have used an invalid ofxProjectorBlendLayout in ofxProjectorBlend::setup()"); + return; + } + + + displayWidth = resolutionWidth*numProjectors; + displayHeight = resolutionHeight; + + fullTexture.allocate(fullTextureWidth, fullTextureHeight, GL_RGB, 4); blendShader.unload(); blendShader.setupShaderFromSource(GL_FRAGMENT_SHADER, ofxProjectorBlendFragShader(numProjectors-1)); @@ -91,35 +91,35 @@ void ofxProjectorBlend::setup(int resolutionWidth, // -------------------------------------------------- void ofxProjectorBlend::begin() { - - fullTexture.begin(); - - ofPushStyle(); - ofClear(0,0,0,0); + + fullTexture.begin(); + + ofPushStyle(); + ofClear(0,0,0,0); } // -------------------------------------------------- float ofxProjectorBlend::getDisplayWidth() { - return displayWidth; + return displayWidth; } // -------------------------------------------------- float ofxProjectorBlend::getDisplayHeight() { - return displayHeight; + return displayHeight; } // -------------------------------------------------- void ofxProjectorBlend::moveDisplayVertical(unsigned int targetDisplay, int yOffset) { - if(targetDisplay >= numProjectors){ - ofLog(OF_LOG_ERROR, "targetDisplay (" + ofToString(targetDisplay) + ") is invalid."); - return; - } - - projectorHeightOffset[targetDisplay] += yOffset; + if(targetDisplay >= numProjectors){ + ofLog(OF_LOG_ERROR, "targetDisplay (" + ofToString(targetDisplay) + ") is invalid."); + return; + } + + projectorHeightOffset[targetDisplay] += yOffset; } @@ -127,21 +127,21 @@ void ofxProjectorBlend::moveDisplayVertical(unsigned int targetDisplay, int yOff // This changes your app's window size to the correct output size void ofxProjectorBlend::setWindowToDisplaySize() { - ofSetWindowShape(getDisplayWidth(), getDisplayHeight()); + ofSetWindowShape(getDisplayWidth(), getDisplayHeight()); } // -------------------------------------------------- float ofxProjectorBlend::getCanvasWidth() { - return fullTextureWidth; + return fullTextureWidth; } // -------------------------------------------------- float ofxProjectorBlend::getCanvasHeight() { - return fullTextureHeight; + return fullTextureHeight; } @@ -149,122 +149,122 @@ float ofxProjectorBlend::getCanvasHeight() // -------------------------------------------------- void ofxProjectorBlend::end() { - fullTexture.end(); - ofPopStyle(); + fullTexture.end(); + ofPopStyle(); } // -------------------------------------------------- void ofxProjectorBlend::updateShaderUniforms() { - - blendShader.setUniform1f("OverlapTop", 0.0f); - blendShader.setUniform1f("OverlapLeft", 0.0f); - blendShader.setUniform1f("OverlapBottom", 0.0f); - blendShader.setUniform1f("OverlapRight", 0.0f); + + blendShader.setUniform1f("OverlapTop", 0.0f); + blendShader.setUniform1f("OverlapLeft", 0.0f); + blendShader.setUniform1f("OverlapBottom", 0.0f); + blendShader.setUniform1f("OverlapRight", 0.0f); blendShader.setUniform1fv("BlendPower", &blendPower[0], blendPower.size()); blendShader.setUniform1fv("SomeLuminanceControl", &luminance[0], luminance.size()); blendShader.setUniform1fv("GammaCorrection", &gamma[0], gamma.size()); - blendShader.setUniform1f("projectors", this->numProjectors); - blendShader.setUniform1f("threshold", threshold); + blendShader.setUniform1f("projectors", this->numProjectors); + blendShader.setUniform1f("threshold", threshold); } // -------------------------------------------------- void ofxProjectorBlend::draw(float x, float y) { - ofSetHexColor(0xFFFFFF); + ofSetHexColor(0xFFFFFF); ofPushMatrix(); ofTranslate(x, y, 0); - if(showBlend) { - blendShader.begin(); - blendShader.setUniform1f("width", singleChannelWidth); - blendShader.setUniform1f("height", singleChannelHeight); - - updateShaderUniforms(); - - if(layout == ofxProjectorBlend_Horizontal) { - blendShader.setUniform1f("OverlapRight", pixelOverlap); - } - else { - blendShader.setUniform1f("OverlapTop", pixelOverlap); - } - - blendShader.setUniformTexture("Tex0", fullTexture.getTextureReference(), 0); - - - ofVec2f offset(0,0); + if(showBlend) { + blendShader.begin(); + blendShader.setUniform1f("width", singleChannelWidth); + blendShader.setUniform1f("height", singleChannelHeight); + + updateShaderUniforms(); + + if(layout == ofxProjectorBlend_Horizontal) { + blendShader.setUniform1f("OverlapRight", pixelOverlap); + } + else { + blendShader.setUniform1f("OverlapTop", pixelOverlap); + } + + blendShader.setUniformTexture("Tex0", fullTexture.getTextureReference(), 0); + + + ofVec2f offset(0,0); ofPushMatrix(); - + // loop through each projector and ofTranslate() to its position and draw. - for(int i = 0; i < numProjectors; i++) { - blendShader.setUniform2f("texCoordOffset", offset.x, offset.y); - - if(i==1) { - // set the first edge - if(layout == ofxProjectorBlend_Horizontal) { - blendShader.setUniform1f("OverlapLeft", pixelOverlap); - } - else { - blendShader.setUniform1f("OverlapBottom", pixelOverlap); - } - - } - // if we're at the end of the list of projectors, turn off the second edge's blend - - if(i+1 == numProjectors) { - if(layout == ofxProjectorBlend_Horizontal) { - blendShader.setUniform1f("OverlapRight", 0); - } - else { - blendShader.setUniform1f("OverlapTop", 0); - } - } - + for(int i = 0; i < numProjectors; i++) { + blendShader.setUniform2f("texCoordOffset", offset.x, offset.y); + + if(i==1) { + // set the first edge + if(layout == ofxProjectorBlend_Horizontal) { + blendShader.setUniform1f("OverlapLeft", pixelOverlap); + } + else { + blendShader.setUniform1f("OverlapBottom", pixelOverlap); + } + + } + // if we're at the end of the list of projectors, turn off the second edge's blend + + if(i+1 == numProjectors) { + if(layout == ofxProjectorBlend_Horizontal) { + blendShader.setUniform1f("OverlapRight", 0); + } + else { + blendShader.setUniform1f("OverlapTop", 0); + } + } + ofPushMatrix(); { - if(rotation == ofxProjectorBlend_RotatedRight) { + if(rotation == ofxProjectorBlend_RotatedRight) { ofRotate(90, 0, 0, 1); ofTranslate(0, -singleChannelHeight, 0); - } - else if(rotation == ofxProjectorBlend_RotatedLeft) { + } + else if(rotation == ofxProjectorBlend_RotatedLeft) { ofRotate(-90, 0, 0, 1); ofTranslate(-singleChannelWidth, 0, 0); - } - + } + ofTranslate(0, (float)projectorHeightOffset[i], 0); - + float w=singleChannelWidth, h=singleChannelHeight; quad.set(w, -h, 2, 2); // vertical flip quad.setPosition(w/2, h/2, 0); quad.mapTexCoords(1, 1, w, h); quad.draw(); - } + } ofPopMatrix(); - + // move the texture offset and where we're drawing to. - if(layout == ofxProjectorBlend_Horizontal) { - offset.x += singleChannelWidth - pixelOverlap; - } - else { - offset.y += singleChannelHeight - pixelOverlap; - - } - - if(rotation == ofxProjectorBlend_RotatedLeft || rotation == ofxProjectorBlend_RotatedRight) { + if(layout == ofxProjectorBlend_Horizontal) { + offset.x += singleChannelWidth - pixelOverlap; + } + else { + offset.y += singleChannelHeight - pixelOverlap; + + } + + if(rotation == ofxProjectorBlend_RotatedLeft || rotation == ofxProjectorBlend_RotatedRight) { ofTranslate(singleChannelHeight, 0, 0); - } - else { + } + else { ofTranslate(singleChannelWidth, 0, 0); - } - - } + } + + } ofPopMatrix(); - - blendShader.end(); - } else { - fullTexture.draw(x, y); - } + + blendShader.end(); + } else { + fullTexture.draw(x, y); + } ofPopMatrix(); } diff --git a/src/ofxProjectorBlend.h b/src/ofxProjectorBlend.h index 3d198a1..4fac7e7 100644 --- a/src/ofxProjectorBlend.h +++ b/src/ofxProjectorBlend.h @@ -4,101 +4,101 @@ #include "ofMain.h" enum ofxProjectorBlendLayout { - ofxProjectorBlend_Horizontal, - ofxProjectorBlend_Vertical, + ofxProjectorBlend_Horizontal, + ofxProjectorBlend_Vertical, }; enum ofxProjectorBlendRotation { - ofxProjectorBlend_NoRotation, - ofxProjectorBlend_RotatedLeft, - ofxProjectorBlend_RotatedRight + ofxProjectorBlend_NoRotation, + ofxProjectorBlend_RotatedLeft, + ofxProjectorBlend_RotatedRight }; class ofxProjectorBlend { - public: - ofxProjectorBlend(); - - /** - * Set resolutionWidth and height to the resolutions of each projector output - if you're portrait, - * still give it a landscape resolution. - * - * layout - this is how the projectors are stacked, so if they are next to eachother, it's horizontal - * and if they're on-top of eachother, it's vertical. (this is regardless of rotation) - * - * rotation - this is the rotation of the projector. If the projectors are on their sides then it's - * rotatedRight, if it's the right way round, it's noRotation. - * - */ - void setup(int resolutionWidth, int resolutionHeight, int numProjectors, int pixelOverlap, - ofxProjectorBlendLayout layout = ofxProjectorBlend_Horizontal, - ofxProjectorBlendRotation rotation = ofxProjectorBlend_NoRotation); - - //call begin and end like you would if if you were using a normal fbo - void begin(); - void end(); - - void draw(float x = 0, float y = 0); - - - // this is how big the area to draw to is. - float getCanvasWidth(); - float getCanvasHeight(); - - ofFbo & getFullTexture() { return fullTexture; } - - /** - * This is how big all the projector resolutions would be - * if laid out horizontally, next to eachother. This is - * essentially the output resolution (regardless of rotation - * and orientation.) - the output to set your project to. - * - * On a mac, if you want multiple screens doing fullscreen, - * you need to put your screens next to eachother with the - * main one (the one with the menu) on the left hand side. - * If you don't, you'll only get the first screen. - */ - float getDisplayWidth(); - float getDisplayHeight(); - - void moveDisplayVertical(unsigned int targetDisplay, int yOffset); - - - /** This changes your app's window size to the correct output size */ - void setWindowToDisplaySize(); - - bool showBlend; - - // variables that control the blend - // more info here on what these variables do - // http://local.wasp.uwa.edu.au/~pbourke/texture_colour/edgeblend/ - vector blendPower; - vector gamma; - vector luminance; - //float blendPower2; - //float gamma2; - //float luminance2; - float threshold; - +public: + ofxProjectorBlend(); + + /** + * Set resolutionWidth and height to the resolutions of each projector output - if you're portrait, + * still give it a landscape resolution. + * + * layout - this is how the projectors are stacked, so if they are next to eachother, it's horizontal + * and if they're on-top of eachother, it's vertical. (this is regardless of rotation) + * + * rotation - this is the rotation of the projector. If the projectors are on their sides then it's + * rotatedRight, if it's the right way round, it's noRotation. + * + */ + void setup(int resolutionWidth, int resolutionHeight, int numProjectors, int pixelOverlap, + ofxProjectorBlendLayout layout = ofxProjectorBlend_Horizontal, + ofxProjectorBlendRotation rotation = ofxProjectorBlend_NoRotation); + + //call begin and end like you would if if you were using a normal fbo + void begin(); + void end(); + + void draw(float x = 0, float y = 0); + + + // this is how big the area to draw to is. + float getCanvasWidth(); + float getCanvasHeight(); + + ofFbo & getFullTexture() { return fullTexture; } + + /** + * This is how big all the projector resolutions would be + * if laid out horizontally, next to eachother. This is + * essentially the output resolution (regardless of rotation + * and orientation.) - the output to set your project to. + * + * On a mac, if you want multiple screens doing fullscreen, + * you need to put your screens next to eachother with the + * main one (the one with the menu) on the left hand side. + * If you don't, you'll only get the first screen. + */ + float getDisplayWidth(); + float getDisplayHeight(); + + void moveDisplayVertical(unsigned int targetDisplay, int yOffset); + + + /** This changes your app's window size to the correct output size */ + void setWindowToDisplaySize(); + + bool showBlend; + + // variables that control the blend + // more info here on what these variables do + // http://local.wasp.uwa.edu.au/~pbourke/texture_colour/edgeblend/ + vector blendPower; + vector gamma; + vector luminance; + //float blendPower2; + //float gamma2; + //float luminance2; + float threshold; + protected: - - vector projectorHeightOffset; - - float fullTextureWidth; - float fullTextureHeight; - float singleChannelWidth; - float singleChannelHeight; - - float displayWidth; - float displayHeight; - - float pixelOverlap; - int numProjectors; - ofxProjectorBlendLayout layout; - ofxProjectorBlendRotation rotation; - ofShader blendShader; - ofFbo fullTexture; + + vector projectorHeightOffset; + + float fullTextureWidth; + float fullTextureHeight; + float singleChannelWidth; + float singleChannelHeight; + + float displayWidth; + float displayHeight; + + float pixelOverlap; + int numProjectors; + ofxProjectorBlendLayout layout; + ofxProjectorBlendRotation rotation; + ofShader blendShader; + ofFbo fullTexture; ofPlanePrimitive quad; - void updateShaderUniforms(); + void updateShaderUniforms(); }; diff --git a/src/ofxProjectorBlendShader.h b/src/ofxProjectorBlendShader.h index 70a71f0..51100ed 100644 --- a/src/ofxProjectorBlendShader.h +++ b/src/ofxProjectorBlendShader.h @@ -27,8 +27,8 @@ string ofxProjectorBlendVertShader(){ out vec2 varyingtexcoord; void main(){ - varyingtexcoord = texcoord; - gl_Position = modelViewProjectionMatrix * position; + varyingtexcoord = texcoord; + gl_Position = modelViewProjectionMatrix * position; } )"; return ofIsGLProgrammableRenderer() ? shaderProgram3 : shaderProgram0; @@ -50,179 +50,179 @@ string prepShader(string header1, string header3, string body) { string ofxProjectorBlendFragShader(int blends) { - string shaderHeader1 = R"( - varying vec2 varyingtexcoord; - )"; - string shaderHeader3 = R"( - #version 150 - in vec2 varyingtexcoord; - out vec4 outColor; - )"; -// string shaderBody = R"( + string shaderHeader1 = R"( + varying vec2 varyingtexcoord; + )"; + string shaderHeader3 = R"( + #version 150 + in vec2 varyingtexcoord; + out vec4 outColor; + )"; + // string shaderBody = R"( string shader = "uniform float BlendPower["+ofToString(blends)+"]; \ - uniform float SomeLuminanceControl["+ofToString(blends)+"]; \ + uniform float SomeLuminanceControl["+ofToString(blends)+"]; \ uniform float GammaCorrection["+ofToString(blends)+"];"; shader += R"( - uniform sampler2DRect Tex0; - uniform float width; - uniform float height; - uniform float OverlapLeft; - uniform float OverlapRight; - uniform float OverlapTop; - uniform float OverlapBottom; - uniform float BlackOutLeft; - uniform float BlackOutRight; - uniform float BlackOutTop; - uniform float BlackOutBottom; - uniform float SolidEdgeEnable; - uniform vec4 SolidEdgeColor; - uniform vec2 texCoordOffset; - uniform float projectors; - uniform float threshold; - - vec4 drawSmoothEdge(float loc, float extend, float blePow, float lumCon, vec3 gamma) - { - vec4 edge; - float curve; - - curve = loc / extend; - curve = (curve < 0.5) ? - lumCon * pow(2.0 * curve, blePow) - : - 1.0 - (1.0 - lumCon) * pow(2.0 * (1.0 - curve), blePow); - - edge = vec4(pow(curve, 1.0 / gamma.r), - pow(curve, 1.0 / gamma.g), - pow(curve, 1.0 / gamma.b), - 1.0); - - return edge; - } - - vec4 drawSmoothEdges(in vec4 overlap, in vec4 blankout, in vec4 color) - { - vec2 xy = gl_TexCoord[0].xy; - vec2 xy_t = xy + texCoordOffset.xy; - vec4 blank = vec4(0.0,0.0,0.0,0.0); - - /* - float proj2 = 1.0; //projectors ... this basically defines a limit; - float thresh = proj2 * width + overlap.x; //(projectors - overlap.x) * width; - float blnPwr = (xy_t.x > thresh) ? BlendPower[1] : BlendPower[0]; - float slc = (xy_t.x > thresh) ? SomeLuminanceControl[1] : SomeLuminanceControl[0]; - float _g = (xy_t.x > thresh) ? GammaCorrection[1] : GammaCorrection[0]; - vec3 gamma = vec3(_g, _g, _g); - */ - - int b = int( xy_t.x / width ); - float blnPwr = BlendPower[b]; - float slc = SomeLuminanceControl[b] + 0.5; - vec3 gamma = vec3(GammaCorrection[b], GammaCorrection[b], GammaCorrection[b]); - //slc += 0.5; - - vec4 sebImage = - (blankout.x + overlap.x > xy.x) ? - (blankout.x > xy.x) ? - blank //leftBlankout - : (blankout.z + overlap.z > xy.y) ? - (blankout.z > xy.y) ? - blank //leftBottomBlankOut - : texture2DRect(Tex0, xy_t) * //leftBottomBlend - drawSmoothEdge(xy.x - blankout.x, overlap.x, blnPwr, slc, gamma) * - drawSmoothEdge(xy.y - blankout.z, overlap.z, blnPwr, slc, gamma) - : (height - blankout.w - overlap.w < xy.y) ? - (height - blankout.w < xy.y) ? - blank //leftTopBlankout - : texture2DRect(Tex0, xy_t) * //LeftTopBlend - drawSmoothEdge(xy.x - blankout.x, overlap.x, blnPwr, slc, gamma) * - drawSmoothEdge(height - blankout.w - xy.y, overlap.w, blnPwr, slc, gamma) - : texture2DRect(Tex0, xy_t) * //leftBlankout - drawSmoothEdge(xy.x - blankout.x, overlap.x, blnPwr, slc, gamma)// + vec4(0.5, 0, 0.5, 0) // debug: magenta - : (width - blankout.y - overlap.y < xy.x) ? - (width - blankout.y < xy.x) ? - blank //rightBlankout - : (blankout.z + overlap.z > xy.y) ? - (blankout.z > xy.y) ? - blank //rightBottomBlankout - : texture2DRect(Tex0, xy_t) * //rightBottomBlend - drawSmoothEdge(width - blankout.y - xy.x, overlap.y, blnPwr, slc, gamma) * - drawSmoothEdge(xy.y - blankout.z, overlap.z, blnPwr, slc, gamma) - : (height - blankout.w - overlap.w < xy.y) ? - (height - blankout.w < xy.y) ? - blank //rightTopBlankout - : texture2DRect(Tex0, xy_t) * //rightTopBlend - drawSmoothEdge(width - blankout.y - xy.x, overlap.y, blnPwr, slc, gamma) * - drawSmoothEdge(height - blankout.w - xy.y, overlap.w, blnPwr, slc, gamma) - : texture2DRect(Tex0, xy_t) * //rightBlend - drawSmoothEdge(width - blankout.y - xy.x, overlap.y, blnPwr, slc, gamma)// + vec4(0, 0, 0.5, 0) // debug: blue - : (blankout.z + overlap.z > xy.y) ? - (blankout.z > xy.y) ? - blank //BottomBlankout - : texture2DRect(Tex0, xy_t) * //BottomBlend - drawSmoothEdge(xy.y - blankout.z, overlap.z, blnPwr, slc, gamma) - : (height - blankout.w - overlap.w < xy.y) ? - (height - blankout.w < xy.y) ? - blank //TopBlankout - : texture2DRect(Tex0, xy_t) * //TopBlend - drawSmoothEdge(height - blankout.w - xy.y, overlap.w, blnPwr, slc, gamma) - : texture2DRect(Tex0, xy_t);// + vec4(0, 0.5, 0.5, 0); // debug: teal - - // if(xy_t.x < thresh) sebImage.rgb += vec3(0, 1.0, 0); // debug - - return sebImage; - } - - vec4 drawSolidEdges(vec4 overlap, vec4 blankout, vec4 color) - { - vec2 xy = gl_TexCoord[0].xy; - vec2 xy_t = xy + texCoordOffset.xy; - vec4 blank = vec4(0.0,0.0,0.0,0.0); - vec4 edgeImage = - (blankout.x + overlap.x > xy.x) ? - (blankout.x > xy.x) ? - blank //leftBlankout - : (blankout.z + overlap.z > xy.y) ? - (blankout.z > xy.y) ? - blank //leftBottomBlankout - : color //leftBottomColor - : (height - blankout.w - overlap.w < xy.y) ? - (height - blankout.w < xy.y) ? - blank //leftTop - : color //leftTopColor - : color //leftColor - : (width - blankout.y - overlap.y < xy.x) ? - (width - blankout.y < xy.x) ? - blank //rightBlankout - : (blankout.z + overlap.z > xy.y) ? - (blankout.z > xy.y) ? - blank //rightBottomBlankout - : color //rightBottomColor - : (height - blankout.w - overlap.w < xy.y) ? - (height - blankout.w < xy.y) ? - blank //rightTopBlankout - : color //rightToColor - : color //rightColor - : (blankout.z + overlap.z > xy.y) ? - (blankout.z > xy.y) ? - blank //BottomBlankout - : color //BottomColor - : (height - blankout.w - overlap.w < xy.y) ? - (height - blankout.w < xy.y) ? - blank //TopBlankout - : color //TopColor - : texture2DRect(Tex0, xy_t); - return edgeImage; - } - - void main (void) - { - vec4 overlap = vec4 (OverlapLeft, OverlapRight, OverlapBottom, OverlapTop); - vec4 blankout = vec4 (BlackOutLeft, BlackOutRight, BlackOutBottom, BlackOutTop); - gl_FragColor = (SolidEdgeEnable == 1.0) ? - drawSolidEdges(overlap, blankout, SolidEdgeColor) - : drawSmoothEdges(overlap, blankout, SolidEdgeColor); - } - )"; + uniform sampler2DRect Tex0; + uniform float width; + uniform float height; + uniform float OverlapLeft; + uniform float OverlapRight; + uniform float OverlapTop; + uniform float OverlapBottom; + uniform float BlackOutLeft; + uniform float BlackOutRight; + uniform float BlackOutTop; + uniform float BlackOutBottom; + uniform float SolidEdgeEnable; + uniform vec4 SolidEdgeColor; + uniform vec2 texCoordOffset; + uniform float projectors; + uniform float threshold; + + vec4 drawSmoothEdge(float loc, float extend, float blePow, float lumCon, vec3 gamma) + { + vec4 edge; + float curve; + + curve = loc / extend; + curve = (curve < 0.5) ? + lumCon * pow(2.0 * curve, blePow) + : + 1.0 - (1.0 - lumCon) * pow(2.0 * (1.0 - curve), blePow); + + edge = vec4(pow(curve, 1.0 / gamma.r), + pow(curve, 1.0 / gamma.g), + pow(curve, 1.0 / gamma.b), + 1.0); + + return edge; + } + + vec4 drawSmoothEdges(in vec4 overlap, in vec4 blankout, in vec4 color) + { + vec2 xy = gl_TexCoord[0].xy; + vec2 xy_t = xy + texCoordOffset.xy; + vec4 blank = vec4(0.0,0.0,0.0,0.0); + + /* + float proj2 = 1.0; //projectors ... this basically defines a limit; + float thresh = proj2 * width + overlap.x; //(projectors - overlap.x) * width; + float blnPwr = (xy_t.x > thresh) ? BlendPower[1] : BlendPower[0]; + float slc = (xy_t.x > thresh) ? SomeLuminanceControl[1] : SomeLuminanceControl[0]; + float _g = (xy_t.x > thresh) ? GammaCorrection[1] : GammaCorrection[0]; + vec3 gamma = vec3(_g, _g, _g); + */ + + int b = int( xy_t.x / width ); + float blnPwr = BlendPower[b]; + float slc = SomeLuminanceControl[b] + 0.5; + vec3 gamma = vec3(GammaCorrection[b], GammaCorrection[b], GammaCorrection[b]); + //slc += 0.5; + + vec4 sebImage = + (blankout.x + overlap.x > xy.x) ? + (blankout.x > xy.x) ? + blank //leftBlankout + : (blankout.z + overlap.z > xy.y) ? + (blankout.z > xy.y) ? + blank //leftBottomBlankOut + : texture2DRect(Tex0, xy_t) * //leftBottomBlend + drawSmoothEdge(xy.x - blankout.x, overlap.x, blnPwr, slc, gamma) * + drawSmoothEdge(xy.y - blankout.z, overlap.z, blnPwr, slc, gamma) + : (height - blankout.w - overlap.w < xy.y) ? + (height - blankout.w < xy.y) ? + blank //leftTopBlankout + : texture2DRect(Tex0, xy_t) * //LeftTopBlend + drawSmoothEdge(xy.x - blankout.x, overlap.x, blnPwr, slc, gamma) * + drawSmoothEdge(height - blankout.w - xy.y, overlap.w, blnPwr, slc, gamma) + : texture2DRect(Tex0, xy_t) * //leftBlankout + drawSmoothEdge(xy.x - blankout.x, overlap.x, blnPwr, slc, gamma)// + vec4(0.5, 0, 0.5, 0) // debug: magenta + : (width - blankout.y - overlap.y < xy.x) ? + (width - blankout.y < xy.x) ? + blank //rightBlankout + : (blankout.z + overlap.z > xy.y) ? + (blankout.z > xy.y) ? + blank //rightBottomBlankout + : texture2DRect(Tex0, xy_t) * //rightBottomBlend + drawSmoothEdge(width - blankout.y - xy.x, overlap.y, blnPwr, slc, gamma) * + drawSmoothEdge(xy.y - blankout.z, overlap.z, blnPwr, slc, gamma) + : (height - blankout.w - overlap.w < xy.y) ? + (height - blankout.w < xy.y) ? + blank //rightTopBlankout + : texture2DRect(Tex0, xy_t) * //rightTopBlend + drawSmoothEdge(width - blankout.y - xy.x, overlap.y, blnPwr, slc, gamma) * + drawSmoothEdge(height - blankout.w - xy.y, overlap.w, blnPwr, slc, gamma) + : texture2DRect(Tex0, xy_t) * //rightBlend + drawSmoothEdge(width - blankout.y - xy.x, overlap.y, blnPwr, slc, gamma)// + vec4(0, 0, 0.5, 0) // debug: blue + : (blankout.z + overlap.z > xy.y) ? + (blankout.z > xy.y) ? + blank //BottomBlankout + : texture2DRect(Tex0, xy_t) * //BottomBlend + drawSmoothEdge(xy.y - blankout.z, overlap.z, blnPwr, slc, gamma) + : (height - blankout.w - overlap.w < xy.y) ? + (height - blankout.w < xy.y) ? + blank //TopBlankout + : texture2DRect(Tex0, xy_t) * //TopBlend + drawSmoothEdge(height - blankout.w - xy.y, overlap.w, blnPwr, slc, gamma) + : texture2DRect(Tex0, xy_t);// + vec4(0, 0.5, 0.5, 0); // debug: teal + + // if(xy_t.x < thresh) sebImage.rgb += vec3(0, 1.0, 0); // debug + + return sebImage; + } + + vec4 drawSolidEdges(vec4 overlap, vec4 blankout, vec4 color) + { + vec2 xy = gl_TexCoord[0].xy; + vec2 xy_t = xy + texCoordOffset.xy; + vec4 blank = vec4(0.0,0.0,0.0,0.0); + vec4 edgeImage = + (blankout.x + overlap.x > xy.x) ? + (blankout.x > xy.x) ? + blank //leftBlankout + : (blankout.z + overlap.z > xy.y) ? + (blankout.z > xy.y) ? + blank //leftBottomBlankout + : color //leftBottomColor + : (height - blankout.w - overlap.w < xy.y) ? + (height - blankout.w < xy.y) ? + blank //leftTop + : color //leftTopColor + : color //leftColor + : (width - blankout.y - overlap.y < xy.x) ? + (width - blankout.y < xy.x) ? + blank //rightBlankout + : (blankout.z + overlap.z > xy.y) ? + (blankout.z > xy.y) ? + blank //rightBottomBlankout + : color //rightBottomColor + : (height - blankout.w - overlap.w < xy.y) ? + (height - blankout.w < xy.y) ? + blank //rightTopBlankout + : color //rightToColor + : color //rightColor + : (blankout.z + overlap.z > xy.y) ? + (blankout.z > xy.y) ? + blank //BottomBlankout + : color //BottomColor + : (height - blankout.w - overlap.w < xy.y) ? + (height - blankout.w < xy.y) ? + blank //TopBlankout + : color //TopColor + : texture2DRect(Tex0, xy_t); + return edgeImage; + } + + void main (void) + { + vec4 overlap = vec4 (OverlapLeft, OverlapRight, OverlapBottom, OverlapTop); + vec4 blankout = vec4 (BlackOutLeft, BlackOutRight, BlackOutBottom, BlackOutTop); + gl_FragColor = (SolidEdgeEnable == 1.0) ? + drawSolidEdges(overlap, blankout, SolidEdgeColor) + : drawSmoothEdges(overlap, blankout, SolidEdgeColor); + } + )"; return prepShader(shaderHeader1, shaderHeader3, shader);; } From 1758730bd154246b3698f04ecd1f16875518767c Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 13:27:23 +0300 Subject: [PATCH 05/12] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97d5458..1af6aff 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ This addon is used to take a normal openFrameworks project and split it into 2 o - in collaboration with [FlightPhase](http://www.flightphase.com) - additions by [Marek Bereza](http://www.mazbox.com/) - This fork was created by [Jeff Crouse](http://www.jeffcrouse.info) specifically for the [Interactive openFrameworks workshop at Kitchen Table Coders](http://kitchentablecoders.com/2012/10/20/intermediate-of-a/). It is simplified in a few minor ways. -- Updated by Memo Akten for GL3 / programmable pipeline compatibility +- Updated by [Memo Akten](http://www.memo.tv) for GL3 / programmable pipeline compatibility ### Used in From 202740ee7881d52bdae1f925da111793a667a29d Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 13:50:17 +0300 Subject: [PATCH 06/12] added enabled (bypass) option, a few getters and const-correctness --- src/ofxProjectorBlend.cpp | 49 ++++++--------------------------------- src/ofxProjectorBlend.h | 45 +++++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 57 deletions(-) diff --git a/src/ofxProjectorBlend.cpp b/src/ofxProjectorBlend.cpp index 92ce206..151d24f 100644 --- a/src/ofxProjectorBlend.cpp +++ b/src/ofxProjectorBlend.cpp @@ -5,15 +5,9 @@ // -------------------------------------------------- ofxProjectorBlend::ofxProjectorBlend() { - showBlend = true; - //gamma = gamma2 = 0.5; - //blendPower = blendPower2 = 1; - //luminance = luminance2 = 0; gamma.resize(2, 0.5); blendPower.resize(2, 1); luminance.resize(2, 0); - numProjectors = 0; - threshold = 0; } @@ -49,6 +43,8 @@ void ofxProjectorBlend::setup(int resolutionWidth, } pixelOverlap = _pixelOverlap; + projectorWidth = resolutionWidth; + projectorHeight = resolutionHeight; if(rotation == ofxProjectorBlend_NoRotation) { singleChannelWidth = resolutionWidth; @@ -91,6 +87,7 @@ void ofxProjectorBlend::setup(int resolutionWidth, // -------------------------------------------------- void ofxProjectorBlend::begin() { + if(!enabled) return; fullTexture.begin(); @@ -99,18 +96,6 @@ void ofxProjectorBlend::begin() { } -// -------------------------------------------------- -float ofxProjectorBlend::getDisplayWidth() { - return displayWidth; -} - - -// -------------------------------------------------- -float ofxProjectorBlend::getDisplayHeight() { - return displayHeight; -} - - // -------------------------------------------------- void ofxProjectorBlend::moveDisplayVertical(unsigned int targetDisplay, int yOffset) { @@ -124,31 +109,9 @@ void ofxProjectorBlend::moveDisplayVertical(unsigned int targetDisplay, int yOff // -------------------------------------------------- -// This changes your app's window size to the correct output size -void ofxProjectorBlend::setWindowToDisplaySize() -{ - ofSetWindowShape(getDisplayWidth(), getDisplayHeight()); -} +void ofxProjectorBlend::end() { + if(!enabled) return; - -// -------------------------------------------------- -float ofxProjectorBlend::getCanvasWidth() -{ - return fullTextureWidth; -} - - -// -------------------------------------------------- -float ofxProjectorBlend::getCanvasHeight() -{ - return fullTextureHeight; -} - - - -// -------------------------------------------------- -void ofxProjectorBlend::end() -{ fullTexture.end(); ofPopStyle(); } @@ -174,6 +137,8 @@ void ofxProjectorBlend::updateShaderUniforms() // -------------------------------------------------- void ofxProjectorBlend::draw(float x, float y) { + if(!enabled) return; + ofSetHexColor(0xFFFFFF); ofPushMatrix(); ofTranslate(x, y, 0); diff --git a/src/ofxProjectorBlend.h b/src/ofxProjectorBlend.h index 4fac7e7..5716cdb 100644 --- a/src/ofxProjectorBlend.h +++ b/src/ofxProjectorBlend.h @@ -42,10 +42,11 @@ class ofxProjectorBlend // this is how big the area to draw to is. - float getCanvasWidth(); - float getCanvasHeight(); + float getCanvasWidth() const { return enabled ? fullTextureWidth : ofGetWidth(); } + float getCanvasHeight() const { return enabled ? fullTextureHeight : ofGetHeight(); } ofFbo & getFullTexture() { return fullTexture; } + const ofFbo & getFullTexture() const { return fullTexture; } /** * This is how big all the projector resolutions would be @@ -58,16 +59,23 @@ class ofxProjectorBlend * main one (the one with the menu) on the left hand side. * If you don't, you'll only get the first screen. */ - float getDisplayWidth(); - float getDisplayHeight(); + float getDisplayWidth() const { return enabled ? displayWidth : ofGetWidth(); } + float getDisplayHeight() const { return enabled ? displayHeight : ofGetHeight(); } + + float getProjectorWidth() const { return projectorWidth; } + float getProjectorHeight() const { return projectorHeight; } + + float getPixelOverlap() const { return pixelOverlap; } + int getNumProjectors() const { return numProjectors; } void moveDisplayVertical(unsigned int targetDisplay, int yOffset); /** This changes your app's window size to the correct output size */ - void setWindowToDisplaySize(); + void setWindowToDisplaySize() const { if(enabled) ofSetWindowShape(getDisplayWidth(), getDisplayHeight()); } - bool showBlend; + bool showBlend = true; + bool enabled = true; // if false, bypasses everything // variables that control the blend // more info here on what these variables do @@ -78,22 +86,29 @@ class ofxProjectorBlend //float blendPower2; //float gamma2; //float luminance2; - float threshold; + float threshold = 0; protected: vector projectorHeightOffset; - float fullTextureWidth; - float fullTextureHeight; - float singleChannelWidth; - float singleChannelHeight; + // resolution of single projector + float projectorWidth = 0; + float projectorHeight = 0; + + // resolution of single projector considering projector rotation + float singleChannelWidth = 0; + float singleChannelHeight = 0; + + // canvas size + float fullTextureWidth = 0; + float fullTextureHeight = 0; - float displayWidth; - float displayHeight; + float displayWidth = 0; + float displayHeight = 0; - float pixelOverlap; - int numProjectors; + float pixelOverlap = 0; + int numProjectors = 0; ofxProjectorBlendLayout layout; ofxProjectorBlendRotation rotation; ofShader blendShader; From c26fc6fc96eadae40437866c528dad1240511bfd Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 14:43:24 +0300 Subject: [PATCH 07/12] updated gui example to dynamically change number projectors, projector resolution, and pixel overlap --- 03_guiControls/bin/data/_settings.xml | 30 ------ 03_guiControls/src/main.cpp | 1 + 03_guiControls/src/testApp.cpp | 132 +++++++++++++------------- 03_guiControls/src/testApp.h | 20 ++-- 4 files changed, 73 insertions(+), 110 deletions(-) delete mode 100644 03_guiControls/bin/data/_settings.xml diff --git a/03_guiControls/bin/data/_settings.xml b/03_guiControls/bin/data/_settings.xml deleted file mode 100644 index 1375ae0..0000000 --- a/03_guiControls/bin/data/_settings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - Show Blend - 1 - - - Blend Power 1 - 2.039999962 - - - Gamma 1 - 1.952500105 - - - Luminance 1 - 0.474999994 - - - Blend Power 2 - 2.519999981 - - - Gamma 2 - 2.206000090 - - - Luminance 2 - 0.319999993 - - diff --git a/03_guiControls/src/main.cpp b/03_guiControls/src/main.cpp index 09eeb85..6e80fa3 100644 --- a/03_guiControls/src/main.cpp +++ b/03_guiControls/src/main.cpp @@ -6,6 +6,7 @@ int main( ){ ofGLFWWindowSettings settings; settings.setGLVersion(3, 3); + settings.setSize(1280, 800); // settings.windowMode = OF_FULLSCREEN; settings.multiMonitorFullScreen = true; ofCreateWindow(settings); // <-------- setup the GL context diff --git a/03_guiControls/src/testApp.cpp b/03_guiControls/src/testApp.cpp index b16f834..022c138 100644 --- a/03_guiControls/src/testApp.cpp +++ b/03_guiControls/src/testApp.cpp @@ -2,104 +2,102 @@ //-------------------------------------------------------------- void testApp::setup(){ + // NOTE: having to setup gui twice + // FIRST to load the number of projectors + setupGui(); + gui.loadFromXML(); - blender.setup(PROJECTOR_WIDTH, PROJECTOR_HEIGHT, PROJECTOR_COUNT, PIXEL_OVERLAP); - blender.setWindowToDisplaySize(); + // AGAIN to reconstruct the gui with correct number of projectors + gui.currentPage().clear(); // clear page first + setupGui(); + gui.loadFromXML(); - - gui.addToggle("Show Blend", blender.showBlend); + gui.show(); + gui.setAutoSave(false); - for (int i=0; i Date: Wed, 13 Feb 2019 14:47:25 +0300 Subject: [PATCH 08/12] better management of gui page --- 03_guiControls/src/testApp.cpp | 5 +++-- 03_guiControls/src/testApp.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/03_guiControls/src/testApp.cpp b/03_guiControls/src/testApp.cpp index 022c138..f0c1905 100644 --- a/03_guiControls/src/testApp.cpp +++ b/03_guiControls/src/testApp.cpp @@ -5,10 +5,11 @@ void testApp::setup(){ // NOTE: having to setup gui twice // FIRST to load the number of projectors setupGui(); + blenderGuiPage = &gui.currentPage(); // save reference to gui page gui.loadFromXML(); // AGAIN to reconstruct the gui with correct number of projectors - gui.currentPage().clear(); // clear page first + blenderGuiPage->clear(); // clear page first setupGui(); gui.loadFromXML(); @@ -58,7 +59,7 @@ void testApp::update(){ // if number of projectors have changed, reset the gui if(bInitGui) { - gui.currentPage().clear(); // clear page first + blenderGuiPage->clear(); // clear page first setupGui(); } } diff --git a/03_guiControls/src/testApp.h b/03_guiControls/src/testApp.h index cfda7fb..831b1c3 100644 --- a/03_guiControls/src/testApp.h +++ b/03_guiControls/src/testApp.h @@ -21,4 +21,5 @@ class testApp : public ofBaseApp{ ofxProjectorBlend blender; ofVideoGrabber grabber; + ofxSimpleGuiPage* blenderGuiPage = NULL; }; From 215904dd8aba39117392c91f73e2a227ebafdfc5 Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 15:59:30 +0300 Subject: [PATCH 09/12] add isReady() function to avoid crash if fbo isn't allocated --- src/ofxProjectorBlend.cpp | 6 +++--- src/ofxProjectorBlend.h | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ofxProjectorBlend.cpp b/src/ofxProjectorBlend.cpp index 151d24f..f7c64ac 100644 --- a/src/ofxProjectorBlend.cpp +++ b/src/ofxProjectorBlend.cpp @@ -87,7 +87,7 @@ void ofxProjectorBlend::setup(int resolutionWidth, // -------------------------------------------------- void ofxProjectorBlend::begin() { - if(!enabled) return; + if(!isReady()) return; fullTexture.begin(); @@ -110,7 +110,7 @@ void ofxProjectorBlend::moveDisplayVertical(unsigned int targetDisplay, int yOff // -------------------------------------------------- void ofxProjectorBlend::end() { - if(!enabled) return; + if(!isReady()) return; fullTexture.end(); ofPopStyle(); @@ -137,7 +137,7 @@ void ofxProjectorBlend::updateShaderUniforms() // -------------------------------------------------- void ofxProjectorBlend::draw(float x, float y) { - if(!enabled) return; + if(!isReady()) return; ofSetHexColor(0xFFFFFF); ofPushMatrix(); diff --git a/src/ofxProjectorBlend.h b/src/ofxProjectorBlend.h index 5716cdb..12364b1 100644 --- a/src/ofxProjectorBlend.h +++ b/src/ofxProjectorBlend.h @@ -40,10 +40,11 @@ class ofxProjectorBlend void draw(float x = 0, float y = 0); + bool isReady() const { return enabled && fullTexture.isAllocated(); } // this is how big the area to draw to is. - float getCanvasWidth() const { return enabled ? fullTextureWidth : ofGetWidth(); } - float getCanvasHeight() const { return enabled ? fullTextureHeight : ofGetHeight(); } + float getCanvasWidth() const { return isReady() ? fullTextureWidth : ofGetWidth(); } + float getCanvasHeight() const { return isReady() ? fullTextureHeight : ofGetHeight(); } ofFbo & getFullTexture() { return fullTexture; } const ofFbo & getFullTexture() const { return fullTexture; } @@ -59,8 +60,8 @@ class ofxProjectorBlend * main one (the one with the menu) on the left hand side. * If you don't, you'll only get the first screen. */ - float getDisplayWidth() const { return enabled ? displayWidth : ofGetWidth(); } - float getDisplayHeight() const { return enabled ? displayHeight : ofGetHeight(); } + float getDisplayWidth() const { return isReady() ? displayWidth : ofGetWidth(); } + float getDisplayHeight() const { return isReady() ? displayHeight : ofGetHeight(); } float getProjectorWidth() const { return projectorWidth; } float getProjectorHeight() const { return projectorHeight; } @@ -72,7 +73,7 @@ class ofxProjectorBlend /** This changes your app's window size to the correct output size */ - void setWindowToDisplaySize() const { if(enabled) ofSetWindowShape(getDisplayWidth(), getDisplayHeight()); } + void setWindowToDisplaySize() const { if(isReady()) ofSetWindowShape(getDisplayWidth(), getDisplayHeight()); } bool showBlend = true; bool enabled = true; // if false, bypasses everything From b203db6dcbcc537eb09860f8afee7269c60b5098 Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 13 Feb 2019 16:04:10 +0300 Subject: [PATCH 10/12] clarity on enabled comment --- src/ofxProjectorBlend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ofxProjectorBlend.h b/src/ofxProjectorBlend.h index 12364b1..e74ce89 100644 --- a/src/ofxProjectorBlend.h +++ b/src/ofxProjectorBlend.h @@ -76,7 +76,7 @@ class ofxProjectorBlend void setWindowToDisplaySize() const { if(isReady()) ofSetWindowShape(getDisplayWidth(), getDisplayHeight()); } bool showBlend = true; - bool enabled = true; // if false, bypasses everything + bool enabled = true; // if false, bypasses everything (draw commands inside begin()/end() pass straight through to openframeworks) // variables that control the blend // more info here on what these variables do From bee7a1515c1c4e2413e44ba84b79cbea2578f569 Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Thu, 3 Oct 2019 18:11:09 +0300 Subject: [PATCH 11/12] do blend --- src/ofxProjectorBlend.cpp | 30 +++++++++++++++++++++--------- src/ofxProjectorBlend.h | 1 + 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/ofxProjectorBlend.cpp b/src/ofxProjectorBlend.cpp index f7c64ac..5ff0ee8 100644 --- a/src/ofxProjectorBlend.cpp +++ b/src/ofxProjectorBlend.cpp @@ -121,15 +121,27 @@ void ofxProjectorBlend::end() { void ofxProjectorBlend::updateShaderUniforms() { - blendShader.setUniform1f("OverlapTop", 0.0f); - blendShader.setUniform1f("OverlapLeft", 0.0f); - blendShader.setUniform1f("OverlapBottom", 0.0f); - blendShader.setUniform1f("OverlapRight", 0.0f); - - blendShader.setUniform1fv("BlendPower", &blendPower[0], blendPower.size()); - blendShader.setUniform1fv("SomeLuminanceControl", &luminance[0], luminance.size()); - blendShader.setUniform1fv("GammaCorrection", &gamma[0], gamma.size()); - + blendShader.setUniform1f("OverlapTop", 0.0f); + blendShader.setUniform1f("OverlapLeft", 0.0f); + blendShader.setUniform1f("OverlapBottom", 0.0f); + blendShader.setUniform1f("OverlapRight", 0.0f); + + if (doBlend) { + blendShader.setUniform1fv("BlendPower", &blendPower[0], blendPower.size()); + blendShader.setUniform1fv("SomeLuminanceControl", &luminance[0], luminance.size()); + blendShader.setUniform1fv("GammaCorrection", &gamma[0], gamma.size()); + } + else { // override values + vector t0; + t0.resize(numProjectors - 1, 0); + blendShader.setUniform1fv("BlendPower", &t0[0], t0.size()); + + vector t1; + t1.resize(numProjectors - 1, 0.5); + blendShader.setUniform1fv("SomeLuminanceControl", &t1[0], t1.size()); + blendShader.setUniform1fv("GammaCorrection", &t1[0], t1.size()); + } + blendShader.setUniform1f("projectors", this->numProjectors); blendShader.setUniform1f("threshold", threshold); } diff --git a/src/ofxProjectorBlend.h b/src/ofxProjectorBlend.h index e74ce89..4510b49 100644 --- a/src/ofxProjectorBlend.h +++ b/src/ofxProjectorBlend.h @@ -77,6 +77,7 @@ class ofxProjectorBlend bool showBlend = true; bool enabled = true; // if false, bypasses everything (draw commands inside begin()/end() pass straight through to openframeworks) + bool doBlend = true; // variables that control the blend // more info here on what these variables do From 477afbbbae17d5863b865e1a1f503bd2e3bd6b3a Mon Sep 17 00:00:00 2001 From: Memo Akten Date: Wed, 4 Nov 2020 16:10:30 +0300 Subject: [PATCH 12/12] update examples --- 01_twoScreens/01_twoScreens.qbs | 74 -- .../01_twoScreens.sln | 18 +- 01_twoScreens/01_twoScreens.vcxproj | 210 +++++ 01_twoScreens/Makefile | 13 - 01_twoScreens/Project.xcconfig | 9 - 01_twoScreens/openFrameworks-Info.plist | 20 - 01_twoScreens/src/main.cpp | 3 +- 01_twoScreens/src/{testApp.cpp => ofApp.cpp} | 2 +- 01_twoScreens/src/{testApp.h => ofApp.h} | 0 01_twoScreens/twoScreens.cbp | 139 --- 01_twoScreens/twoScreens.vcxproj | 117 --- 01_twoScreens/twoScreens.vcxproj.filters | 39 - 01_twoScreens/twoScreens.vcxproj.user | 3 - 01_twoScreens/twoScreens.workspace | 9 - .../twoScreens.xcodeproj/project.pbxproj | 593 ------------- .../xcschemes/twoScreens Debug.xcscheme | 84 -- .../xcschemes/twoScreens Release.xcscheme | 84 -- 02_threeVertical/02_threeVertical.qbs | 74 -- 02_threeVertical/02_threeVertical.sln | 35 + 02_threeVertical/02_threeVertical.vcxproj | 210 +++++ 02_threeVertical/Makefile | 13 - 02_threeVertical/Project.xcconfig | 9 - 02_threeVertical/openFrameworks-Info.plist | 20 - 02_threeVertical/src/main.cpp | 3 +- .../src/{testApp.cpp => ofApp.cpp} | 2 +- 02_threeVertical/src/{testApp.h => ofApp.h} | 0 02_threeVertical/threeVertical.cbp | 139 --- 02_threeVertical/threeVertical.vcxproj | 117 --- .../threeVertical.vcxproj.filters | 39 - 02_threeVertical/threeVertical.vcxproj.user | 11 - 02_threeVertical/threeVertical.workspace | 9 - .../threeVertical.xcodeproj/project.pbxproj | 593 ------------- .../xcschemes/threeVertical Debug.xcscheme | 84 -- .../xcschemes/threeVertical Release.xcscheme | 84 -- 03_guiControls/03_guiControls.qbs | 74 -- .../03_guiControls.sln | 18 +- ...ontrols.vcxproj => 03_guiControls.vcxproj} | 171 +++- 03_guiControls/Makefile | 13 - 03_guiControls/Project.xcconfig | 9 - 03_guiControls/addons.make | 2 +- 03_guiControls/bin/data/_settings.xml | 50 ++ 03_guiControls/guiControls.cbp | 276 ------ 03_guiControls/guiControls.vcxproj.filters | 189 ----- 03_guiControls/guiControls.vcxproj.user | 11 - 03_guiControls/guiControls.workspace | 9 - .../guiControls.xcodeproj/project.pbxproj | 795 ------------------ .../xcschemes/guiControls Debug.xcscheme | 84 -- .../xcschemes/guiControls Release.xcscheme | 84 -- 03_guiControls/openFrameworks-Info.plist | 20 - 03_guiControls/src/main.cpp | 3 +- 03_guiControls/src/{testApp.cpp => ofApp.cpp} | 2 +- 03_guiControls/src/{testApp.h => ofApp.h} | 0 04_blendClown/04_blendClown.qbs | 74 -- .../04_blendClown.sln | 18 +- 04_blendClown/04_blendClown.vcxproj | 210 +++++ 04_blendClown/Makefile | 13 - 04_blendClown/Project.xcconfig | 9 - 04_blendClown/blendClown.cbp | 139 --- 04_blendClown/blendClown.vcxproj | 117 --- 04_blendClown/blendClown.vcxproj.filters | 39 - 04_blendClown/blendClown.vcxproj.user | 11 - 04_blendClown/blendClown.workspace | 9 - .../blendClown.xcodeproj/project.pbxproj | 593 ------------- .../xcschemes/blendClown Debug.xcscheme | 84 -- .../xcschemes/blendClown Release.xcscheme | 84 -- 04_blendClown/openFrameworks-Info.plist | 20 - 04_blendClown/src/main.cpp | 3 +- 04_blendClown/src/{testApp.cpp => ofApp.cpp} | 2 +- 04_blendClown/src/{testApp.h => ofApp.h} | 0 69 files changed, 898 insertions(+), 5196 deletions(-) delete mode 100644 01_twoScreens/01_twoScreens.qbs rename 02_threeVertical/threeVertical.sln => 01_twoScreens/01_twoScreens.sln (51%) create mode 100644 01_twoScreens/01_twoScreens.vcxproj delete mode 100644 01_twoScreens/Makefile delete mode 100644 01_twoScreens/Project.xcconfig delete mode 100644 01_twoScreens/openFrameworks-Info.plist rename 01_twoScreens/src/{testApp.cpp => ofApp.cpp} (99%) rename 01_twoScreens/src/{testApp.h => ofApp.h} (100%) delete mode 100644 01_twoScreens/twoScreens.cbp delete mode 100644 01_twoScreens/twoScreens.vcxproj delete mode 100644 01_twoScreens/twoScreens.vcxproj.filters delete mode 100644 01_twoScreens/twoScreens.vcxproj.user delete mode 100644 01_twoScreens/twoScreens.workspace delete mode 100644 01_twoScreens/twoScreens.xcodeproj/project.pbxproj delete mode 100644 01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Debug.xcscheme delete mode 100644 01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Release.xcscheme delete mode 100644 02_threeVertical/02_threeVertical.qbs create mode 100644 02_threeVertical/02_threeVertical.sln create mode 100644 02_threeVertical/02_threeVertical.vcxproj delete mode 100644 02_threeVertical/Makefile delete mode 100644 02_threeVertical/Project.xcconfig delete mode 100644 02_threeVertical/openFrameworks-Info.plist rename 02_threeVertical/src/{testApp.cpp => ofApp.cpp} (99%) rename 02_threeVertical/src/{testApp.h => ofApp.h} (100%) delete mode 100644 02_threeVertical/threeVertical.cbp delete mode 100644 02_threeVertical/threeVertical.vcxproj delete mode 100644 02_threeVertical/threeVertical.vcxproj.filters delete mode 100644 02_threeVertical/threeVertical.vcxproj.user delete mode 100644 02_threeVertical/threeVertical.workspace delete mode 100644 02_threeVertical/threeVertical.xcodeproj/project.pbxproj delete mode 100644 02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Debug.xcscheme delete mode 100644 02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Release.xcscheme delete mode 100644 03_guiControls/03_guiControls.qbs rename 04_blendClown/blendClown.sln => 03_guiControls/03_guiControls.sln (51%) rename 03_guiControls/{guiControls.vcxproj => 03_guiControls.vcxproj} (50%) delete mode 100644 03_guiControls/Makefile delete mode 100644 03_guiControls/Project.xcconfig create mode 100644 03_guiControls/bin/data/_settings.xml delete mode 100644 03_guiControls/guiControls.cbp delete mode 100644 03_guiControls/guiControls.vcxproj.filters delete mode 100644 03_guiControls/guiControls.vcxproj.user delete mode 100644 03_guiControls/guiControls.workspace delete mode 100644 03_guiControls/guiControls.xcodeproj/project.pbxproj delete mode 100644 03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Debug.xcscheme delete mode 100644 03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Release.xcscheme delete mode 100644 03_guiControls/openFrameworks-Info.plist rename 03_guiControls/src/{testApp.cpp => ofApp.cpp} (99%) rename 03_guiControls/src/{testApp.h => ofApp.h} (100%) delete mode 100644 04_blendClown/04_blendClown.qbs rename 03_guiControls/guiControls.sln => 04_blendClown/04_blendClown.sln (51%) create mode 100644 04_blendClown/04_blendClown.vcxproj delete mode 100644 04_blendClown/Makefile delete mode 100644 04_blendClown/Project.xcconfig delete mode 100644 04_blendClown/blendClown.cbp delete mode 100644 04_blendClown/blendClown.vcxproj delete mode 100644 04_blendClown/blendClown.vcxproj.filters delete mode 100644 04_blendClown/blendClown.vcxproj.user delete mode 100644 04_blendClown/blendClown.workspace delete mode 100644 04_blendClown/blendClown.xcodeproj/project.pbxproj delete mode 100644 04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Debug.xcscheme delete mode 100644 04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Release.xcscheme delete mode 100644 04_blendClown/openFrameworks-Info.plist rename 04_blendClown/src/{testApp.cpp => ofApp.cpp} (99%) rename 04_blendClown/src/{testApp.h => ofApp.h} (100%) diff --git a/01_twoScreens/01_twoScreens.qbs b/01_twoScreens/01_twoScreens.qbs deleted file mode 100644 index e2a124f..0000000 --- a/01_twoScreens/01_twoScreens.qbs +++ /dev/null @@ -1,74 +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(sourceDirectory) } - - files: [ - 'src/*', - ] - - // This project is using addons.make to include the addons - // since it was imported from old code. To change it to include - // the addons from the qbs file change the following lines to - // the list of used addons in array format. eg: - // - // of.addons: [ - // 'ofxGui', - // 'ofxOpenCv', - // ] - - // 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 - of.frameworks: [] // osx only, additional frameworks to link with the project - of.staticLibraries: [] // static libraries - of.dynamicLibraries: [] // dynamic libraries - - // create a console window when the application start - consoleApplication: true - - // 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" - } - } - - property bool makeOF: true // use makfiles to compile the OF library - // will compile OF only once for all your projects - // otherwise compiled per project with qbs - - property bool precompileOfMain: false // precompile ofMain.h - // faster to recompile when including ofMain.h - // but might use a lot of space per project - - references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] -} diff --git a/02_threeVertical/threeVertical.sln b/01_twoScreens/01_twoScreens.sln similarity index 51% rename from 02_threeVertical/threeVertical.sln rename to 01_twoScreens/01_twoScreens.sln index 005d0dd..20131cb 100644 --- a/02_threeVertical/threeVertical.sln +++ b/01_twoScreens/01_twoScreens.sln @@ -1,23 +1,33 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threeVertical", "threeVertical.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_twoScreens", "01_twoScreens.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/01_twoScreens/01_twoScreens.vcxproj b/01_twoScreens/01_twoScreens.vcxproj new file mode 100644 index 0000000..0b8f3b6 --- /dev/null +++ b/01_twoScreens/01_twoScreens.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) + $(WindowsTargetPlatformVersion) + + + {7FD42DF7-442E-479A-BA76-D0022F99702A} + Win32Proj + emptyExample + + + + Application + Unicode + v141 + + + Application + Unicode + v141 + + + Application + Unicode + true + v141 + + + Application + Unicode + true + v141 + + + + + + + + + + + + + + + + + + + + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + false + + + bin\ + obj\$(Platform)\$(Configuration)\ + false + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + $(IntDir) + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + true + $(IntDir) + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + true + $(IntDir) + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + $(IntDir) + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + {5837595d-aca9-485c-8e76-729040ce4b0b} + + + + + /D_DEBUG %(AdditionalOptions) + /D_DEBUG %(AdditionalOptions) + $(OF_ROOT)\libs\openFrameworksCompiled\project\vs + + + + + + + + + \ No newline at end of file diff --git a/01_twoScreens/Makefile b/01_twoScreens/Makefile deleted file mode 100644 index 177e172..0000000 --- a/01_twoScreens/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Attempt to load a config.make file. -# If none is found, project defaults in config.project.make will be used. -ifneq ($(wildcard config.make),) - include config.make -endif - -# make sure the the OF_ROOT location is defined -ifndef OF_ROOT - OF_ROOT=$(realpath ../../..) -endif - -# call the project makefile! -include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/01_twoScreens/Project.xcconfig b/01_twoScreens/Project.xcconfig deleted file mode 100644 index c10b9e5..0000000 --- a/01_twoScreens/Project.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED -OF_PATH = ../../.. - -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE -#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" - -OTHER_LDFLAGS = $(OF_CORE_LIBS) -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) diff --git a/01_twoScreens/openFrameworks-Info.plist b/01_twoScreens/openFrameworks-Info.plist deleted file mode 100644 index e5db555..0000000 --- a/01_twoScreens/openFrameworks-Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.yourcompany.openFrameworks - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - diff --git a/01_twoScreens/src/main.cpp b/01_twoScreens/src/main.cpp index 09eeb85..8a06b9a 100644 --- a/01_twoScreens/src/main.cpp +++ b/01_twoScreens/src/main.cpp @@ -1,6 +1,5 @@ #include "ofMain.h" -#include "testApp.h" -#include "ofAppGlutWindow.h" +#include "ofApp.h" //======================================================================== int main( ){ diff --git a/01_twoScreens/src/testApp.cpp b/01_twoScreens/src/ofApp.cpp similarity index 99% rename from 01_twoScreens/src/testApp.cpp rename to 01_twoScreens/src/ofApp.cpp index 021c9a4..9a5f33d 100644 --- a/01_twoScreens/src/testApp.cpp +++ b/01_twoScreens/src/ofApp.cpp @@ -1,4 +1,4 @@ -#include "testApp.h" +#include "ofApp.h" //-------------------------------------------------------------- void testApp::setup(){ diff --git a/01_twoScreens/src/testApp.h b/01_twoScreens/src/ofApp.h similarity index 100% rename from 01_twoScreens/src/testApp.h rename to 01_twoScreens/src/ofApp.h diff --git a/01_twoScreens/twoScreens.cbp b/01_twoScreens/twoScreens.cbp deleted file mode 100644 index 1c77c75..0000000 --- a/01_twoScreens/twoScreens.cbp +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - diff --git a/01_twoScreens/twoScreens.vcxproj b/01_twoScreens/twoScreens.vcxproj deleted file mode 100644 index 7bb9978..0000000 --- a/01_twoScreens/twoScreens.vcxproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7FD42DF7-442E-479A-BA76-D0022F99702A} - twoScreens - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - true - bin\ - obj\$(Configuration)\ - false - $(ProjectName)_debug - $(ProjectName) - - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - %(AdditionalIncludeDirectories);..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src - - - $(OutDir)$(TargetName)$(TargetExt) - true - $(TargetDir)$(TargetName)_debugInfo.pdb - Console - false - - MachineX86 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - false - %(PreprocessorDefinitions) - MultiThreadedDLL - - Level3 - - %(AdditionalIncludeDirectories);..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src - - - false - false - Console - true - true - false - - MachineX86 - Default - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - {5837595d-aca9-485c-8e76-729040ce4b0b} - - - - - diff --git a/01_twoScreens/twoScreens.vcxproj.filters b/01_twoScreens/twoScreens.vcxproj.filters deleted file mode 100644 index b7775e9..0000000 --- a/01_twoScreens/twoScreens.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - src - - - src - - - addons\ofxProjectorBlend\src - - - - - {d8376475-7454-4a24-b08a-aac121d3ad6f} - - - {71834f65-f3a9-211e-73b8-dc8563776aec} - - - {68872c20-5bba-68f5-de45-7abc2ec361a0} - - - {8850216e-5599-6fbb-57ba-e42512729987} - - - - - src - - - addons\ofxProjectorBlend\src - - - addons\ofxProjectorBlend\src - - - diff --git a/01_twoScreens/twoScreens.vcxproj.user b/01_twoScreens/twoScreens.vcxproj.user deleted file mode 100644 index ace9a86..0000000 --- a/01_twoScreens/twoScreens.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/01_twoScreens/twoScreens.workspace b/01_twoScreens/twoScreens.workspace deleted file mode 100644 index 8cc220b..0000000 --- a/01_twoScreens/twoScreens.workspace +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/01_twoScreens/twoScreens.xcodeproj/project.pbxproj b/01_twoScreens/twoScreens.xcodeproj/project.pbxproj deleted file mode 100644 index d681de8..0000000 --- a/01_twoScreens/twoScreens.xcodeproj/project.pbxproj +++ /dev/null @@ -1,593 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */; }; - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - 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 */; }; - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */; }; - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9740E8CC7DD009D7055 /* Carbon.framework */; }; - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */; }; - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */; }; - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9770E8CC7DD009D7055 /* CoreServices.framework */; }; - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; }; - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; }; - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; }; - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; }; - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; }; - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; }; - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */; }; - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E715D3B6510020DFD4 /* QTKit.framework */; }; - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F985F515E0DE99003869B5 /* Accelerate.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - E4328147138ABC890047C5CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E4B27C1510CBEB8E00536013; - remoteInfo = openFrameworks; - }; - E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = E4B27C1410CBEB8E00536013; - remoteInfo = openFrameworks; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - E4C2427710CC5ABF004149E2 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1F9C2BBB165FE9DB00E69BAD /* ofxProjectorBlendShader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofxProjectorBlendShader.h; path = ../src/ofxProjectorBlendShader.h; sourceTree = ""; }; - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxProjectorBlend.h; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.h; sourceTree = SOURCE_ROOT; }; - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxProjectorBlend.cpp; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.cpp; sourceTree = SOURCE_ROOT; }; - 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 = ""; }; - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; - E45BE9740E8CC7DD009D7055 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 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 /* twoScreensDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = twoScreensDebug.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 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; }; - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; }; - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = ""; }; - E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; }; - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; - E7E077E715D3B6510020DFD4 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; - E7F985F515E0DE99003869B5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - E4B69B590A3A1756003C02F2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */, - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */, - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */, - E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */, - E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */, - E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */, - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */, - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */, - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */, - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */, - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */, - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */, - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */, - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */, - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */, - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */, - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */ = { - isa = PBXGroup; - children = ( - 7959a566a37db3c7c7ffaf32a0efe078 /* src */, - ); - name = ofxProjectorBlend; - sourceTree = ""; - }; - 7959a566a37db3c7c7ffaf32a0efe078 /* src */ = { - isa = PBXGroup; - children = ( - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */, - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */, - 1F9C2BBB165FE9DB00E69BAD /* ofxProjectorBlendShader.h */, - ); - name = src; - sourceTree = ""; - }; - BB4B014C10F69532006C3DED /* addons */ = { - isa = PBXGroup; - children = ( - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */, - ); - name = addons; - sourceTree = ""; - }; - BBAB23C913894ECA00AA2426 /* system frameworks */ = { - isa = PBXGroup; - children = ( - E7F985F515E0DE99003869B5 /* Accelerate.framework */, - E4C2424410CC5A17004149E2 /* AppKit.framework */, - E4C2424510CC5A17004149E2 /* Cocoa.framework */, - E4C2424610CC5A17004149E2 /* IOKit.framework */, - E45BE9710E8CC7DD009D7055 /* AGL.framework */, - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */, - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */, - E45BE9740E8CC7DD009D7055 /* Carbon.framework */, - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */, - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */, - E45BE9770E8CC7DD009D7055 /* CoreServices.framework */, - E45BE9790E8CC7DD009D7055 /* OpenGL.framework */, - E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */, - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */, - E7E077E715D3B6510020DFD4 /* QTKit.framework */, - ); - name = "system frameworks"; - sourceTree = ""; - }; - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23BE13894E4700AA2426 /* GLUT.framework */, - ); - name = "3rd party frameworks"; - sourceTree = ""; - }; - E4328144138ABC890047C5CB /* Products */ = { - isa = PBXGroup; - children = ( - E4328148138ABC890047C5CB /* openFrameworksDebug.a */, - ); - name = Products; - sourceTree = ""; - }; - E45BE5980E8CC70C009D7055 /* frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */, - BBAB23C913894ECA00AA2426 /* system frameworks */, - ); - name = frameworks; - sourceTree = ""; - }; - E4B69B4A0A3A1720003C02F2 = { - isa = PBXGroup; - children = ( - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, - E4B69E1C0A3A1BDC003C02F2 /* src */, - E4EEC9E9138DF44700A80321 /* openFrameworks */, - BB4B014C10F69532006C3DED /* addons */, - E45BE5980E8CC70C009D7055 /* frameworks */, - E4B69B5B0A3A1756003C02F2 /* twoScreensDebug.app */, - ); - sourceTree = ""; - }; - E4B69E1C0A3A1BDC003C02F2 /* src */ = { - isa = PBXGroup; - children = ( - E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, - E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */, - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */, - ); - path = src; - sourceTree = SOURCE_ROOT; - }; - E4EEC9E9138DF44700A80321 /* openFrameworks */ = { - isa = PBXGroup; - children = ( - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */, - E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */, - ); - name = openFrameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - E4B69B5A0A3A1756003C02F2 /* twoScreens */ = { - isa = PBXNativeTarget; - buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "twoScreens" */; - buildPhases = ( - E4B69B580A3A1756003C02F2 /* Sources */, - E4B69B590A3A1756003C02F2 /* Frameworks */, - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, - E4C2427710CC5ABF004149E2 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */, - ); - name = twoScreens; - productName = myOFApp; - productReference = E4B69B5B0A3A1756003C02F2 /* twoScreensDebug.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E4B69B4C0A3A1720003C02F2 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "twoScreens" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = E4B69B4A0A3A1720003C02F2; - productRefGroup = E4B69B4A0A3A1720003C02F2; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = E4328144138ABC890047C5CB /* Products */; - ProjectRef = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - E4B69B5A0A3A1756003C02F2 /* twoScreens */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - E4328148138ABC890047C5CB /* openFrameworksDebug.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = openFrameworksDebug.a; - remoteRef = E4328147138ABC890047C5CB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXShellScriptBuildPhase section */ - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - E4B69B580A3A1756003C02F2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */, - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = openFrameworks; - targetProxy = E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - E4B69B4E0A3A1720003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Debug; - }; - E4B69B4F0A3A1720003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_UNROLL_LOOPS = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Release; - }; - E4B69B600A3A1757003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)Debug"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - E4B69B610A3A1757003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "twoScreens" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B4E0A3A1720003C02F2 /* Debug */, - E4B69B4F0A3A1720003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "twoScreens" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B600A3A1757003C02F2 /* Debug */, - E4B69B610A3A1757003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = E4B69B4C0A3A1720003C02F2 /* Project object */; -} diff --git a/01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Debug.xcscheme b/01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Debug.xcscheme deleted file mode 100644 index 4c8a8e0..0000000 --- a/01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Debug.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Release.xcscheme b/01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Release.xcscheme deleted file mode 100644 index 17222b1..0000000 --- a/01_twoScreens/twoScreens.xcodeproj/xcshareddata/xcschemes/twoScreens Release.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/02_threeVertical/02_threeVertical.qbs b/02_threeVertical/02_threeVertical.qbs deleted file mode 100644 index 0fa8af5..0000000 --- a/02_threeVertical/02_threeVertical.qbs +++ /dev/null @@ -1,74 +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(sourceDirectory) } - - files: [ - 'src/*', - ] - - // This project is using addons.make to include the addons - // since it was imported from old code. To change it to include - // the addons from the qbs file change the following lines to - // the list of used addons in array format. eg: - // - // of.addons: [ - // 'ofxGui', - // 'ofxOpenCv', - // ] - - // 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 - of.frameworks: [] // osx only, additional frameworks to link with the project - of.staticLibraries: [] // static libraries - of.dynamicLibraries: [] // dynamic libraries - - // create a console window when the application start - consoleApplication: false - - // 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" - } - } - - property bool makeOF: true // use makfiles to compile the OF library - // will compile OF only once for all your projects - // otherwise compiled per project with qbs - - property bool precompileOfMain: false // precompile ofMain.h - // faster to recompile when including ofMain.h - // but might use a lot of space per project - - references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] -} diff --git a/02_threeVertical/02_threeVertical.sln b/02_threeVertical/02_threeVertical.sln new file mode 100644 index 0000000..cd7a4fa --- /dev/null +++ b/02_threeVertical/02_threeVertical.sln @@ -0,0 +1,35 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_threeVertical", "02_threeVertical.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/02_threeVertical/02_threeVertical.vcxproj b/02_threeVertical/02_threeVertical.vcxproj new file mode 100644 index 0000000..3e275a1 --- /dev/null +++ b/02_threeVertical/02_threeVertical.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) + $(WindowsTargetPlatformVersion) + + + {7FD42DF7-442E-479A-BA76-D0022F99702A} + Win32Proj + 02_threeVertical + + + + Application + Unicode + v141 + + + Application + Unicode + v141 + + + Application + Unicode + true + v141 + + + Application + Unicode + true + v141 + + + + + + + + + + + + + + + + + + + + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + false + + + bin\ + obj\$(Platform)\$(Configuration)\ + false + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + $(IntDir) + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + true + $(IntDir) + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + true + $(IntDir) + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + $(IntDir) + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + {5837595d-aca9-485c-8e76-729040ce4b0b} + + + + + /D_DEBUG %(AdditionalOptions) + /D_DEBUG %(AdditionalOptions) + $(OF_ROOT)\libs\openFrameworksCompiled\project\vs + + + + + + + + + \ No newline at end of file diff --git a/02_threeVertical/Makefile b/02_threeVertical/Makefile deleted file mode 100644 index 177e172..0000000 --- a/02_threeVertical/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Attempt to load a config.make file. -# If none is found, project defaults in config.project.make will be used. -ifneq ($(wildcard config.make),) - include config.make -endif - -# make sure the the OF_ROOT location is defined -ifndef OF_ROOT - OF_ROOT=$(realpath ../../..) -endif - -# call the project makefile! -include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/02_threeVertical/Project.xcconfig b/02_threeVertical/Project.xcconfig deleted file mode 100644 index c10b9e5..0000000 --- a/02_threeVertical/Project.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED -OF_PATH = ../../.. - -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE -#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" - -OTHER_LDFLAGS = $(OF_CORE_LIBS) -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) diff --git a/02_threeVertical/openFrameworks-Info.plist b/02_threeVertical/openFrameworks-Info.plist deleted file mode 100644 index e5db555..0000000 --- a/02_threeVertical/openFrameworks-Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.yourcompany.openFrameworks - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - diff --git a/02_threeVertical/src/main.cpp b/02_threeVertical/src/main.cpp index 09eeb85..8a06b9a 100644 --- a/02_threeVertical/src/main.cpp +++ b/02_threeVertical/src/main.cpp @@ -1,6 +1,5 @@ #include "ofMain.h" -#include "testApp.h" -#include "ofAppGlutWindow.h" +#include "ofApp.h" //======================================================================== int main( ){ diff --git a/02_threeVertical/src/testApp.cpp b/02_threeVertical/src/ofApp.cpp similarity index 99% rename from 02_threeVertical/src/testApp.cpp rename to 02_threeVertical/src/ofApp.cpp index d5d8943..29c6451 100644 --- a/02_threeVertical/src/testApp.cpp +++ b/02_threeVertical/src/ofApp.cpp @@ -1,4 +1,4 @@ -#include "testApp.h" +#include "ofApp.h" //-------------------------------------------------------------- void testApp::setup(){ diff --git a/02_threeVertical/src/testApp.h b/02_threeVertical/src/ofApp.h similarity index 100% rename from 02_threeVertical/src/testApp.h rename to 02_threeVertical/src/ofApp.h diff --git a/02_threeVertical/threeVertical.cbp b/02_threeVertical/threeVertical.cbp deleted file mode 100644 index 011eab5..0000000 --- a/02_threeVertical/threeVertical.cbp +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - diff --git a/02_threeVertical/threeVertical.vcxproj b/02_threeVertical/threeVertical.vcxproj deleted file mode 100644 index 16aae3a..0000000 --- a/02_threeVertical/threeVertical.vcxproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7FD42DF7-442E-479A-BA76-D0022F99702A} - threeVertical - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - true - bin\ - obj\$(Configuration)\ - false - $(ProjectName)_debug - $(ProjectName) - - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - %(AdditionalIncludeDirectories);..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src - - - $(OutDir)$(TargetName)$(TargetExt) - true - $(TargetDir)$(TargetName)_debugInfo.pdb - Console - false - - MachineX86 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - false - %(PreprocessorDefinitions) - MultiThreadedDLL - - Level3 - - %(AdditionalIncludeDirectories);..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src - - - false - false - Console - true - true - false - - MachineX86 - Default - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - {5837595d-aca9-485c-8e76-729040ce4b0b} - - - - - diff --git a/02_threeVertical/threeVertical.vcxproj.filters b/02_threeVertical/threeVertical.vcxproj.filters deleted file mode 100644 index b7775e9..0000000 --- a/02_threeVertical/threeVertical.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - src - - - src - - - addons\ofxProjectorBlend\src - - - - - {d8376475-7454-4a24-b08a-aac121d3ad6f} - - - {71834f65-f3a9-211e-73b8-dc8563776aec} - - - {68872c20-5bba-68f5-de45-7abc2ec361a0} - - - {8850216e-5599-6fbb-57ba-e42512729987} - - - - - src - - - addons\ofxProjectorBlend\src - - - addons\ofxProjectorBlend\src - - - diff --git a/02_threeVertical/threeVertical.vcxproj.user b/02_threeVertical/threeVertical.vcxproj.user deleted file mode 100644 index 5b4759c..0000000 --- a/02_threeVertical/threeVertical.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(TargetDir) - WindowsLocalDebugger - - - $(TargetDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/02_threeVertical/threeVertical.workspace b/02_threeVertical/threeVertical.workspace deleted file mode 100644 index 7322977..0000000 --- a/02_threeVertical/threeVertical.workspace +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/02_threeVertical/threeVertical.xcodeproj/project.pbxproj b/02_threeVertical/threeVertical.xcodeproj/project.pbxproj deleted file mode 100644 index 6d21f6f..0000000 --- a/02_threeVertical/threeVertical.xcodeproj/project.pbxproj +++ /dev/null @@ -1,593 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */; }; - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - 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 */; }; - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */; }; - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9740E8CC7DD009D7055 /* Carbon.framework */; }; - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */; }; - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */; }; - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9770E8CC7DD009D7055 /* CoreServices.framework */; }; - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; }; - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; }; - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; }; - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; }; - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; }; - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; }; - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */; }; - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E715D3B6510020DFD4 /* QTKit.framework */; }; - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F985F515E0DE99003869B5 /* Accelerate.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - E4328147138ABC890047C5CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E4B27C1510CBEB8E00536013; - remoteInfo = openFrameworks; - }; - E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = E4B27C1410CBEB8E00536013; - remoteInfo = openFrameworks; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - E4C2427710CC5ABF004149E2 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxProjectorBlend.h; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.h; sourceTree = SOURCE_ROOT; }; - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxProjectorBlend.cpp; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.cpp; sourceTree = SOURCE_ROOT; }; - 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 = ""; }; - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; - E45BE9740E8CC7DD009D7055 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 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 /* threeVerticalDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = threeVerticalDebug.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 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; }; - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; }; - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = ""; }; - E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; }; - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; - E7E077E715D3B6510020DFD4 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; - E7F985F515E0DE99003869B5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = ""; }; - de165ca92c9f4e06ac1bb897bcae510c /* ofxProjectorBlendShader.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxProjectorBlendShader.h; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlendShader.h; sourceTree = SOURCE_ROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - E4B69B590A3A1756003C02F2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */, - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */, - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */, - E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */, - E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */, - E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */, - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */, - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */, - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */, - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */, - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */, - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */, - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */, - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */, - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */, - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */, - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */ = { - isa = PBXGroup; - children = ( - 7959a566a37db3c7c7ffaf32a0efe078 /* src */, - ); - name = ofxProjectorBlend; - sourceTree = ""; - }; - 7959a566a37db3c7c7ffaf32a0efe078 /* src */ = { - isa = PBXGroup; - children = ( - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */, - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */, - de165ca92c9f4e06ac1bb897bcae510c /* ofxProjectorBlendShader.h */, - ); - name = src; - sourceTree = ""; - }; - BB4B014C10F69532006C3DED /* addons */ = { - isa = PBXGroup; - children = ( - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */, - ); - name = addons; - sourceTree = ""; - }; - BBAB23C913894ECA00AA2426 /* system frameworks */ = { - isa = PBXGroup; - children = ( - E7F985F515E0DE99003869B5 /* Accelerate.framework */, - E4C2424410CC5A17004149E2 /* AppKit.framework */, - E4C2424510CC5A17004149E2 /* Cocoa.framework */, - E4C2424610CC5A17004149E2 /* IOKit.framework */, - E45BE9710E8CC7DD009D7055 /* AGL.framework */, - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */, - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */, - E45BE9740E8CC7DD009D7055 /* Carbon.framework */, - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */, - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */, - E45BE9770E8CC7DD009D7055 /* CoreServices.framework */, - E45BE9790E8CC7DD009D7055 /* OpenGL.framework */, - E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */, - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */, - E7E077E715D3B6510020DFD4 /* QTKit.framework */, - ); - name = "system frameworks"; - sourceTree = ""; - }; - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23BE13894E4700AA2426 /* GLUT.framework */, - ); - name = "3rd party frameworks"; - sourceTree = ""; - }; - E4328144138ABC890047C5CB /* Products */ = { - isa = PBXGroup; - children = ( - E4328148138ABC890047C5CB /* openFrameworksDebug.a */, - ); - name = Products; - sourceTree = ""; - }; - E45BE5980E8CC70C009D7055 /* frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */, - BBAB23C913894ECA00AA2426 /* system frameworks */, - ); - name = frameworks; - sourceTree = ""; - }; - E4B69B4A0A3A1720003C02F2 = { - isa = PBXGroup; - children = ( - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, - E4B69E1C0A3A1BDC003C02F2 /* src */, - E4EEC9E9138DF44700A80321 /* openFrameworks */, - BB4B014C10F69532006C3DED /* addons */, - E45BE5980E8CC70C009D7055 /* frameworks */, - E4B69B5B0A3A1756003C02F2 /* threeVerticalDebug.app */, - ); - sourceTree = ""; - }; - E4B69E1C0A3A1BDC003C02F2 /* src */ = { - isa = PBXGroup; - children = ( - E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, - E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */, - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */, - ); - path = src; - sourceTree = SOURCE_ROOT; - }; - E4EEC9E9138DF44700A80321 /* openFrameworks */ = { - isa = PBXGroup; - children = ( - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */, - E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */, - ); - name = openFrameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - E4B69B5A0A3A1756003C02F2 /* threeVertical */ = { - isa = PBXNativeTarget; - buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "threeVertical" */; - buildPhases = ( - E4B69B580A3A1756003C02F2 /* Sources */, - E4B69B590A3A1756003C02F2 /* Frameworks */, - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, - E4C2427710CC5ABF004149E2 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */, - ); - name = threeVertical; - productName = myOFApp; - productReference = E4B69B5B0A3A1756003C02F2 /* threeVerticalDebug.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E4B69B4C0A3A1720003C02F2 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "threeVertical" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = E4B69B4A0A3A1720003C02F2; - productRefGroup = E4B69B4A0A3A1720003C02F2; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = E4328144138ABC890047C5CB /* Products */; - ProjectRef = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - E4B69B5A0A3A1756003C02F2 /* threeVertical */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - E4328148138ABC890047C5CB /* openFrameworksDebug.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = openFrameworksDebug.a; - remoteRef = E4328147138ABC890047C5CB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXShellScriptBuildPhase section */ - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - E4B69B580A3A1756003C02F2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */, - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = openFrameworks; - targetProxy = E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - E4B69B4E0A3A1720003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Debug; - }; - E4B69B4F0A3A1720003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_UNROLL_LOOPS = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Release; - }; - E4B69B600A3A1757003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)Debug"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - E4B69B610A3A1757003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "threeVertical" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B4E0A3A1720003C02F2 /* Debug */, - E4B69B4F0A3A1720003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "threeVertical" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B600A3A1757003C02F2 /* Debug */, - E4B69B610A3A1757003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = E4B69B4C0A3A1720003C02F2 /* Project object */; -} diff --git a/02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Debug.xcscheme b/02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Debug.xcscheme deleted file mode 100644 index 777a290..0000000 --- a/02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Debug.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Release.xcscheme b/02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Release.xcscheme deleted file mode 100644 index 6b4c270..0000000 --- a/02_threeVertical/threeVertical.xcodeproj/xcshareddata/xcschemes/threeVertical Release.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/03_guiControls/03_guiControls.qbs b/03_guiControls/03_guiControls.qbs deleted file mode 100644 index 0fa8af5..0000000 --- a/03_guiControls/03_guiControls.qbs +++ /dev/null @@ -1,74 +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(sourceDirectory) } - - files: [ - 'src/*', - ] - - // This project is using addons.make to include the addons - // since it was imported from old code. To change it to include - // the addons from the qbs file change the following lines to - // the list of used addons in array format. eg: - // - // of.addons: [ - // 'ofxGui', - // 'ofxOpenCv', - // ] - - // 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 - of.frameworks: [] // osx only, additional frameworks to link with the project - of.staticLibraries: [] // static libraries - of.dynamicLibraries: [] // dynamic libraries - - // create a console window when the application start - consoleApplication: false - - // 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" - } - } - - property bool makeOF: true // use makfiles to compile the OF library - // will compile OF only once for all your projects - // otherwise compiled per project with qbs - - property bool precompileOfMain: false // precompile ofMain.h - // faster to recompile when including ofMain.h - // but might use a lot of space per project - - references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] -} diff --git a/04_blendClown/blendClown.sln b/03_guiControls/03_guiControls.sln similarity index 51% rename from 04_blendClown/blendClown.sln rename to 03_guiControls/03_guiControls.sln index 8beb419..8d18537 100644 --- a/04_blendClown/blendClown.sln +++ b/03_guiControls/03_guiControls.sln @@ -1,23 +1,33 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blendClown", "blendClown.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_guiControls", "03_guiControls.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/03_guiControls/guiControls.vcxproj b/03_guiControls/03_guiControls.vcxproj similarity index 50% rename from 03_guiControls/guiControls.vcxproj rename to 03_guiControls/03_guiControls.vcxproj index 8dbdca7..b124a0e 100644 --- a/03_guiControls/guiControls.vcxproj +++ b/03_guiControls/03_guiControls.vcxproj @@ -1,72 +1,134 @@ - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) + $(WindowsTargetPlatformVersion) + {7FD42DF7-442E-479A-BA76-D0022F99702A} - guiControls Win32Proj + 03_guiControls + + Application + Unicode + v141 + + + Application + Unicode + v141 + Application Unicode true + v141 - + Application Unicode + true + v141 - - + + + + + - + + + + + - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - true - bin\ - obj\$(Configuration)\ - false - $(ProjectName)_debug - $(ProjectName) + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + false + + + bin\ + obj\$(Platform)\$(Configuration)\ + false Disabled - true EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxMSAInteractiveObject\src;..\..\..\addons\ofxProjectorBlend\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxSimpleGuiToo\src;..\..\..\addons\ofxSimpleGuiToo\src\Controls + CompileAsCpp + $(IntDir) + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) MultiThreadedDebugDLL - Level3 - EditAndContinue - %(AdditionalIncludeDirectories);..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxMSAInteractiveObject\libs;..\..\..\addons\ofxMSAInteractiveObject\src;..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src;..\..\..\addons\ofxSimpleGuiToo\libs;..\..\..\addons\ofxSimpleGuiToo\src;..\..\..\addons\ofxSimpleGuiToo\src\Controls + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxMSAInteractiveObject\src;..\..\..\addons\ofxProjectorBlend\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxSimpleGuiToo\src;..\..\..\addons\ofxSimpleGuiToo\src\Controls + CompileAsCpp + true + $(IntDir) - $(OutDir)$(TargetName)$(TargetExt) true - $(TargetDir)$(TargetName)_debugInfo.pdb Console false - - MachineX86 %(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -77,10 +139,33 @@ false %(PreprocessorDefinitions) MultiThreadedDLL - Level3 - - %(AdditionalIncludeDirectories);..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxMSAInteractiveObject\libs;..\..\..\addons\ofxMSAInteractiveObject\src;..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src;..\..\..\addons\ofxSimpleGuiToo\libs;..\..\..\addons\ofxSimpleGuiToo\src;..\..\..\addons\ofxSimpleGuiToo\src\Controls + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxMSAInteractiveObject\src;..\..\..\addons\ofxProjectorBlend\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxSimpleGuiToo\src;..\..\..\addons\ofxSimpleGuiToo\src\Controls + CompileAsCpp + true + $(IntDir) + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxMSAInteractiveObject\src;..\..\..\addons\ofxProjectorBlend\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxSimpleGuiToo\src;..\..\..\addons\ofxSimpleGuiToo\src\Controls + CompileAsCpp + $(IntDir) false @@ -89,9 +174,6 @@ true true false - - MachineX86 - Default %(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -99,13 +181,13 @@ - + + + - - @@ -123,12 +205,12 @@ - - - + + + @@ -150,10 +232,21 @@ - + {5837595d-aca9-485c-8e76-729040ce4b0b} + + + /D_DEBUG %(AdditionalOptions) + /D_DEBUG %(AdditionalOptions) + $(OF_ROOT)\libs\openFrameworksCompiled\project\vs + + - + + + + + diff --git a/03_guiControls/Makefile b/03_guiControls/Makefile deleted file mode 100644 index 177e172..0000000 --- a/03_guiControls/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Attempt to load a config.make file. -# If none is found, project defaults in config.project.make will be used. -ifneq ($(wildcard config.make),) - include config.make -endif - -# make sure the the OF_ROOT location is defined -ifndef OF_ROOT - OF_ROOT=$(realpath ../../..) -endif - -# call the project makefile! -include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/03_guiControls/Project.xcconfig b/03_guiControls/Project.xcconfig deleted file mode 100644 index c10b9e5..0000000 --- a/03_guiControls/Project.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED -OF_PATH = ../../.. - -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE -#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" - -OTHER_LDFLAGS = $(OF_CORE_LIBS) -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) diff --git a/03_guiControls/addons.make b/03_guiControls/addons.make index f5f73e4..6349201 100644 --- a/03_guiControls/addons.make +++ b/03_guiControls/addons.make @@ -1,4 +1,4 @@ -ofxXmlSettings ofxMSAInteractiveObject ofxProjectorBlend +ofxXmlSettings ofxSimpleGuiToo diff --git a/03_guiControls/bin/data/_settings.xml b/03_guiControls/bin/data/_settings.xml new file mode 100644 index 0000000..6cfac97 --- /dev/null +++ b/03_guiControls/bin/data/_settings.xml @@ -0,0 +1,50 @@ + + + enabled + 1 + + + Show Blend + 1 + + + numProjectors + 3 + + + projectorWidth + 320 + + + projectorHeight + 240 + + + pixelOverlap + 40 + + + Blend Power 1 + 1.000000000 + + + Gamma 1 + 0.500000000 + + + Luminance 1 + 0.000000000 + + + Blend Power 2 + 1.000000000 + + + Gamma 2 + 0.500000000 + + + Luminance 2 + 0.000000000 + + diff --git a/03_guiControls/guiControls.cbp b/03_guiControls/guiControls.cbp deleted file mode 100644 index 448e833..0000000 --- a/03_guiControls/guiControls.cbp +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - diff --git a/03_guiControls/guiControls.vcxproj.filters b/03_guiControls/guiControls.vcxproj.filters deleted file mode 100644 index 74782da..0000000 --- a/03_guiControls/guiControls.vcxproj.filters +++ /dev/null @@ -1,189 +0,0 @@ - - - - - src - - - src - - - addons\ofxXmlSettings\src - - - addons\ofxXmlSettings\libs - - - addons\ofxXmlSettings\libs - - - addons\ofxXmlSettings\libs - - - addons\ofxMSAInteractiveObject\src - - - addons\ofxProjectorBlend\src - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - - - {d8376475-7454-4a24-b08a-aac121d3ad6f} - - - {71834f65-f3a9-211e-73b8-dc8563776aec} - - - {877f005d-13e6-0592-1d97-f2e39d804d43} - - - {ccb2ac63-49d2-977c-cfe8-aeadb8be6a99} - - - {687714a8-1662-fa1c-261f-50f068335398} - - - {7f7a88a6-f023-28f9-9a1e-c77399743e79} - - - {267164f9-41de-eea9-6f4a-21a9c326ce46} - - - {68872c20-5bba-68f5-de45-7abc2ec361a0} - - - {8850216e-5599-6fbb-57ba-e42512729987} - - - {6669377c-7f58-dd8c-9084-add5f08fd8b8} - - - {051c5743-f956-2496-4cd1-25e4a6305795} - - - {95fa6815-edf3-b8ab-434f-66abd5f181e5} - - - - - src - - - addons\ofxXmlSettings\src - - - addons\ofxXmlSettings\libs - - - addons\ofxMSAInteractiveObject\src - - - addons\ofxProjectorBlend\src - - - addons\ofxProjectorBlend\src - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src\Controls - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - addons\ofxSimpleGuiToo\src - - - diff --git a/03_guiControls/guiControls.vcxproj.user b/03_guiControls/guiControls.vcxproj.user deleted file mode 100644 index 5b4759c..0000000 --- a/03_guiControls/guiControls.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(TargetDir) - WindowsLocalDebugger - - - $(TargetDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/03_guiControls/guiControls.workspace b/03_guiControls/guiControls.workspace deleted file mode 100644 index eafb90b..0000000 --- a/03_guiControls/guiControls.workspace +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/03_guiControls/guiControls.xcodeproj/project.pbxproj b/03_guiControls/guiControls.xcodeproj/project.pbxproj deleted file mode 100644 index 32099b7..0000000 --- a/03_guiControls/guiControls.xcodeproj/project.pbxproj +++ /dev/null @@ -1,795 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 06980ff65ed01afe2bcaad5e92e994fd /* ofxSimpleGuiConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 434f6d1bd9d80bffafa18b0904eb6fbc /* ofxSimpleGuiConfig.cpp */; }; - 1f910dcf02326b0e25059352edd39c0c /* ofxSimpleGuiPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = fd30123cd06421602730f58647372e52 /* ofxSimpleGuiPage.cpp */; }; - 2c776d21a9559288b0f7aed9b1be072d /* ofxSimpleGuiMovieSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8445ea9a5fd9905881cbb8a624e1cf51 /* ofxSimpleGuiMovieSlider.cpp */; }; - 2dd56bbc82953d6ae0a018bfad910b7d /* ofxSimpleGuiComboBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = b8e04ba7dcfb448a2ed1ec25aead7222 /* ofxSimpleGuiComboBox.cpp */; }; - 3317b76ee9202b4c6482d15c4ec6cc7b /* ofxSimpleGuiToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1c56b6200d48da052208be05afd7bde7 /* ofxSimpleGuiToggle.cpp */; }; - 49073c5c875b61f6d54cf6ab8584e712 /* ofxSimpleGuiQuadWarp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39b743be64c2fc3fc8c221637b98639e /* ofxSimpleGuiQuadWarp.cpp */; }; - 495e773e470ff7c742646e77652f964d /* ofxSimpleGuiContent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = cd862afb8eff69d2b30a7293a307d7d7 /* ofxSimpleGuiContent.cpp */; }; - 49890708c36fa822fc58a60b78029bb3 /* ofxSimpleGuiFPSCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3c4855735366aec807a7cf36cd8a0f88 /* ofxSimpleGuiFPSCounter.cpp */; }; - 5a4349e9754d6fa14c0f2a3a1abc30b6 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = fc5da1c87211d4f6377da7199d8c5a1e /* tinyxmlparser.cpp */; }; - 63b57ac5bf4ef088491e0317dbb2ecaa /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50df87d612c5aae17aafa6c02c6bc570 /* ofxXmlSettings.cpp */; }; - 76f1472575bcca088fe3454bc580db3c /* ofxSimpleGuiSlider2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5eaf0a3cb08e81512bb99f6862e34387 /* ofxSimpleGuiSlider2d.cpp */; }; - 7f8d13cd42f89d3284829cf0a5a4cba1 /* ofxSimpleGuiValueControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = f9d0aee8fc68bfd57948548050da23ce /* ofxSimpleGuiValueControl.cpp */; }; - 8ce60c8f4001811d5b27d0f8f82c8148 /* ofxSimpleGuiControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = a5c54a5752a9362986db5b350961b7de /* ofxSimpleGuiControl.cpp */; }; - 933a2227713c720ceff80fd967d0a8ee /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2b40eda85beb63e46785bc299a638898 /* tinyxml.cpp */; }; - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */; }; - 9d44dc88ef9e7991b4a09951e2e4769f /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832bdc407620cdba568b713d2252c43c /* tinyxmlerror.cpp */; }; - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - 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 */; }; - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */; }; - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9740E8CC7DD009D7055 /* Carbon.framework */; }; - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */; }; - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */; }; - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9770E8CC7DD009D7055 /* CoreServices.framework */; }; - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; }; - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; }; - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; }; - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; }; - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; }; - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; }; - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */; }; - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E715D3B6510020DFD4 /* QTKit.framework */; }; - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F985F515E0DE99003869B5 /* Accelerate.framework */; }; - a0b7f6a3ec34b4f84321385da811b467 /* ofxSimpleGuiButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7eb99f95be2d12cc78d7890339c79ead /* ofxSimpleGuiButton.cpp */; }; - c2ed558d391ba9692d3bf70567fb7804 /* ofxSimpleGuiToo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = cd6833700340995a484f6405e32bad9a /* ofxSimpleGuiToo.cpp */; }; - cf142a7d9914b99e6e2870527205bee8 /* ofxSimpleGuiTitle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7a7cbac306f060bbc794c4f031710694 /* ofxSimpleGuiTitle.cpp */; }; - d1395dd979998dcffa40acaccf9ff1f5 /* ofxMSAInteractiveObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ce0949c9f18be455d5e6cd1073edc166 /* ofxMSAInteractiveObject.cpp */; }; - e39bf54c7233c89a5bb421748863e43d /* ofxSimpleGuiColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37be47726868d2acd7e5ce49194a7984 /* ofxSimpleGuiColorPicker.cpp */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - E4328147138ABC890047C5CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E4B27C1510CBEB8E00536013; - remoteInfo = openFrameworks; - }; - E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = E4B27C1410CBEB8E00536013; - remoteInfo = openFrameworks; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - E4C2427710CC5ABF004149E2 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 01dcc0911400f9acf5b65578af4ec8f9 /* ofxXmlSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxXmlSettings.h; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.h; sourceTree = SOURCE_ROOT; }; - 1256c82208d6390d300e7ceaec29faf4 /* ofxSimpleGuiSlider2d.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiSlider2d.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiSlider2d.h; sourceTree = SOURCE_ROOT; }; - 18e50a181a480d21484f3120b98c4672 /* ofxSimpleGuiSliderBase.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiSliderBase.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiSliderBase.h; sourceTree = SOURCE_ROOT; }; - 1c56b6200d48da052208be05afd7bde7 /* ofxSimpleGuiToggle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiToggle.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiToggle.cpp; sourceTree = SOURCE_ROOT; }; - 1dcab31f5077c9c550b1adb37be42a5e /* ofxSimpleGuiFPSCounter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiFPSCounter.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiFPSCounter.h; sourceTree = SOURCE_ROOT; }; - 2b40eda85beb63e46785bc299a638898 /* tinyxml.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tinyxml.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxml.cpp; sourceTree = SOURCE_ROOT; }; - 33067f54b52161835b50408dca636f93 /* ofxSimpleGuiToggle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiToggle.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiToggle.h; sourceTree = SOURCE_ROOT; }; - 37be47726868d2acd7e5ce49194a7984 /* ofxSimpleGuiColorPicker.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiColorPicker.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiColorPicker.cpp; sourceTree = SOURCE_ROOT; }; - 39b743be64c2fc3fc8c221637b98639e /* ofxSimpleGuiQuadWarp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiQuadWarp.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiQuadWarp.cpp; sourceTree = SOURCE_ROOT; }; - 3c4855735366aec807a7cf36cd8a0f88 /* ofxSimpleGuiFPSCounter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiFPSCounter.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiFPSCounter.cpp; sourceTree = SOURCE_ROOT; }; - 3e59c088be3987d34adeba5f4b0a9496 /* ofxSimpleGuiToo.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiToo.h; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiToo.h; sourceTree = SOURCE_ROOT; }; - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxProjectorBlend.h; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.h; sourceTree = SOURCE_ROOT; }; - 434f6d1bd9d80bffafa18b0904eb6fbc /* ofxSimpleGuiConfig.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiConfig.cpp; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiConfig.cpp; sourceTree = SOURCE_ROOT; }; - 4a2c7833e609686e9ecd8a8c7753b7c0 /* ofxMSAInteractiveObject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxMSAInteractiveObject.h; path = ../../../addons/ofxMSAInteractiveObject/src/ofxMSAInteractiveObject.h; sourceTree = SOURCE_ROOT; }; - 4d7c691c68bf261275355f845e3a0c91 /* ofxSimpleGuiPage.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiPage.h; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiPage.h; sourceTree = SOURCE_ROOT; }; - 50df87d612c5aae17aafa6c02c6bc570 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxXmlSettings.cpp; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.cpp; sourceTree = SOURCE_ROOT; }; - 5eaf0a3cb08e81512bb99f6862e34387 /* ofxSimpleGuiSlider2d.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiSlider2d.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiSlider2d.cpp; sourceTree = SOURCE_ROOT; }; - 713d63a8f17bdd3ac3782a70bfd1bdb1 /* ofxSimpleGuiSliderFloat.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiSliderFloat.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiSliderFloat.h; sourceTree = SOURCE_ROOT; }; - 7a7cbac306f060bbc794c4f031710694 /* ofxSimpleGuiTitle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiTitle.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiTitle.cpp; sourceTree = SOURCE_ROOT; }; - 7eb99f95be2d12cc78d7890339c79ead /* ofxSimpleGuiButton.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiButton.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiButton.cpp; sourceTree = SOURCE_ROOT; }; - 7fc468c65dfb96196f7368c4bfad5e1c /* ofxSimpleGuiSliderInt.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiSliderInt.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiSliderInt.h; sourceTree = SOURCE_ROOT; }; - 832bdc407620cdba568b713d2252c43c /* tinyxmlerror.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tinyxmlerror.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxmlerror.cpp; sourceTree = SOURCE_ROOT; }; - 8445ea9a5fd9905881cbb8a624e1cf51 /* ofxSimpleGuiMovieSlider.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiMovieSlider.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiMovieSlider.cpp; sourceTree = SOURCE_ROOT; }; - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxProjectorBlend.cpp; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.cpp; sourceTree = SOURCE_ROOT; }; - 96639232e13926f4d450bb83d34564c0 /* ofxSimpleGuiQuadWarp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiQuadWarp.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiQuadWarp.h; sourceTree = SOURCE_ROOT; }; - 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 = ""; }; - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; - E45BE9740E8CC7DD009D7055 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 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 /* guiControlsDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = guiControlsDebug.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 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; }; - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; }; - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = ""; }; - E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; }; - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; - E7E077E715D3B6510020DFD4 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; - E7F985F515E0DE99003869B5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = ""; }; - a5c54a5752a9362986db5b350961b7de /* ofxSimpleGuiControl.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiControl.cpp; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiControl.cpp; sourceTree = SOURCE_ROOT; }; - af2311980a9c84efaff7c63b196663fe /* ofxSimpleGuiColorPicker.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiColorPicker.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiColorPicker.h; sourceTree = SOURCE_ROOT; }; - b21e7e5f548eea92f368040bb1aa2f69 /* tinyxml.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = tinyxml.h; path = ../../../addons/ofxXmlSettings/libs/tinyxml.h; sourceTree = SOURCE_ROOT; }; - b8e04ba7dcfb448a2ed1ec25aead7222 /* ofxSimpleGuiComboBox.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiComboBox.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiComboBox.cpp; sourceTree = SOURCE_ROOT; }; - b97264ad9e6a64dda626be735fd06ad3 /* ofxSimpleGuiContent.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiContent.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiContent.h; sourceTree = SOURCE_ROOT; }; - c2e7b57f16a4543d3b10dfa094e86148 /* ofxSimpleGuiValueControl.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiValueControl.h; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiValueControl.h; sourceTree = SOURCE_ROOT; }; - cb7efc52119313b196e5e70a4b43ee1b /* ofxSimpleGuiMovieSlider.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiMovieSlider.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiMovieSlider.h; sourceTree = SOURCE_ROOT; }; - cd6833700340995a484f6405e32bad9a /* ofxSimpleGuiToo.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiToo.cpp; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiToo.cpp; sourceTree = SOURCE_ROOT; }; - cd862afb8eff69d2b30a7293a307d7d7 /* ofxSimpleGuiContent.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiContent.cpp; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiContent.cpp; sourceTree = SOURCE_ROOT; }; - ce0949c9f18be455d5e6cd1073edc166 /* ofxMSAInteractiveObject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxMSAInteractiveObject.cpp; path = ../../../addons/ofxMSAInteractiveObject/src/ofxMSAInteractiveObject.cpp; sourceTree = SOURCE_ROOT; }; - cf7d7bb5afc550a463ce3e5ebc7731c9 /* ofxSimpleGuiConfig.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiConfig.h; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiConfig.h; sourceTree = SOURCE_ROOT; }; - d4e33ec0296ea102eb0acd5a739db151 /* ofxSimpleGuiControl.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiControl.h; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiControl.h; sourceTree = SOURCE_ROOT; }; - de165ca92c9f4e06ac1bb897bcae510c /* ofxProjectorBlendShader.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxProjectorBlendShader.h; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlendShader.h; sourceTree = SOURCE_ROOT; }; - e59a73137a942298246969c7507ff70e /* ofxSimpleGuiComboBox.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiComboBox.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiComboBox.h; sourceTree = SOURCE_ROOT; }; - e99f9e2051f21d258f7f1f0012d4fb91 /* ofxSimpleGuiIncludes.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiIncludes.h; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiIncludes.h; sourceTree = SOURCE_ROOT; }; - f00f43571a0306a6b30bccb2a9cd9cbc /* ofxSimpleGuiButton.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiButton.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiButton.h; sourceTree = SOURCE_ROOT; }; - f24fe4c2602f5d007203305c30b686a2 /* ofxSimpleGuiTitle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSimpleGuiTitle.h; path = ../../../addons/ofxSimpleGuiToo/src/Controls/ofxSimpleGuiTitle.h; sourceTree = SOURCE_ROOT; }; - f9d0aee8fc68bfd57948548050da23ce /* ofxSimpleGuiValueControl.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiValueControl.cpp; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiValueControl.cpp; sourceTree = SOURCE_ROOT; }; - fc5da1c87211d4f6377da7199d8c5a1e /* tinyxmlparser.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tinyxmlparser.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxmlparser.cpp; sourceTree = SOURCE_ROOT; }; - fd30123cd06421602730f58647372e52 /* ofxSimpleGuiPage.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSimpleGuiPage.cpp; path = ../../../addons/ofxSimpleGuiToo/src/ofxSimpleGuiPage.cpp; sourceTree = SOURCE_ROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - E4B69B590A3A1756003C02F2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */, - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */, - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */, - E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */, - E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */, - E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */, - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */, - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */, - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */, - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */, - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */, - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */, - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */, - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */, - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */, - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */, - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 082c54a9df8ac3f426d5fff406a9dfc5 /* src */ = { - isa = PBXGroup; - children = ( - ce0949c9f18be455d5e6cd1073edc166 /* ofxMSAInteractiveObject.cpp */, - 4a2c7833e609686e9ecd8a8c7753b7c0 /* ofxMSAInteractiveObject.h */, - ); - name = src; - sourceTree = ""; - }; - 1f4fb5c423662b96adfdcc0badec1cb0 /* ofxXmlSettings */ = { - isa = PBXGroup; - children = ( - 6ecef0d76bc33727823eadffc320c44d /* src */, - 6e54289412d2d94f45a051132369530c /* libs */, - ); - name = ofxXmlSettings; - sourceTree = ""; - }; - 262847ac80ba7f38f6230b84144dac0d /* src */ = { - isa = PBXGroup; - children = ( - 3ffcd8cde089ea259d68f78cef41a435 /* Controls */, - 434f6d1bd9d80bffafa18b0904eb6fbc /* ofxSimpleGuiConfig.cpp */, - cf7d7bb5afc550a463ce3e5ebc7731c9 /* ofxSimpleGuiConfig.h */, - a5c54a5752a9362986db5b350961b7de /* ofxSimpleGuiControl.cpp */, - d4e33ec0296ea102eb0acd5a739db151 /* ofxSimpleGuiControl.h */, - e99f9e2051f21d258f7f1f0012d4fb91 /* ofxSimpleGuiIncludes.h */, - fd30123cd06421602730f58647372e52 /* ofxSimpleGuiPage.cpp */, - 4d7c691c68bf261275355f845e3a0c91 /* ofxSimpleGuiPage.h */, - cd6833700340995a484f6405e32bad9a /* ofxSimpleGuiToo.cpp */, - 3e59c088be3987d34adeba5f4b0a9496 /* ofxSimpleGuiToo.h */, - f9d0aee8fc68bfd57948548050da23ce /* ofxSimpleGuiValueControl.cpp */, - c2e7b57f16a4543d3b10dfa094e86148 /* ofxSimpleGuiValueControl.h */, - ); - name = src; - sourceTree = ""; - }; - 3ffcd8cde089ea259d68f78cef41a435 /* Controls */ = { - isa = PBXGroup; - children = ( - 7eb99f95be2d12cc78d7890339c79ead /* ofxSimpleGuiButton.cpp */, - f00f43571a0306a6b30bccb2a9cd9cbc /* ofxSimpleGuiButton.h */, - 37be47726868d2acd7e5ce49194a7984 /* ofxSimpleGuiColorPicker.cpp */, - af2311980a9c84efaff7c63b196663fe /* ofxSimpleGuiColorPicker.h */, - b8e04ba7dcfb448a2ed1ec25aead7222 /* ofxSimpleGuiComboBox.cpp */, - e59a73137a942298246969c7507ff70e /* ofxSimpleGuiComboBox.h */, - cd862afb8eff69d2b30a7293a307d7d7 /* ofxSimpleGuiContent.cpp */, - b97264ad9e6a64dda626be735fd06ad3 /* ofxSimpleGuiContent.h */, - 3c4855735366aec807a7cf36cd8a0f88 /* ofxSimpleGuiFPSCounter.cpp */, - 1dcab31f5077c9c550b1adb37be42a5e /* ofxSimpleGuiFPSCounter.h */, - 8445ea9a5fd9905881cbb8a624e1cf51 /* ofxSimpleGuiMovieSlider.cpp */, - cb7efc52119313b196e5e70a4b43ee1b /* ofxSimpleGuiMovieSlider.h */, - 39b743be64c2fc3fc8c221637b98639e /* ofxSimpleGuiQuadWarp.cpp */, - 96639232e13926f4d450bb83d34564c0 /* ofxSimpleGuiQuadWarp.h */, - 5eaf0a3cb08e81512bb99f6862e34387 /* ofxSimpleGuiSlider2d.cpp */, - 1256c82208d6390d300e7ceaec29faf4 /* ofxSimpleGuiSlider2d.h */, - 18e50a181a480d21484f3120b98c4672 /* ofxSimpleGuiSliderBase.h */, - 713d63a8f17bdd3ac3782a70bfd1bdb1 /* ofxSimpleGuiSliderFloat.h */, - 7fc468c65dfb96196f7368c4bfad5e1c /* ofxSimpleGuiSliderInt.h */, - 7a7cbac306f060bbc794c4f031710694 /* ofxSimpleGuiTitle.cpp */, - f24fe4c2602f5d007203305c30b686a2 /* ofxSimpleGuiTitle.h */, - 1c56b6200d48da052208be05afd7bde7 /* ofxSimpleGuiToggle.cpp */, - 33067f54b52161835b50408dca636f93 /* ofxSimpleGuiToggle.h */, - ); - name = Controls; - sourceTree = ""; - }; - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */ = { - isa = PBXGroup; - children = ( - 7959a566a37db3c7c7ffaf32a0efe078 /* src */, - ); - name = ofxProjectorBlend; - sourceTree = ""; - }; - 6e54289412d2d94f45a051132369530c /* libs */ = { - isa = PBXGroup; - children = ( - 2b40eda85beb63e46785bc299a638898 /* tinyxml.cpp */, - b21e7e5f548eea92f368040bb1aa2f69 /* tinyxml.h */, - 832bdc407620cdba568b713d2252c43c /* tinyxmlerror.cpp */, - fc5da1c87211d4f6377da7199d8c5a1e /* tinyxmlparser.cpp */, - ); - name = libs; - sourceTree = ""; - }; - 6ecef0d76bc33727823eadffc320c44d /* src */ = { - isa = PBXGroup; - children = ( - 50df87d612c5aae17aafa6c02c6bc570 /* ofxXmlSettings.cpp */, - 01dcc0911400f9acf5b65578af4ec8f9 /* ofxXmlSettings.h */, - ); - name = src; - sourceTree = ""; - }; - 734ac65571adbb395c126c1aeb876186 /* ofxMSAInteractiveObject */ = { - isa = PBXGroup; - children = ( - 082c54a9df8ac3f426d5fff406a9dfc5 /* src */, - ); - name = ofxMSAInteractiveObject; - sourceTree = ""; - }; - 7959a566a37db3c7c7ffaf32a0efe078 /* src */ = { - isa = PBXGroup; - children = ( - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */, - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */, - de165ca92c9f4e06ac1bb897bcae510c /* ofxProjectorBlendShader.h */, - ); - name = src; - sourceTree = ""; - }; - BB4B014C10F69532006C3DED /* addons */ = { - isa = PBXGroup; - children = ( - 1f4fb5c423662b96adfdcc0badec1cb0 /* ofxXmlSettings */, - 734ac65571adbb395c126c1aeb876186 /* ofxMSAInteractiveObject */, - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */, - cfdd139fa301cd9d0914d00f9e1d4fdc /* ofxSimpleGuiToo */, - ); - name = addons; - sourceTree = ""; - }; - BBAB23C913894ECA00AA2426 /* system frameworks */ = { - isa = PBXGroup; - children = ( - E7F985F515E0DE99003869B5 /* Accelerate.framework */, - E4C2424410CC5A17004149E2 /* AppKit.framework */, - E4C2424510CC5A17004149E2 /* Cocoa.framework */, - E4C2424610CC5A17004149E2 /* IOKit.framework */, - E45BE9710E8CC7DD009D7055 /* AGL.framework */, - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */, - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */, - E45BE9740E8CC7DD009D7055 /* Carbon.framework */, - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */, - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */, - E45BE9770E8CC7DD009D7055 /* CoreServices.framework */, - E45BE9790E8CC7DD009D7055 /* OpenGL.framework */, - E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */, - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */, - E7E077E715D3B6510020DFD4 /* QTKit.framework */, - ); - name = "system frameworks"; - sourceTree = ""; - }; - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23BE13894E4700AA2426 /* GLUT.framework */, - ); - name = "3rd party frameworks"; - sourceTree = ""; - }; - E4328144138ABC890047C5CB /* Products */ = { - isa = PBXGroup; - children = ( - E4328148138ABC890047C5CB /* openFrameworksDebug.a */, - ); - name = Products; - sourceTree = ""; - }; - E45BE5980E8CC70C009D7055 /* frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */, - BBAB23C913894ECA00AA2426 /* system frameworks */, - ); - name = frameworks; - sourceTree = ""; - }; - E4B69B4A0A3A1720003C02F2 = { - isa = PBXGroup; - children = ( - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, - E4B69E1C0A3A1BDC003C02F2 /* src */, - E4EEC9E9138DF44700A80321 /* openFrameworks */, - BB4B014C10F69532006C3DED /* addons */, - E45BE5980E8CC70C009D7055 /* frameworks */, - E4B69B5B0A3A1756003C02F2 /* guiControlsDebug.app */, - ); - sourceTree = ""; - }; - E4B69E1C0A3A1BDC003C02F2 /* src */ = { - isa = PBXGroup; - children = ( - E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, - E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */, - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */, - ); - path = src; - sourceTree = SOURCE_ROOT; - }; - E4EEC9E9138DF44700A80321 /* openFrameworks */ = { - isa = PBXGroup; - children = ( - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */, - E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */, - ); - name = openFrameworks; - sourceTree = ""; - }; - cfdd139fa301cd9d0914d00f9e1d4fdc /* ofxSimpleGuiToo */ = { - isa = PBXGroup; - children = ( - 262847ac80ba7f38f6230b84144dac0d /* src */, - ); - name = ofxSimpleGuiToo; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - E4B69B5A0A3A1756003C02F2 /* guiControls */ = { - isa = PBXNativeTarget; - buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "guiControls" */; - buildPhases = ( - E4B69B580A3A1756003C02F2 /* Sources */, - E4B69B590A3A1756003C02F2 /* Frameworks */, - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, - E4C2427710CC5ABF004149E2 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */, - ); - name = guiControls; - productName = myOFApp; - productReference = E4B69B5B0A3A1756003C02F2 /* guiControlsDebug.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E4B69B4C0A3A1720003C02F2 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "guiControls" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = E4B69B4A0A3A1720003C02F2; - productRefGroup = E4B69B4A0A3A1720003C02F2; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = E4328144138ABC890047C5CB /* Products */; - ProjectRef = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - E4B69B5A0A3A1756003C02F2 /* guiControls */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - E4328148138ABC890047C5CB /* openFrameworksDebug.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = openFrameworksDebug.a; - remoteRef = E4328147138ABC890047C5CB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXShellScriptBuildPhase section */ - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - E4B69B580A3A1756003C02F2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */, - 63b57ac5bf4ef088491e0317dbb2ecaa /* ofxXmlSettings.cpp in Sources */, - 933a2227713c720ceff80fd967d0a8ee /* tinyxml.cpp in Sources */, - 9d44dc88ef9e7991b4a09951e2e4769f /* tinyxmlerror.cpp in Sources */, - 5a4349e9754d6fa14c0f2a3a1abc30b6 /* tinyxmlparser.cpp in Sources */, - d1395dd979998dcffa40acaccf9ff1f5 /* ofxMSAInteractiveObject.cpp in Sources */, - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */, - a0b7f6a3ec34b4f84321385da811b467 /* ofxSimpleGuiButton.cpp in Sources */, - e39bf54c7233c89a5bb421748863e43d /* ofxSimpleGuiColorPicker.cpp in Sources */, - 2dd56bbc82953d6ae0a018bfad910b7d /* ofxSimpleGuiComboBox.cpp in Sources */, - 495e773e470ff7c742646e77652f964d /* ofxSimpleGuiContent.cpp in Sources */, - 49890708c36fa822fc58a60b78029bb3 /* ofxSimpleGuiFPSCounter.cpp in Sources */, - 2c776d21a9559288b0f7aed9b1be072d /* ofxSimpleGuiMovieSlider.cpp in Sources */, - 49073c5c875b61f6d54cf6ab8584e712 /* ofxSimpleGuiQuadWarp.cpp in Sources */, - 76f1472575bcca088fe3454bc580db3c /* ofxSimpleGuiSlider2d.cpp in Sources */, - cf142a7d9914b99e6e2870527205bee8 /* ofxSimpleGuiTitle.cpp in Sources */, - 3317b76ee9202b4c6482d15c4ec6cc7b /* ofxSimpleGuiToggle.cpp in Sources */, - 06980ff65ed01afe2bcaad5e92e994fd /* ofxSimpleGuiConfig.cpp in Sources */, - 8ce60c8f4001811d5b27d0f8f82c8148 /* ofxSimpleGuiControl.cpp in Sources */, - 1f910dcf02326b0e25059352edd39c0c /* ofxSimpleGuiPage.cpp in Sources */, - c2ed558d391ba9692d3bf70567fb7804 /* ofxSimpleGuiToo.cpp in Sources */, - 7f8d13cd42f89d3284829cf0a5a4cba1 /* ofxSimpleGuiValueControl.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = openFrameworks; - targetProxy = E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - E4B69B4E0A3A1720003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxMSAInteractiveObject/libs, - ../../../addons/ofxMSAInteractiveObject/src, - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ../../../addons/ofxSimpleGuiToo/libs, - ../../../addons/ofxSimpleGuiToo/src, - ../../../addons/ofxSimpleGuiToo/src/Controls, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Debug; - }; - E4B69B4F0A3A1720003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_UNROLL_LOOPS = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxXmlSettings/libs, - ../../../addons/ofxXmlSettings/src, - ../../../addons/ofxMSAInteractiveObject/libs, - ../../../addons/ofxMSAInteractiveObject/src, - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ../../../addons/ofxSimpleGuiToo/libs, - ../../../addons/ofxSimpleGuiToo/src, - ../../../addons/ofxSimpleGuiToo/src/Controls, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Release; - }; - E4B69B600A3A1757003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)Debug"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - E4B69B610A3A1757003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "guiControls" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B4E0A3A1720003C02F2 /* Debug */, - E4B69B4F0A3A1720003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "guiControls" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B600A3A1757003C02F2 /* Debug */, - E4B69B610A3A1757003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = E4B69B4C0A3A1720003C02F2 /* Project object */; -} diff --git a/03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Debug.xcscheme b/03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Debug.xcscheme deleted file mode 100644 index 1bcd7f2..0000000 --- a/03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Debug.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Release.xcscheme b/03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Release.xcscheme deleted file mode 100644 index 7c4b0cb..0000000 --- a/03_guiControls/guiControls.xcodeproj/xcshareddata/xcschemes/guiControls Release.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/03_guiControls/openFrameworks-Info.plist b/03_guiControls/openFrameworks-Info.plist deleted file mode 100644 index e5db555..0000000 --- a/03_guiControls/openFrameworks-Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.yourcompany.openFrameworks - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - diff --git a/03_guiControls/src/main.cpp b/03_guiControls/src/main.cpp index 6e80fa3..e2874ab 100644 --- a/03_guiControls/src/main.cpp +++ b/03_guiControls/src/main.cpp @@ -1,6 +1,5 @@ #include "ofMain.h" -#include "testApp.h" -#include "ofAppGlutWindow.h" +#include "ofApp.h" //======================================================================== int main( ){ diff --git a/03_guiControls/src/testApp.cpp b/03_guiControls/src/ofApp.cpp similarity index 99% rename from 03_guiControls/src/testApp.cpp rename to 03_guiControls/src/ofApp.cpp index f0c1905..f5ecd11 100644 --- a/03_guiControls/src/testApp.cpp +++ b/03_guiControls/src/ofApp.cpp @@ -1,4 +1,4 @@ -#include "testApp.h" +#include "ofApp.h" //-------------------------------------------------------------- void testApp::setup(){ diff --git a/03_guiControls/src/testApp.h b/03_guiControls/src/ofApp.h similarity index 100% rename from 03_guiControls/src/testApp.h rename to 03_guiControls/src/ofApp.h diff --git a/04_blendClown/04_blendClown.qbs b/04_blendClown/04_blendClown.qbs deleted file mode 100644 index 0fa8af5..0000000 --- a/04_blendClown/04_blendClown.qbs +++ /dev/null @@ -1,74 +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(sourceDirectory) } - - files: [ - 'src/*', - ] - - // This project is using addons.make to include the addons - // since it was imported from old code. To change it to include - // the addons from the qbs file change the following lines to - // the list of used addons in array format. eg: - // - // of.addons: [ - // 'ofxGui', - // 'ofxOpenCv', - // ] - - // 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 - of.frameworks: [] // osx only, additional frameworks to link with the project - of.staticLibraries: [] // static libraries - of.dynamicLibraries: [] // dynamic libraries - - // create a console window when the application start - consoleApplication: false - - // 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" - } - } - - property bool makeOF: true // use makfiles to compile the OF library - // will compile OF only once for all your projects - // otherwise compiled per project with qbs - - property bool precompileOfMain: false // precompile ofMain.h - // faster to recompile when including ofMain.h - // but might use a lot of space per project - - references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")] -} diff --git a/03_guiControls/guiControls.sln b/04_blendClown/04_blendClown.sln similarity index 51% rename from 03_guiControls/guiControls.sln rename to 04_blendClown/04_blendClown.sln index 4079420..55748e1 100644 --- a/03_guiControls/guiControls.sln +++ b/04_blendClown/04_blendClown.sln @@ -1,23 +1,33 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guiControls", "guiControls.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_blendClown", "04_blendClown.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32 {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32 {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/04_blendClown/04_blendClown.vcxproj b/04_blendClown/04_blendClown.vcxproj new file mode 100644 index 0000000..2475293 --- /dev/null +++ b/04_blendClown/04_blendClown.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) + $(WindowsTargetPlatformVersion) + + + {7FD42DF7-442E-479A-BA76-D0022F99702A} + Win32Proj + 04_blendClown + + + + Application + Unicode + v141 + + + Application + Unicode + v141 + + + Application + Unicode + true + v141 + + + Application + Unicode + true + v141 + + + + + + + + + + + + + + + + + + + + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Platform)\$(Configuration)\ + false + + + bin\ + obj\$(Platform)\$(Configuration)\ + false + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + $(IntDir) + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + true + $(IntDir) + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + true + $(IntDir) + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxProjectorBlend\src + CompileAsCpp + $(IntDir) + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + {5837595d-aca9-485c-8e76-729040ce4b0b} + + + + + /D_DEBUG %(AdditionalOptions) + /D_DEBUG %(AdditionalOptions) + $(OF_ROOT)\libs\openFrameworksCompiled\project\vs + + + + + + + + + \ No newline at end of file diff --git a/04_blendClown/Makefile b/04_blendClown/Makefile deleted file mode 100644 index 177e172..0000000 --- a/04_blendClown/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Attempt to load a config.make file. -# If none is found, project defaults in config.project.make will be used. -ifneq ($(wildcard config.make),) - include config.make -endif - -# make sure the the OF_ROOT location is defined -ifndef OF_ROOT - OF_ROOT=$(realpath ../../..) -endif - -# call the project makefile! -include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/04_blendClown/Project.xcconfig b/04_blendClown/Project.xcconfig deleted file mode 100644 index c10b9e5..0000000 --- a/04_blendClown/Project.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED -OF_PATH = ../../.. - -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE -#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" - -OTHER_LDFLAGS = $(OF_CORE_LIBS) -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) diff --git a/04_blendClown/blendClown.cbp b/04_blendClown/blendClown.cbp deleted file mode 100644 index c0f00ae..0000000 --- a/04_blendClown/blendClown.cbp +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - diff --git a/04_blendClown/blendClown.vcxproj b/04_blendClown/blendClown.vcxproj deleted file mode 100644 index 25c9f66..0000000 --- a/04_blendClown/blendClown.vcxproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7FD42DF7-442E-479A-BA76-D0022F99702A} - blendClown - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - true - bin\ - obj\$(Configuration)\ - false - $(ProjectName)_debug - $(ProjectName) - - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - %(AdditionalIncludeDirectories);..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src - - - $(OutDir)$(TargetName)$(TargetExt) - true - $(TargetDir)$(TargetName)_debugInfo.pdb - Console - false - - MachineX86 - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - false - %(PreprocessorDefinitions) - MultiThreadedDLL - - Level3 - - %(AdditionalIncludeDirectories);..\..\..\addons\ofxProjectorBlend\libs;..\..\..\addons\ofxProjectorBlend\src - - - false - false - Console - true - true - false - - MachineX86 - Default - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - {5837595d-aca9-485c-8e76-729040ce4b0b} - - - - - diff --git a/04_blendClown/blendClown.vcxproj.filters b/04_blendClown/blendClown.vcxproj.filters deleted file mode 100644 index b7775e9..0000000 --- a/04_blendClown/blendClown.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - src - - - src - - - addons\ofxProjectorBlend\src - - - - - {d8376475-7454-4a24-b08a-aac121d3ad6f} - - - {71834f65-f3a9-211e-73b8-dc8563776aec} - - - {68872c20-5bba-68f5-de45-7abc2ec361a0} - - - {8850216e-5599-6fbb-57ba-e42512729987} - - - - - src - - - addons\ofxProjectorBlend\src - - - addons\ofxProjectorBlend\src - - - diff --git a/04_blendClown/blendClown.vcxproj.user b/04_blendClown/blendClown.vcxproj.user deleted file mode 100644 index 5b4759c..0000000 --- a/04_blendClown/blendClown.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(TargetDir) - WindowsLocalDebugger - - - $(TargetDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/04_blendClown/blendClown.workspace b/04_blendClown/blendClown.workspace deleted file mode 100644 index 37c0879..0000000 --- a/04_blendClown/blendClown.workspace +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/04_blendClown/blendClown.xcodeproj/project.pbxproj b/04_blendClown/blendClown.xcodeproj/project.pbxproj deleted file mode 100644 index 2bbf6d3..0000000 --- a/04_blendClown/blendClown.xcodeproj/project.pbxproj +++ /dev/null @@ -1,593 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */; }; - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - 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 */; }; - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */; }; - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9740E8CC7DD009D7055 /* Carbon.framework */; }; - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */; }; - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */; }; - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9770E8CC7DD009D7055 /* CoreServices.framework */; }; - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; }; - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; }; - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; }; - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; }; - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; }; - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; }; - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */; }; - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E715D3B6510020DFD4 /* QTKit.framework */; }; - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F985F515E0DE99003869B5 /* Accelerate.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - E4328147138ABC890047C5CB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E4B27C1510CBEB8E00536013; - remoteInfo = openFrameworks; - }; - E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = E4B27C1410CBEB8E00536013; - remoteInfo = openFrameworks; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - E4C2427710CC5ABF004149E2 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxProjectorBlend.h; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.h; sourceTree = SOURCE_ROOT; }; - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxProjectorBlend.cpp; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlend.cpp; sourceTree = SOURCE_ROOT; }; - 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 = ""; }; - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; - E45BE9740E8CC7DD009D7055 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 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 /* blendClownDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = blendClownDebug.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 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; }; - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; }; - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = ""; }; - E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; }; - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; - E7E077E715D3B6510020DFD4 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; - E7F985F515E0DE99003869B5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = ""; }; - de165ca92c9f4e06ac1bb897bcae510c /* ofxProjectorBlendShader.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxProjectorBlendShader.h; path = ../../../addons/ofxProjectorBlend/src/ofxProjectorBlendShader.h; sourceTree = SOURCE_ROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - E4B69B590A3A1756003C02F2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */, - E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */, - E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */, - E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */, - E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */, - E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */, - E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */, - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */, - E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */, - E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */, - E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */, - E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */, - E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */, - E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */, - E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */, - E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */, - E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */ = { - isa = PBXGroup; - children = ( - 7959a566a37db3c7c7ffaf32a0efe078 /* src */, - ); - name = ofxProjectorBlend; - sourceTree = ""; - }; - 7959a566a37db3c7c7ffaf32a0efe078 /* src */ = { - isa = PBXGroup; - children = ( - 9471c904ee31a6fe40f5a0d52a0799c0 /* ofxProjectorBlend.cpp */, - 403194879fbc539310181fa55b8c246c /* ofxProjectorBlend.h */, - de165ca92c9f4e06ac1bb897bcae510c /* ofxProjectorBlendShader.h */, - ); - name = src; - sourceTree = ""; - }; - BB4B014C10F69532006C3DED /* addons */ = { - isa = PBXGroup; - children = ( - 59da350bbb36a982b18d6d2a3fb422e5 /* ofxProjectorBlend */, - ); - name = addons; - sourceTree = ""; - }; - BBAB23C913894ECA00AA2426 /* system frameworks */ = { - isa = PBXGroup; - children = ( - E7F985F515E0DE99003869B5 /* Accelerate.framework */, - E4C2424410CC5A17004149E2 /* AppKit.framework */, - E4C2424510CC5A17004149E2 /* Cocoa.framework */, - E4C2424610CC5A17004149E2 /* IOKit.framework */, - E45BE9710E8CC7DD009D7055 /* AGL.framework */, - E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */, - E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */, - E45BE9740E8CC7DD009D7055 /* Carbon.framework */, - E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */, - E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */, - E45BE9770E8CC7DD009D7055 /* CoreServices.framework */, - E45BE9790E8CC7DD009D7055 /* OpenGL.framework */, - E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */, - E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */, - E7E077E715D3B6510020DFD4 /* QTKit.framework */, - ); - name = "system frameworks"; - sourceTree = ""; - }; - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23BE13894E4700AA2426 /* GLUT.framework */, - ); - name = "3rd party frameworks"; - sourceTree = ""; - }; - E4328144138ABC890047C5CB /* Products */ = { - isa = PBXGroup; - children = ( - E4328148138ABC890047C5CB /* openFrameworksDebug.a */, - ); - name = Products; - sourceTree = ""; - }; - E45BE5980E8CC70C009D7055 /* frameworks */ = { - isa = PBXGroup; - children = ( - BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */, - BBAB23C913894ECA00AA2426 /* system frameworks */, - ); - name = frameworks; - sourceTree = ""; - }; - E4B69B4A0A3A1720003C02F2 = { - isa = PBXGroup; - children = ( - E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */, - E4EB6923138AFD0F00A09F29 /* Project.xcconfig */, - E4B69E1C0A3A1BDC003C02F2 /* src */, - E4EEC9E9138DF44700A80321 /* openFrameworks */, - BB4B014C10F69532006C3DED /* addons */, - E45BE5980E8CC70C009D7055 /* frameworks */, - E4B69B5B0A3A1756003C02F2 /* blendClownDebug.app */, - ); - sourceTree = ""; - }; - E4B69E1C0A3A1BDC003C02F2 /* src */ = { - isa = PBXGroup; - children = ( - E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, - E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */, - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */, - ); - path = src; - sourceTree = SOURCE_ROOT; - }; - E4EEC9E9138DF44700A80321 /* openFrameworks */ = { - isa = PBXGroup; - children = ( - E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */, - E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */, - ); - name = openFrameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - E4B69B5A0A3A1756003C02F2 /* blendClown */ = { - isa = PBXNativeTarget; - buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "blendClown" */; - buildPhases = ( - E4B69B580A3A1756003C02F2 /* Sources */, - E4B69B590A3A1756003C02F2 /* Frameworks */, - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, - E4C2427710CC5ABF004149E2 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */, - ); - name = blendClown; - productName = myOFApp; - productReference = E4B69B5B0A3A1756003C02F2 /* blendClownDebug.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E4B69B4C0A3A1720003C02F2 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "blendClown" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = E4B69B4A0A3A1720003C02F2; - productRefGroup = E4B69B4A0A3A1720003C02F2; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = E4328144138ABC890047C5CB /* Products */; - ProjectRef = E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - E4B69B5A0A3A1756003C02F2 /* blendClown */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - E4328148138ABC890047C5CB /* openFrameworksDebug.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = openFrameworksDebug.a; - remoteRef = E4328147138ABC890047C5CB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXShellScriptBuildPhase section */ - E4B6FFFD0C3F9AB9008CF71C /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - E4B69B580A3A1756003C02F2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */, - 95e7ef0d58b6654ee78aa86474800394 /* ofxProjectorBlend.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - E4EEB9AC138B136A00A80321 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = openFrameworks; - targetProxy = E4EEB9AB138B136A00A80321 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - E4B69B4E0A3A1720003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Debug; - }; - E4B69B4F0A3A1720003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; - buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_UNROLL_LOOPS = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_UNINITIALIZED_AUTOS = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - HEADER_SEARCH_PATHS = ( - "$(OF_CORE_HEADERS)", - ../../../addons/ofxProjectorBlend/libs, - ../../../addons/ofxProjectorBlend/src, - ); - OTHER_CPLUSPLUSFLAGS = ( - "-D__MACOSX_CORE__", - "-lpthread", - "-mtune=native", - ); - SDKROOT = macosx; - }; - name = Release; - }; - E4B69B600A3A1757003C02F2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)Debug"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - E4B69B610A3A1757003C02F2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = NONE; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - INFOPLIST_FILE = "openFrameworks-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - ); - PREBINDING = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "blendClown" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B4E0A3A1720003C02F2 /* Debug */, - E4B69B4F0A3A1720003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "blendClown" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E4B69B600A3A1757003C02F2 /* Debug */, - E4B69B610A3A1757003C02F2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = E4B69B4C0A3A1720003C02F2 /* Project object */; -} diff --git a/04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Debug.xcscheme b/04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Debug.xcscheme deleted file mode 100644 index 068afee..0000000 --- a/04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Debug.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Release.xcscheme b/04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Release.xcscheme deleted file mode 100644 index d214708..0000000 --- a/04_blendClown/blendClown.xcodeproj/xcshareddata/xcschemes/blendClown Release.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/04_blendClown/openFrameworks-Info.plist b/04_blendClown/openFrameworks-Info.plist deleted file mode 100644 index e5db555..0000000 --- a/04_blendClown/openFrameworks-Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.yourcompany.openFrameworks - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - diff --git a/04_blendClown/src/main.cpp b/04_blendClown/src/main.cpp index 09eeb85..8a06b9a 100644 --- a/04_blendClown/src/main.cpp +++ b/04_blendClown/src/main.cpp @@ -1,6 +1,5 @@ #include "ofMain.h" -#include "testApp.h" -#include "ofAppGlutWindow.h" +#include "ofApp.h" //======================================================================== int main( ){ diff --git a/04_blendClown/src/testApp.cpp b/04_blendClown/src/ofApp.cpp similarity index 99% rename from 04_blendClown/src/testApp.cpp rename to 04_blendClown/src/ofApp.cpp index d0f2254..7c81840 100644 --- a/04_blendClown/src/testApp.cpp +++ b/04_blendClown/src/ofApp.cpp @@ -1,4 +1,4 @@ -#include "testApp.h" +#include "ofApp.h" //-------------------------------------------------------------- void testApp::setup(){ diff --git a/04_blendClown/src/testApp.h b/04_blendClown/src/ofApp.h similarity index 100% rename from 04_blendClown/src/testApp.h rename to 04_blendClown/src/ofApp.h