diff options
| author | Comment <tim@gray.(none)> | 2012-12-08 10:55:47 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2012-12-08 10:55:47 +0000 |
| commit | 3dbac595be9c2d5e57a62576eb05ec264b994e07 (patch) | |
| tree | f092aaffc35449a1998e77a8126497a4da97b295 | |
| parent | 11850d1ded455e135cfa42aa1598b89be9544807 (diff) | |
reawakening project
| -rwxr-xr-x[-rw-r--r--] | Makefile | 466 | ||||
| -rw-r--r-- | bin/data/settings.strongbow | 33 | ||||
| -rw-r--r-- | bin/data/settings.xml | 45 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/libs/libfmodex.so | bin | 1381296 -> 1338632 bytes | |||
| -rw-r--r-- | bin/libs/libfmodexp.so | bin | 584676 -> 0 bytes | |||
| -rw-r--r-- | config.make | 6 | ||||
| -rw-r--r-- | map4.cbp | 754 | ||||
| -rw-r--r-- | map4.layout | 29 | ||||
| -rw-r--r-- | map4.workspace | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/testApp.cpp | 35 | ||||
| -rw-r--r-- | src/testApp.h | 8 | ||||
| -rw-r--r-- | src/viewpoint.cpp | 12 | ||||
| -rw-r--r-- | src/viewpoint.h | 6 |
14 files changed, 750 insertions, 648 deletions
@@ -1,466 +1,2 @@ -# openFrameworks universal makefile -# -# make help : shows this message -# make Debug: makes the application with debug symbols -# make Release: makes the app with optimizations -# make: the same as make Release -# make CleanDebug: cleans the Debug target -# make CleanRelease: cleans the Release target -# make clean: cleans everything -# -# -# this should work with any OF app, just copy any example -# change the name of the folder and it should compile -# only .cpp support, don't use .c files -# it will look for files in any folder inside the application -# folder except that in the EXCLUDE_FROM_SOURCE variable -# it doesn't autodetect include paths yet -# add the include paths in the USER_CFLAGS variable -# using the gcc syntax: -Ipath -# -# to add addons to your application, edit the addons.make file -# in this directory and add the names of the addons you want to -# include -# -# edit the following vars to customize the makefile - include config.make - -ifeq ($(findstring Android,$(MAKECMDGOALS)),Android) - include $(OF_ROOT)/libs/openFrameworksCompiled/project/android/paths.make - ARCH = android - ifeq ($(shell uname),Darwin) - HOST_PLATFORM = darwin-x86 - else - HOST_PLATFORM = linux-x86 - endif -endif - -ifeq ($(ARCH),android) - COMPILER_OPTIMIZATION = $(ANDROID_COMPILER_OPTIMIZATION) - NDK_PLATFORM = android-8 -else - COMPILER_OPTIMIZATION = $(USER_COMPILER_OPTIMIZATION) -endif - - - - -# you shouldn't modify anything below this line - - -SHELL = /bin/sh -ifneq ($(ARCH),android) - CXX = g++ - ARCH = $(shell uname -m) - ifeq ($(ARCH),x86_64) - LIBSPATH=linux64 - else - LIBSPATH=linux - endif -else - ifeq ($(findstring Release_arm7,$(MAKECMDGOALS)),Release_arm7) - LIBSPATH =android/armeabi-v7a - else - LIBSPATH =android/armeabi - endif - #NDK_ROOT = $(shell cat $(OF_ROOT)/libs/openFrameworksCompiled/project/android/ndk_path.make) - #SDK_ROOT = $(shell cat $(OF_ROOT)/libs/openFrameworksCompiled/project/android/sdk_path.make) - TOOLCHAIN=arm-linux-androideabi-4.4.3 - TOOLCHAIN_PATH=$(NDK_ROOT)/toolchains/$(TOOLCHAIN)/prebuilt/$(HOST_PLATFORM)/bin/ - ANDROID_PREFIX=arm-linux-androideabi- - CC=$(NDK_ROOT)/toolchains/$(TOOLCHAIN)/prebuilt/$(HOST_PLATFORM)/bin/$(ANDROID_PREFIX)gcc - CXX=$(NDK_ROOT)/toolchains/$(TOOLCHAIN)/prebuilt/$(HOST_PLATFORM)/bin/$(ANDROID_PREFIX)g++ - AR=$(NDK_ROOT)/toolchains/$(TOOLCHAIN)/prebuilt/$(HOST_PLATFORM)/bin/$(ANDROID_PREFIX)ar - SYSROOT=$(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/ - CFLAGS += -nostdlib --sysroot=$(SYSROOT) -fno-short-enums - CFLAGS += -I"$(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/usr/include" -I"$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/include/" -I"$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include" - CFLAGS += -DANDROID -endif - -NODEPS = clean -SED_EXCLUDE_FROM_SRC = $(shell echo $(EXCLUDE_FROM_SOURCE) | sed s/\,/\\\\\|/g) -SOURCE_DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d | grep -v $(SED_EXCLUDE_FROM_SRC) | sed s/.\\///) -SOURCES = $(shell find $(SOURCE_DIRS) -name "*.cpp" -or -name "*.c" -or -name "*.cc") -OBJFILES = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(SOURCES)))) - -ifneq (,$(USER_SOURCE_DIR)) - USER_SOURCES = $(shell find $(USER_SOURCE_DIR) -name "*.cpp" -or -name "*.c" -or -name "*.cc") - USER_OBJFILES = $(subst $(USER_SOURCE_DIR)/, ,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(USER_SOURCES))))) -endif - -APPNAME = $(shell basename `pwd`) -CORE_INCLUDES = $(shell find $(OF_ROOT)/libs/openFrameworks/ -type d) -CORE_INCLUDE_FLAGS = $(addprefix -I,$(CORE_INCLUDES)) -INCLUDES = $(shell find $(OF_ROOT)/libs/*/include -type d | grep -v glu | grep -v quicktime | grep -v poco) -INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES)) -INCLUDES_FLAGS += -I$(OF_ROOT)/libs/poco/include -ifeq ($(ARCH),android) - INCLUDES_FLAGS += -I$(OF_ROOT)/libs/glu/include_android -else - INCLUDES_FLAGS += -I$(OF_ROOT)/libs/glu/include - INCLUDES_FLAGS += $(shell pkg-config glew gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 libudev --cflags) - #check if gtk exists and add it - GTK = $(shell pkg-config gtk+-2.0 --exists; echo $$?) - ifeq ($(GTK),0) - CFLAGS += $(shell pkg-config gtk+-2.0 --cflags) -DOF_USING_GTK - SYSTEMLIBS += $(shell pkg-config gtk+-2.0 --libs) - endif - - #check if mpg123 exists and add it - MPG123 = $(shell pkg-config libmpg123 --exists; echo $$?) - ifeq ($(MPG123),0) - CFLAGS += -DOF_USING_MPG123 - SYSTEMLIBS += -lmpg123 - endif -endif -LIB_STATIC = $(shell ls $(OF_ROOT)/libs/*/lib/$(LIBSPATH)/*.a 2> /dev/null | grep -v openFrameworksCompiled | grep -v Poco) -LIB_SHARED = $(shell ls $(OF_ROOT)/libs/*/lib/$(LIBSPATH)/*.so 2> /dev/null | grep -v openFrameworksCompiled | sed "s/.*\\/lib\([^/]*\)\.so/-l\1/") -LIB_STATIC += $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoNet.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoXML.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoUtil.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoFoundation.a -LIB_PATHS_FLAGS = $(shell ls -d $(OF_ROOT)/libs/*/lib/$(LIBSPATH) | sed "s/\(\.*\)/-L\1/") - -CFLAGS += -Wall -fexceptions -CFLAGS += -I. -CFLAGS += $(INCLUDES_FLAGS) -CFLAGS += $(CORE_INCLUDE_FLAGS) - - - -ifeq ($(ARCH),android) - LDFLAGS = --sysroot=$(SYSROOT) -nostdlib -L"$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/libs/armeabi" - SYSTEMLIBS += -lstdc++ -lsupc++ -lgcc -lz -lGLESv1_CM -llog -ldl -lm -lc -else - LDFLAGS = -Wl,-rpath=./libs - SYSTEMLIBS += $(shell pkg-config jack glew gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 gstreamer-app-0.10 libudev --libs) - SYSTEMLIBS += -lglut -lGL -lasound -lopenal -lsndfile -lvorbis -lFLAC -logg -lfreeimage -endif - - -ifeq ($(findstring addons.make,$(wildcard *.make)),addons.make) - ifneq ($(ARCH),android) - ADDONS = $(shell cat addons.make | grep -v ofxAndroid) - else - ADDONS = $(shell cat addons.make) - endif - - ifneq ($(strip $(ADDONS)),) - ADDONS_REL_DIRS = $(addsuffix /src, $(ADDONS)) - ADDONS_LIBS_REL_DIRS = $(addsuffix /libs, $(ADDONS)) - ADDONS_DIRS = $(addprefix $(OF_ROOT)/addons/, $(ADDONS_REL_DIRS) ) - ADDONS_LIBS_DIRS = $(addprefix $(OF_ROOT)/addons/, $(ADDONS_LIBS_REL_DIRS) ) - ADDONS_BIN_LIBS_DIRS = $(addsuffix /*/lib/$(LIBSPATH), $(ADDONS_LIBS_DIRS) ) - - ADDONS_INCLUDES = $(ADDONS_DIRS) - ADDONS_INCLUDES = $(ADDONS_LIBS_DIRS) - ADDONS_INCLUDES += $(shell find $(ADDONS_DIRS) -type d 2> /dev/null) - ADDONS_INCLUDES += $(shell find $(ADDONS_LIBS_DIRS) -type d 2> /dev/null) - ADDONSCFLAGS = $(addprefix -I,$(ADDONS_INCLUDES)) - - ifeq ($(findstring libsorder.make,$(shell find $(ADDONS_BIN_LIBS_DIRS) -name libsorder.make 2> /dev/null)),libsorder.make) - ADDONS_LIBS_W_ORDER = $(shell cat $(shell find $(ADDONS_BIN_LIBS_DIRS) -name libsorder.make 2> /dev/null)) - EXCLUDE_LIBS_FILTER = $(addprefix %,$(addsuffix .a,$(ADDONS_LIBS_W_ORDER))) - ADDONS_LIBS_STATICS = $(filter-out $(EXCLUDE_LIBS_FILTER), $(shell find $(ADDONS_BIN_LIBS_DIRS) -name *.a)) - ADDONS_LIBS_STATICS += $(addprefix -l, $(ADDONS_LIBS_W_ORDER)) - ADDONS_LIBS_STATICS += $(addprefix -L, $(shell find $(ADDONS_BIN_LIBS_DIRS) -name libsorder.make 2> /dev/null | sed s/libsorder.make//g)) - else - ADDONS_LIBS_STATICS = $(shell find $(ADDONS_BIN_LIBS_DIRS) -name *.a 2> /dev/null) - endif - - ADDONS_LIBS_SHARED = $(shell find $(ADDONS_BIN_LIBS_DIRS) -name *.so 2> /dev/null) - ADDONSLIBS = $(ADDONS_LIBS_STATICS) - ADDONSLIBS += $(ADDONS_LIBS_SHARED) - - - ADDONS_SOURCES = $(shell find $(ADDONS_DIRS) -name "*.cpp" -or -name "*.c" 2> /dev/null) - ADDONS_SOURCES += $(shell find $(ADDONS_LIBS_DIRS) -name "*.cpp" -or -name "*.c" -or -name "*.cc" 2>/dev/null) - ADDONS_OBJFILES = $(subst $(OF_ROOT)/, ,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(ADDONS_SOURCES))))) - endif -endif - - -ifeq ($(findstring Debug,$(MAKECMDGOALS)),Debug) - TARGET_CFLAGS = -g - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(LIBSPATH)/libopenFrameworksDebug.a - TARGET_NAME = Debug -endif - -ifeq ($(findstring Release,$(MAKECMDGOALS)),Release) - TARGET_CFLAGS = $(COMPILER_OPTIMIZATION) - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(LIBSPATH)/libopenFrameworks.a - TARGET_NAME = Release -endif - -ifeq ($(ARCH),android) - ifeq ($(findstring Debug,$(MAKECMDGOALS)),Debug) - TARGET = libs/armeabi/libOFAndroidApp.so - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(ARCH)/libopenFrameworksDebug.a - LDFLAGS += -Wl,--fix-cortex-a8 -shared - USER_LIBS = $(USER_LIBS_ARM) - endif - - ifeq ($(findstring Release,$(MAKECMDGOALS)),Release) - TARGET = libs/armeabi/libOFAndroidApp.so - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(ARCH)/libopenFrameworks.a - LDFLAGS += -Wl,--fix-cortex-a8 -shared - USER_LIBS = $(USER_LIBS_ARM) - endif - - ifeq ($(findstring Release_arm7,$(MAKECMDGOALS)),Release_arm7) - TARGET_NAME = Release_arm7 - TARGET_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb - TARGET = libs/armeabi-v7a/libOFAndroidApp.so - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(ARCH)/libopenFrameworks_arm7.a - USER_LIBS = $(USER_LIBS_ARM7) - endif - - ifeq ($(findstring Release_neon,$(MAKECMDGOALS)),Release_neon) - TARGET_NAME = Release_neon - TARGET_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=neon - TARGET = libs/armeabi-v7a/libOFAndroidApp_neon.so - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(ARCH)/libopenFrameworks_neon.a - USER_LIBS = $(USER_LIBS_NEON) - endif - - ifeq ($(findstring TestLink,$(MAKECMDGOALS)),TestLink) - TARGET_NAME = Debug - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(ARCH)/libopenFrameworksDebug.a - LDFLAGS += -Wl,--entry=main,--fix-cortex-a8 - BIN_NAME = $(APPNAME) - TARGET = obj/$(BIN_NAME) - USER_LIBS = $(USER_LIBS_ARM) - endif -else - ifeq ($(findstring Debug,$(MAKECMDGOALS)),Debug) - BIN_NAME = $(APPNAME)_debug - TARGET = bin/$(BIN_NAME) - endif - - ifeq ($(findstring Release,$(MAKECMDGOALS)),Release) - BIN_NAME = $(APPNAME) - TARGET = bin/$(BIN_NAME) - endif - - ifeq ($(MAKECMDGOALS),) - TARGET_NAME = Release - BIN_NAME = $(APPNAME) - TARGET = bin/$(BIN_NAME) - TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(LIBSPATH)/libopenFrameworks.a - endif -endif - -ifeq ($(MAKECMDGOALS),clean) - TARGET = bin/$(APPNAME)_debug bin/$(APPNAME) - TARGET_NAME = Release -endif - - -OBJ_OUTPUT = obj/$(ARCH)$(TARGET_NAME)/ -CLEANTARGET = clean$(TARGET_NAME) - -OBJS = $(addprefix $(OBJ_OUTPUT), $(OBJFILES)) -DEPFILES = $(patsubst %.o,%.d,$(OBJS)) - -USER_OBJS = $(addprefix $(OBJ_OUTPUT), $(USER_OBJFILES)) -DEPFILES += $(patsubst %.o,%.d,$(USER_OBJS)) - -ifeq ($(findstring addons.make,$(wildcard *.make)),addons.make) - ADDONS_OBJS = $(addprefix $(OBJ_OUTPUT), $(ADDONS_OBJFILES)) - DEPFILES += $(patsubst %.o,%.d,$(ADDONS_OBJS)) -endif - -.PHONY: Debug Release all after afterDebugAndroid afterReleaseAndroid - -Release: $(TARGET) after - -Debug: $(TARGET) after - -all: - $(MAKE) Release - -DebugAndroid: $(TARGET) - -ReleaseAndroid: $(TARGET) - -Release_arm7Android: $(TARGET) - -Release_neonAndroid: $(TARGET) afterReleaseAndroid - -TestLinkAndroid: $(TARGET) afterDebugAndroid - -AndroidDebug: - $(MAKE) DebugAndroid - $(MAKE) TestLinkAndroid - -AndroidRelease: - $(MAKE) ReleaseAndroid - $(MAKE) Release_arm7Android - $(MAKE) Release_neonAndroid - - -#This rule does the compilation -#$(OBJS): $(SOURCES) -$(OBJ_OUTPUT)%.o: %.cpp - @echo "compiling object for: " $< - mkdir -p $(@D) - $(CXX) -c $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $< - -$(OBJ_OUTPUT)%.o: %.c - @echo "compiling object for: " $< - mkdir -p $(@D) - $(CC) -c $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $< - -$(OBJ_OUTPUT)%.o: %.cc - @echo "compiling object for: " $< - mkdir -p $(@D) - $(CC) -c $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $< - -$(OBJ_OUTPUT)%.o: $(OF_ROOT)/%.cpp - @echo "compiling addon object for" $< - mkdir -p $(@D) - $(CXX) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o $@ -c $< - -$(OBJ_OUTPUT)%.o: $(OF_ROOT)/%.c - @echo "compiling addon object for" $< - mkdir -p $(@D) - $(CC) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o $@ -c $< - -$(OBJ_OUTPUT)%.o: $(OF_ROOT)/%.cc - @echo "compiling addon object for" $< - mkdir -p $(@D) - $(CC) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o $@ -c $< - -$(OBJ_OUTPUT)%.o: $(USER_SOURCE_DIR)/%.c - @echo "compiling object for: " $< - mkdir -p $(@D) - $(CC) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $< - -$(OBJ_OUTPUT)%.o: $(USER_SOURCE_DIR)/%.cc - @echo "compiling object for: " $< - mkdir -p $(@D) - $(CC) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $< - -$(OBJ_OUTPUT)%.o: $(USER_SOURCE_DIR)/%.cpp - @echo "compiling object for: " $< - mkdir -p $(@D) - $(CXX) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $< - -$(TARGET): $(OBJS) $(ADDONS_OBJS) $(USER_OBJS) $(TARGET_LIBS) $(LIB_STATIC) - @echo 'linking $(TARGET)' - mkdir -p $(@D) - $(CXX) -o $@ $(OBJS) $(ADDONS_OBJS) $(USER_OBJS) $(LDFLAGS) $(USER_LDFLAGS) $(TARGET_LIBS) $(ADDONSLIBS) $(USER_LIBS) $(LIB_STATIC) $(LIB_PATHS_FLAGS) $(LIB_SHARED) $(SYSTEMLIBS) - --include $(DEPFILES) - -.PHONY: clean cleanDebug cleanRelease CleanAndroid -clean: - rm -rf $(OBJ_OUTPUT) - rm -f $(TARGET) - rm -r bin/libs - -$(CLEANTARGET): - rm -rf $(OBJ_OUTPUT) - rm -f $(TARGET) - rm -rf bin/libs - -CleanAndroid: - rm -Rf obj - rm -f libs/armeabi-v7a/libOFAndroidApp.so - rm -f libs/armeabi/libOFAndroidApp.so - rm -f obj/$(APPNAME) - - -afterDebugAndroid:$(TARGET) - @if [ -d libs/armeabi-v7a ]; then rm -r libs/armeabi-v7a; fi - - @cp $(NDK_ROOT)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver libs/armeabi - - #create gdb.setup for armeabi - @echo "set solib-search-path $(PWD)/obj/local/armeabi:$(PWD)/libs/armeabi" > libs/armeabi/gdb.setup - @echo "directory $(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/usr/include" >> libs/armeabi/gdb.setup - @echo "directory $(PWD)/src" >> libs/armeabi/gdb.setup - @echo "directory $(NDK_ROOT)/sources/cxx-stl/system" >> libs/armeabi/gdb.setup - @echo "directory $(PWD)/libs/armeabi" >> libs/armeabi/gdb.setup - @echo "" >> libs/armeabi/gdb.setup - - @if [ ! -d jni ]; then mkdir jni; fi - @echo "APP_ABI := armeabi" > jni/Application.mk - @echo "#LOCAL_MODULE := OFAndroidApp" > jni/Android.mk - -afterReleaseAndroid:$(TARGET) - @if [ -f obj/$(BIN_NAME) ]; then rm obj/$(BIN_NAME); fi - - @cp $(OF_ROOT)/libs/openFrameworksCompiled/project/android/libneondetection.so libs/armeabi-v7a/ - @cp $(NDK_ROOT)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver libs/armeabi-v7a - - #create gdb.setup for armeabi-v7a - @echo "set solib-search-path $(PWD)/obj/local/armeabi-v7a:$(PWD)/libs/armeabi-v7a" > libs/armeabi-v7a/gdb.setup - @echo "directory $(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/usr/include" >> libs/armeabi-v7a/gdb.setup - @echo "directory $(PWD)/src" >> libs/armeabi-v7a/gdb.setup - @echo "directory $(NDK_ROOT)/sources/cxx-stl/system" >> libs/armeabi-v7a/gdb.setup - @echo "directory $(PWD)/libs/armeabi-v7a" >> libs/armeabi-v7a/gdb.setup - @echo "" >> libs/armeabi-v7a/gdb.setup - - @if [ ! -d jni ]; then mkdir jni; fi - @echo "APP_ABI := armeabi armeabi-v7a" > jni/Application.mk - @echo "#LOCAL_MODULE := OFAndroidApp" > jni/Android.mk - -RESNAME=$(shell echo $(APPNAME)Resources | tr '[A-Z]' '[a-z]') - -AndroidInstall: - if [ -d "bin/data" ]; then \ - mkdir -p res/raw; \ - rm res/raw/$(RESNAME).zip; \ - cd bin/data; \ - zip -r ../../res/raw/$(RESNAME).zip *; \ - cd ../..; \ - fi - if [ -f obj/$(BIN_NAME) ]; then rm obj/$(BIN_NAME); fi - #touch AndroidManifest.xml - $(SDK_ROOT)/tools/android update project --target $(NDK_PLATFORM) --path $(PROJECT_PATH) - ant debug - cp bin/OFActivity-debug.apk bin/$(APPNAME).apk - #if [ "$(shell $(SDK_ROOT)/platform-tools/adb get-state)" = "device" ]; then - $(SDK_ROOT)/platform-tools/adb install -r bin/$(APPNAME).apk; - #fi - $(SDK_ROOT)/platform-tools/adb shell am start -a android.intent.action.MAIN -n cc.openframeworks.$(APPNAME)/cc.openframeworks.$(APPNAME).OFActivity - - -after:$(TARGET) - cp -r $(OF_ROOT)/export/$(LIBSPATH)/libs bin/ - @echo - @echo " compiling done" - @echo " to launch the application" - @echo - @echo " cd bin" - @echo " ./$(BIN_NAME)" - @echo - - -.PHONY: help -help: - @echo - @echo openFrameworks universal makefile - @echo - @echo targets: - @echo "make Debug: builds the application with debug symbols" - @echo "make Release: builds the app with optimizations" - @echo "make: = make Release" - @echo "make all: = make Release" - @echo "make CleanDebug: cleans the Debug target" - @echo "make CleanRelease: cleans the Release target" - @echo "make clean: cleans everything" - @echo - @echo this should work with any OF app, just copy any example - @echo change the name of the folder and it should compile - @echo "only .cpp support, don't use .c files" - @echo it will look for files in any folder inside the application - @echo folder except that in the EXCLUDE_FROM_SOURCE variable. - @echo "it doesn't autodetect include paths yet" - @echo "add the include paths editing the var USER_CFLAGS" - @echo at the beginning of the makefile using the gcc syntax: - @echo -Ipath - @echo - @echo to add addons to your application, edit the addons.make file - @echo in this directory and add the names of the addons you want to - @echo include - @echo +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/Makefile.examples diff --git a/bin/data/settings.strongbow b/bin/data/settings.strongbow index c5a4d6a..ba48808 100644 --- a/bin/data/settings.strongbow +++ b/bin/data/settings.strongbow @@ -1,51 +1,48 @@ <?xml version="1.0" encoding="UTF-8" ?> <map4 model="bottle-strongbow-lid.3DS" x="0" y="117" z="0"> <view> - <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="24.353056" lng="-52.803280" dolly="737.189148" /> + <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="100.000000" targZ="0.000000" lat="50.352390" lng="-74.018013" dolly="662.707520" /> </view> <view> - <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="30.002064" lng="47.074490" dolly="723.159424" /> + <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="100.000000" targZ="0.000000" lat="54.604073" lng="32.265820" dolly="647.777954" /> </view> <clip> - <settings file="tiger/label_shiny_still.mov" /> + <settings file="black.mov" /> </clip> <clip> - <settings file="tiger/tiger_ribbon.mov" /> + <settings file="strongbow/plain_bottle.mov" /> </clip> <clip> - <settings file="tiger/ribbon_logo.mov" /> + <settings file="strongbow/rotate_shatter.mov" /> </clip> <clip> - <settings file="tiger/label_shiny_still.mov" /> + <settings file="strongbow/Strongbow_pulse.mov" /> </clip> <clip> - <settings file="tiger/timelapse_resize.mov" /> + <settings file="strongbow/ad_in_bottle.mov" /> </clip> <clip> - <settings file="tiger/tronlightdrive.mov" /> + <settings file="strongbow/grid.mov" /> </clip> <clip> - <settings file="tiger/label_shiny_still.mov" /> + <settings file="strongbow/balls_in_bottle.mov" /> </clip> <clip> - <settings file="tiger/tiger_squares_updated.mov" /> + <settings file="strongbow/pulse_scan.mov" /> </clip> <clip> - <settings file="tiger/disc_sea_colour.mov" /> + <settings file="strongbow/tron_gold.mov" /> </clip> <clip> - <settings file="tiger/label_shiny_still.mov" /> + <settings file="strongbow/gold_bars.mov" /> </clip> <clip> - <settings file="tiger/glow_cracks.mov" /> + <settings file="strongbow/Strongbow_rings.mov" /> </clip> <clip> - <settings file="tiger/label_shiny_still.mov" /> + <settings file="strongbow/cube_wave.mov" /> </clip> <clip> - <settings file="tiger/glow_bars.mov" /> - </clip> - <clip> - <settings file="tiger/shift over.mov" /> + <settings file="strongbow/timelapse.mov" /> </clip> </map4> diff --git a/bin/data/settings.xml b/bin/data/settings.xml index ba48808..af842d1 100644 --- a/bin/data/settings.xml +++ b/bin/data/settings.xml @@ -1,48 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> -<map4 model="bottle-strongbow-lid.3DS" x="0" y="117" z="0"> +<map4 model="tigerglass.3DS" x="0" y="117" z="0"> <view> - <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="100.000000" targZ="0.000000" lat="50.352390" lng="-74.018013" dolly="662.707520" /> + <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="27.813326" roll="0.000000" targX="0.000000" targY="120.614464" targZ="-28.251997" lat="24.353056" lng="-52.803280" dolly="737.189148" /> </view> - <view> - <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="100.000000" targZ="0.000000" lat="54.604073" lng="32.265820" dolly="647.777954" /> - </view> - <clip> - <settings file="black.mov" /> - </clip> - <clip> - <settings file="strongbow/plain_bottle.mov" /> - </clip> - <clip> - <settings file="strongbow/rotate_shatter.mov" /> - </clip> - <clip> - <settings file="strongbow/Strongbow_pulse.mov" /> - </clip> - <clip> - <settings file="strongbow/ad_in_bottle.mov" /> - </clip> - <clip> - <settings file="strongbow/grid.mov" /> - </clip> - <clip> - <settings file="strongbow/balls_in_bottle.mov" /> - </clip> - <clip> - <settings file="strongbow/pulse_scan.mov" /> - </clip> - <clip> - <settings file="strongbow/tron_gold.mov" /> - </clip> - <clip> - <settings file="strongbow/gold_bars.mov" /> - </clip> - <clip> - <settings file="strongbow/Strongbow_rings.mov" /> - </clip> - <clip> - <settings file="strongbow/cube_wave.mov" /> - </clip> <clip> - <settings file="strongbow/timelapse.mov" /> + <settings file="tiger/glow_cracks.mov" /> </clip> </map4> diff --git a/bin/libs/libfmodex.so b/bin/libs/libfmodex.so Binary files differindex ede2f98..9e5d07e 100644..100755 --- a/bin/libs/libfmodex.so +++ b/bin/libs/libfmodex.so diff --git a/bin/libs/libfmodexp.so b/bin/libs/libfmodexp.so Binary files differdeleted file mode 100644 index 8badce9..0000000 --- a/bin/libs/libfmodexp.so +++ /dev/null diff --git a/config.make b/config.make index 322e619..416112e 100644 --- a/config.make +++ b/config.make @@ -3,21 +3,21 @@ # OF_ROOT allows to move projects outside apps/* just set this variable to the # absoulte path to the OF root folder -OF_ROOT = ../of_preRelease_v007_linux/ +OF_ROOT = ../openFrameworks # USER_CFLAGS allows to pass custom flags to the compiler # for example search paths like: # USER_CFLAGS = -I src/objects -USER_CFLAGS = -I ../../../addons -I ../../../addons/ofxAvahiCore/libs/avahi/include +USER_CFLAGS = -I ../openFrameworks/addons -I ../openFrameworks/addons/ofxAvahiCore/libs/avahi/include # USER_LDFLAGS allows to pass custom flags to the linker # for example libraries like: # USER_LD_FLAGS = libs/libawesomelib.a -USER_LDFLAGS = +USER_LDFLAGS = ../openFrameworks/addons/ofxOpenCv/libs/opencv/lib/linux64/libopencv_legacy.a # use this to add system libraries for example: @@ -6,13 +6,13 @@ <Option makefile_is_custom="1" /> <Option pch_mode="2" /> <Option compiler="gcc" /> - <Option virtualFolders="addons/;src/;addons/ofx3DModelLoader/src/3DS/;addons/ofx3DModelLoader/src/;addons/ofxOpenCv/src/;addons/ofxXmlSettings/src/;build config/;" /> + <Option virtualFolders="addons/;build config/;addons/ofx3DModelLoader/src/3DS/;build config/;addons/ofx3DModelLoader/src/;build config/;addons/;build config/ofxOpenCv/src/;addons/ofxXmlSettings/src/;build config/;build config/;addons/ofxAvahiClient/src/;build config/;addons/ofxAvahiCore/libs/avahi/include/avahi-common/;build config/;addons/ofxAvahiCore/libs/avahi/include/avahi-core/;build config/;addons/ofxAvahiCore/src/;build config/;addons/ofxNetwork/src/;build config/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/calib3d/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/contrib/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/core/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/features2d/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/flann/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/gpu/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/highgui/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/imgproc/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/legacy/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/ml/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/objdetect/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/ts/;addons/;build config/ofxOpenCv/libs/opencv/include/opencv2/video/;addons/ofxOsc/libs/oscpack/include/ip/;build config/;addons/ofxOsc/libs/oscpack/include/osc/;build config/;addons/ofxOsc/libs/oscpack/src/ip/;build config/;addons/ofxOsc/libs/oscpack/src/ip/posix/;build config/;addons/ofxOsc/libs/oscpack/src/ip/win32/;build config/;addons/ofxOsc/libs/oscpack/src/osc/;build config/;addons/ofxOsc/src/;build config/;addons/ofxThread/src/;build config/;addons/ofxXmlSettings/libs/;build config/;src/;" /> <Build> <Target title="Debug"> <Option output="bin/$(PROJECT_NAME)_debug" prefix_auto="1" extension_auto="1" /> <Option working_dir="bin" /> <Option object_output="obj/Debug/" /> - <Option external_deps="../../../libs/openFrameworksCompiled/lib/linux/libopenFrameworksDebug.a;" /> + <Option external_deps="../openFrameworks/libs/openFrameworksCompiled/lib/linux/libopenFrameworksDebug.a;" /> <Option type="1" /> <Option compiler="gcc" /> <Option projectLinkerOptionsRelation="2" /> @@ -21,134 +21,734 @@ <Option output="bin/$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" /> <Option working_dir="bin" /> <Option object_output="obj/Release/" /> - <Option external_deps="../../../libs/openFrameworksCompiled/lib/linux/libopenFrameworks.a;" /> + <Option external_deps="../openFrameworks/libs/openFrameworksCompiled/lib/linux/libopenFrameworks.a;" /> <Option type="1" /> <Option compiler="gcc" /> <Option projectLinkerOptionsRelation="2" /> </Target> </Build> - <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h"> + <Unit filename="addons.make"> + <Option virtualFolder="build config/" /> + </Unit> + <Unit filename="bin/data/defaults.xml"> + <Option virtualFolder="build config/" /> + </Unit> + <Unit filename="bin/data/settings.xml"> + <Option virtualFolder="build config/" /> + </Unit> + <Unit filename="config.make"> + <Option virtualFolder="build config" /> + </Unit> + <Unit filename="src/keyVar.cpp"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/keyVar.h"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/main.cpp"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/mapUtils.cpp"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/mapUtils.h"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/testApp.cpp"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/testApp.h"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/viewpoint.cpp"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/viewpoint.h"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/3DS/Vector3DS.h"> <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" /> </Unit> - <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/model3DS.cpp"> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/3DS/model3DS.cpp"> <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" /> </Unit> - <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/model3DS.h"> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/3DS/model3DS.h"> <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" /> </Unit> - <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/texture3DS.cpp"> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/3DS/texture3DS.cpp"> <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" /> </Unit> - <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/texture3DS.h"> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/3DS/texture3DS.h"> <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" /> </Unit> - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h"> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/ofx3DBaseLoader.h"> <Option virtualFolder="addons/ofx3DModelLoader/src" /> </Unit> - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h"> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/ofx3DModelLoader.h"> <Option virtualFolder="addons/ofx3DModelLoader/src" /> </Unit> - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp"> + <Unit filename="../openFrameworks/addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp"> <Option virtualFolder="addons/ofx3DModelLoader/src" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvBlob.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiClient/src/ofxAvahiClient.h"> + <Option virtualFolder="addons/ofxAvahiClient/src" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvColorImage.cpp"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiClient/src/ofxAvahiClientBrowser.cpp"> + <Option virtualFolder="addons/ofxAvahiClient/src" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvColorImage.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiClient/src/ofxAvahiClientBrowser.h"> + <Option virtualFolder="addons/ofxAvahiClient/src" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvConstants.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiClient/src/ofxAvahiClientService.cpp"> + <Option virtualFolder="addons/ofxAvahiClient/src" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvContourFinder.cpp"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiClient/src/ofxAvahiClientService.h"> + <Option virtualFolder="addons/ofxAvahiClient/src" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvContourFinder.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiClient/src/ofxAvahiService.h"> + <Option virtualFolder="addons/ofxAvahiClient/src" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvFloatImage.cpp"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/address.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvFloatImage.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/alternative.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvGrayscaleImage.cpp"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/cdecl.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvGrayscaleImage.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/dbus-watch-glue.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvHaarFinder.cpp"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/dbus.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvHaarFinder.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/defs.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvImage.cpp"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/domain.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvImage.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/error.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvMain.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/gccmacro.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvShortImage.cpp"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/i18n.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxCvShortImage.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/llist.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxOpenCv/src/ofxOpenCv.h"> - <Option virtualFolder="addons/ofxOpenCv/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/malloc.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxXmlSettings/src/ofxXmlSettings.cpp"> - <Option virtualFolder="addons/ofxXmlSettings/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/rlist.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="../../../addons/ofxXmlSettings/src/ofxXmlSettings.h"> - <Option virtualFolder="addons/ofxXmlSettings/src" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/simple-watch.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="addons.make"> - <Option virtualFolder="build config/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/strlst.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="bin/data/defaults.xml"> - <Option virtualFolder="build config/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/thread-watch.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="bin/data/settings.xml"> - <Option virtualFolder="build config/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/timeval.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="config.make"> - <Option virtualFolder="build config" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/utf8.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="src/keyVar.cpp"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-common/watch.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-common" /> </Unit> - <Unit filename="src/keyVar.h"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/addr-util.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> </Unit> - <Unit filename="src/main.cpp"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/announce.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> </Unit> - <Unit filename="src/mapUtils.cpp"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/browse.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> </Unit> - <Unit filename="src/mapUtils.h"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/cache.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> </Unit> - <Unit filename="src/testApp.cpp"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/core.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> </Unit> - <Unit filename="src/testApp.h"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/dns-srv-rr.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> </Unit> - <Unit filename="src/viewpoint.cpp"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/dns.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> </Unit> - <Unit filename="src/viewpoint.h"> - <Option virtualFolder="src/" /> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/domain-util.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/fdutil.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/hashmap.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/iface-linux.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/iface-pfroute.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/iface.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/internal.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/log.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/lookup.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/multicast-lookup.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/netlink.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/prioq.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/probe-sched.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/publish.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/querier.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/query-sched.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/response-sched.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/rr-util.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/rr.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/rrlist.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/socket.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/timeeventq.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/util.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/libs/avahi/include/avahi-core/wide-area.h"> + <Option virtualFolder="addons/ofxAvahiCore/libs/avahi/include/avahi-core" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/src/ofxAvahiCoreBrowser.cpp"> + <Option virtualFolder="addons/ofxAvahiCore/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxAvahiCore/src/ofxAvahiCoreBrowser.h"> + <Option virtualFolder="addons/ofxAvahiCore/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxNetwork.h"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxNetworkUtils.h"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxTCPClient.cpp"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxTCPClient.h"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxTCPManager.cpp"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxTCPManager.h"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxTCPServer.cpp"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxTCPServer.h"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxUDPManager.cpp"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxNetwork/src/ofxUDPManager.h"> + <Option virtualFolder="addons/ofxNetwork/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cv.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cv.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cvaux.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cvaux.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cvwimage.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cxcore.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cxcore.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cxeigen.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/cxmisc.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/highgui.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv/ml.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/calib3d/calib3d.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/calib3d/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/contrib/contrib.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/contrib/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/contrib/retina.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/contrib/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/core.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/core_c.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/eigen.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/internal.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/mat.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/operations.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/types_c.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/version.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/wimage.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/core/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/features2d/features2d.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/features2d/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/all_indices.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/allocator.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/any.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/autotuned_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/composite_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/config.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/defines.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/dist.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/dummy.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/dynamic_bitset.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/flann.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/flann_base.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/general.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/ground_truth.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/hdf5.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/heap.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/hierarchical_clustering_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/index_testing.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/kdtree_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/kdtree_single_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/kmeans_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/linear_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/logger.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/lsh_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/lsh_table.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/matrix.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/miniflann.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/nn_index.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/object_factory.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/params.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/random.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/result_set.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/sampling.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/saving.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/simplex_downhill.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann/timer.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/flann/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/gpu/devmem2d.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/gpu/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/gpu/gpu.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/gpu/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/gpu/gpumat.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/gpu/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/gpu/matrix_operations.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/gpu/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/gpu/stream_accessor.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/gpu/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/highgui/highgui.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/highgui/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/highgui/highgui_c.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/highgui/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc/imgproc.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/imgproc/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc/imgproc_c.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/imgproc/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc/types_c.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/imgproc/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/legacy/blobtrack.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/legacy/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/legacy/compat.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/legacy/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/legacy/legacy.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/legacy/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/legacy/streams.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/legacy/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/ml/ml.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/ml/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/objdetect/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/ts/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts_gtest.h"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/ts/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/video/background_segm.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/video/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/video/tracking.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/video/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp"> + <Option virtualFolder="build config/ofxOpenCv/libs/opencv/include/opencv2/video/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvBlob.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvColorImage.cpp"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvColorImage.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvConstants.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvContourFinder.cpp"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvContourFinder.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvFloatImage.cpp"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvFloatImage.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvGrayscaleImage.cpp"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvGrayscaleImage.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvHaarFinder.cpp"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvHaarFinder.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvImage.cpp"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvImage.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvMain.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvShortImage.cpp"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxCvShortImage.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOpenCv/src/ofxOpenCv.h"> + <Option virtualFolder="build config/ofxOpenCv/src/" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/ip/IpEndpointName.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/ip/NetworkingUtils.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/ip/PacketListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/ip/TimerListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/ip/UdpSocket.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/MessageMappingOscPacketListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/OscException.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/OscHostEndianness.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/OscOutboundPacketStream.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/OscPacketListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/OscPrintReceivedElements.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/OscReceivedElements.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/include/osc/OscTypes.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/include/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/NetworkingUtils.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/PacketListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/TimerListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/UdpSocket.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/posix/NetworkingUtils.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip/posix" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/posix/UdpSocket.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip/posix" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/win32/NetworkingUtilsWin.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip/win32" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/win32/UdpSocketWin.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/ip/win32" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/MessageMappingOscPacketListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscException.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscHostEndianness.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscOutboundPacketStream.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscOutboundPacketStream.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscPacketListener.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscPrintReceivedElements.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscPrintReceivedElements.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscReceivedElements.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscReceivedElements.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscTypes.cpp"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/libs/oscpack/src/osc/OscTypes.h"> + <Option virtualFolder="addons/ofxOsc/libs/oscpack/src/osc" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOsc.h"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscArg.h"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscBundle.cpp"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscBundle.h"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscMessage.cpp"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscMessage.h"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscReceiver.cpp"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscReceiver.h"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscSender.cpp"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxOsc/src/ofxOscSender.h"> + <Option virtualFolder="addons/ofxOsc/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxThread/src/ofxThread.h"> + <Option virtualFolder="addons/ofxThread/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxXmlSettings/libs/tinyxml.cpp"> + <Option virtualFolder="addons/ofxXmlSettings/libs" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxXmlSettings/libs/tinyxml.h"> + <Option virtualFolder="addons/ofxXmlSettings/libs" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxXmlSettings/libs/tinyxmlerror.cpp"> + <Option virtualFolder="addons/ofxXmlSettings/libs" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxXmlSettings/libs/tinyxmlparser.cpp"> + <Option virtualFolder="addons/ofxXmlSettings/libs" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxXmlSettings/src/ofxXmlSettings.cpp"> + <Option virtualFolder="addons/ofxXmlSettings/src" /> + </Unit> + <Unit filename="../openFrameworks/addons/ofxXmlSettings/src/ofxXmlSettings.h"> + <Option virtualFolder="addons/ofxXmlSettings/src" /> </Unit> <Extensions> <code_completion /> diff --git a/map4.layout b/map4.layout index 197277a..5a68183 100644 --- a/map4.layout +++ b/map4.layout @@ -1,20 +1,17 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="Debug" /> - <File name="../../../addons/ofx3DModelLoader/src/3DS/model3DS.h" open="0" top="0" tabpos="0"> - <Cursor position="136" topLine="0" /> - </File> - <File name="addons.make" open="0" top="0" tabpos="1"> - <Cursor position="43" topLine="0" /> + <File name="addons.make" open="1" top="0" tabpos="1"> + <Cursor position="9" topLine="0" /> </File> <File name="bin/data/defaults.xml" open="0" top="0" tabpos="3"> <Cursor position="1033" topLine="0" /> </File> - <File name="bin/data/settings.xml" open="1" top="0" tabpos="3"> - <Cursor position="676" topLine="0" /> + <File name="bin/data/settings.xml" open="1" top="1" tabpos="3"> + <Cursor position="81" topLine="0" /> </File> - <File name="config.make" open="0" top="0" tabpos="3"> - <Cursor position="548" topLine="0" /> + <File name="config.make" open="1" top="0" tabpos="2"> + <Cursor position="631" topLine="0" /> </File> <File name="src/keyVar.cpp" open="0" top="0" tabpos="7"> <Cursor position="1236" topLine="16" /> @@ -22,8 +19,8 @@ <File name="src/keyVar.h" open="0" top="0" tabpos="8"> <Cursor position="0" topLine="0" /> </File> - <File name="src/main.cpp" open="0" top="0" tabpos="3"> - <Cursor position="833" topLine="0" /> + <File name="src/main.cpp" open="1" top="0" tabpos="5"> + <Cursor position="439" topLine="0" /> </File> <File name="src/mapUtils.cpp" open="0" top="0" tabpos="4"> <Cursor position="5495" topLine="107" /> @@ -31,14 +28,14 @@ <File name="src/mapUtils.h" open="0" top="0" tabpos="6"> <Cursor position="165" topLine="0" /> </File> - <File name="src/testApp.cpp" open="1" top="1" tabpos="1"> - <Cursor position="6590" topLine="230" /> + <File name="src/testApp.cpp" open="1" top="0" tabpos="4"> + <Cursor position="1796" topLine="50" /> </File> - <File name="src/testApp.h" open="1" top="0" tabpos="2"> - <Cursor position="795" topLine="60" /> + <File name="src/testApp.h" open="1" top="0" tabpos="6"> + <Cursor position="2180" topLine="91" /> </File> <File name="src/viewpoint.cpp" open="0" top="0" tabpos="4"> - <Cursor position="566" topLine="0" /> + <Cursor position="2230" topLine="0" /> </File> <File name="src/viewpoint.h" open="0" top="0" tabpos="6"> <Cursor position="808" topLine="13" /> diff --git a/map4.workspace b/map4.workspace index c42be9d..a3871dc 100644 --- a/map4.workspace +++ b/map4.workspace @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_workspace_file> <Workspace title="map4"> - <Project filename="../../../libs/openFrameworksCompiled/project/linux/libopenFrameworks.cbp" active="1" /> + <Project filename="../openFrameworks/libs/openFrameworksCompiled/project/linux/libopenFrameworks.cbp" active="1" /> </Workspace> </CodeBlocks_workspace_file> diff --git a/src/main.cpp b/src/main.cpp index 5320f44..3d1510f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,7 @@ int main( ){ ofAppGlutWindow window; - ofSetupOpenGL(&window, 3840,720, OF_FULLSCREEN); // <-------- setup the GL context + ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context //ofSetupOpenGL(&window, 1024,300, OF_WINDOW); glutIgnoreKeyRepeat(1); glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF); //these don't work!!! diff --git a/src/testApp.cpp b/src/testApp.cpp index a7b90d1..afaaad0 100644 --- a/src/testApp.cpp +++ b/src/testApp.cpp @@ -39,8 +39,8 @@ void testApp::setup(){ transTime=0; transition=false; - whichClip=1; //0 is black - switchClip=1; //0 is black + whichClip=0; //0 is black + switchClip=0; //0 is black texture.loadMovie(clips[whichClip]); texture.setLoopState(OF_LOOP_NORMAL); texture.play(); @@ -62,11 +62,10 @@ void testApp::setup(){ videoInverted = new unsigned char[camWidth*camHeight*3]; videoTexture.allocate(camWidth,camHeight, GL_RGB); - ard.connect("/dev/ttyUSB0", 57600); - ofAddListener(ard.EInitialized, this, &testApp::setupArduino); - bSetupArduino = false; + bSetupArduino = ard.connect("/dev/ttyUSB0", 57600); + if (bSetupArduino) ofAddListener(ard.EInitialized, this, &testApp::setupArduino); bSwitchArduino = false; - + //----------------avahi stuff avahiService.start("ofMrmr","_mrmrsrvr._udp",1337); oscReceiver.setup(1337); //default mrmr port @@ -77,7 +76,7 @@ void testApp::setup(){ void testApp::update(){ texture.idleMovie(); calibrator_label.idleMovie(); - + //mixAmount=sin(ofGetElapsedTimef())+1.0; doTransition(); @@ -97,7 +96,7 @@ void testApp::update(){ } } updateArduino(); - + //----------------avahi stuff ProcessMessages(); } @@ -114,20 +113,22 @@ void testApp::setupArduino(const int & version) { } ard.sendDigitalPinMode(7, ARD_INPUT); - bSetupArduino = true; + printf("arduino ready\n"); } //-------------------------------------------------------------- void testApp::updateArduino(){ - // update the arduino, get any data or messages. - ard.update(); + // do not send anything until the arduino has been set up if (bSetupArduino) { - - + + // update the arduino, get any data or messages. + ard.update(); + + if (bSwitchArduino!=ard.getDigital(7)) { bSwitchArduino=ard.getDigital(7); printf("pin 7 %i\n",bSwitchArduino); @@ -140,7 +141,7 @@ void testApp::updateArduino(){ whichClip=0; transTime=ofGetElapsedTimef()+0.1; } - + transition=true; } } @@ -201,7 +202,7 @@ void testApp::ProcessMessages(){ { int ls = messageAddress.find_last_of("/"); int msg=-1; - + if(m.getNumArgs()) msg=m.getArgAsInt32( 0 ); if(startswith(messageAddress.c_str(),"/mrmr/pushbutton/1")) @@ -410,8 +411,8 @@ void testApp::loadSettings(string filename){ } //numViews=2; - //views[0].setup(ofGetWidth()/2,ofGetHeight(),0,0); - //views[1].setup(ofGetWidth()/2,ofGetHeight(),ofGetWidth()/2,0); + //views[0].setup(ofGetScreenWidth()/2,ofGetScreenHeight(),0,0); + //views[1].setup(ofGetScreenWidth()/2,ofGetScreenHeight(),ofGetScreenWidth()/2,0); //activeView=0; } //-------------------------------------------------------------- diff --git a/src/testApp.h b/src/testApp.h index 1bf2d7b..5ccf775 100644 --- a/src/testApp.h +++ b/src/testApp.h @@ -61,11 +61,11 @@ class testApp : public ofBaseApp{ void windowResized(int w, int h); void dragEvent(ofDragInfo dragInfo); void gotMessage(ofMessage msg); - + void doTransition(); float transTime; bool transition; - + void prevMovie(); void nextMovie(); @@ -106,9 +106,9 @@ class testApp : public ofBaseApp{ ofArduino ard; bool bSetupArduino; // flag variable for setting up arduino once int bSwitchArduino; - + //----------------avahi stuff - + ofxAvahiClientService avahiService; ofxTCPClient tcpClient; diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp index fe8bb28..cf05663 100644 --- a/src/viewpoint.cpp +++ b/src/viewpoint.cpp @@ -53,7 +53,15 @@ double viewpoint::getSetting(const string& setting){ } //-------------------------------------------------------------- void viewpoint::setLight(){ - target.setPosition(vars[1].getVal(),vars[2].getVal(),vars[3].getVal()); + + ofNode c=ofNode(); + ofNode t=ofNode(); + t.setParent(c); + t.setPosition(vars[1].getVal(),vars[2].getVal(),vars[3].getVal()); + //make target controls relative to rotation + c.rotate(vars[5].getVal(), ofVec3f(0, 1, 0)); + + target.setPosition(t.getGlobalPosition()); //camera.orbit(vars[5].getVal(), vars[4].getVal(), vars[7].getVal(), target); camera.setFov(vars[0].getVal()); if (vertigo) { @@ -62,6 +70,8 @@ void viewpoint::setLight(){ vars[7].setVal((tan((vars[0].readVal()-vars[0].inc)*PI*0.0027777)*vars[7].readVal())/tan(vars[0].readVal()*PI*0.0027777)); } + + ofVec3f p(0, 0, vars[7].getVal()); //p.rotate(ofClamp(vars[2].getVal(), -89, 89), ofVec3f(1, 0, 0)); p.rotate(vars[4].getVal(), ofVec3f(1, 0, 0)); diff --git a/src/viewpoint.h b/src/viewpoint.h index 399f84c..6e85017 100644 --- a/src/viewpoint.h +++ b/src/viewpoint.h @@ -45,10 +45,10 @@ class viewpoint { keyVar* vars; - int lightNum; - GLfloat lightColour[]; + int lightNum; + GLfloat lightColour[]; - GLfloat* getLightPosition; + GLfloat* getLightPosition; ofLight light; |
