diff options
Diffstat (limited to 'liveengine')
38 files changed, 954 insertions, 2748 deletions
diff --git a/liveengine/Makefile b/liveengine/Makefile index a6b3711..2d83a77 100644..100755 --- a/liveengine/Makefile +++ b/liveengine/Makefile @@ -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/liveengine/addons.make b/liveengine/addons.make index c930a97..98f5fd6 100755 --- a/liveengine/addons.make +++ b/liveengine/addons.make @@ -1,6 +1,6 @@ -ofxXmlSettings
-ofxMidi
-ofxSVG +ofxXmlSettings +ofxMidi ofxSVGTiny ofxFenster ofxGui +ofxOpenNI diff --git a/liveengine/bin/data/american_football.xml b/liveengine/bin/data/american_football.xml index 16b5588..4a52a30 100644 --- a/liveengine/bin/data/american_football.xml +++ b/liveengine/bin/data/american_football.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="American Football"> <svglayer note="36" file="american_football/FOOTB004.WMF.svg"/> <svglayer note="37" file="american_football/FOOTB005.WMF.svg"/> <svglayer note="38" file="american_football/FOOTB006.WMF.svg"/> diff --git a/liveengine/bin/data/birds.xml b/liveengine/bin/data/birds.xml index 0db0986..8ffd4d6 100644 --- a/liveengine/bin/data/birds.xml +++ b/liveengine/bin/data/birds.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Birds"> <svglayer note="36" file="birds/55.WMF.svg"/> <svglayer note="37" file="birds/AB01001A.WMF.svg"/> <svglayer note="38" file="birds/AB01005A.WMF.svg"/> diff --git a/liveengine/bin/data/computers.xml b/liveengine/bin/data/computers.xml index 22ed140..d9be7e8 100644 --- a/liveengine/bin/data/computers.xml +++ b/liveengine/bin/data/computers.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Computers"> <svglayer note="36" file="computers/COMPU020.WMF.svg"/> <svglayer note="37" file="computers/COMPU021.WMF.svg"/> <svglayer note="38" file="computers/COMPU022.WMF.svg"/> diff --git a/liveengine/bin/data/crests.xml b/liveengine/bin/data/crests.xml index 011936b..6f5103c 100644 --- a/liveengine/bin/data/crests.xml +++ b/liveengine/bin/data/crests.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Crests"> <svglayer note="36" file="crests/AD003707.WMF.svg"/> <svglayer note="37" file="crests/AG000251.WMF.svg"/> <svglayer note="38" file="crests/AG000253.WMF.svg"/> diff --git a/liveengine/bin/data/cricket.xml b/liveengine/bin/data/cricket.xml index ff7925a..b6f1123 100644 --- a/liveengine/bin/data/cricket.xml +++ b/liveengine/bin/data/cricket.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Cricket"> <svglayer note="36" file="cricket/CRICK006.WMF.svg"/> <svglayer note="37" file="cricket/CRICK008.WMF.svg"/> <svglayer note="38" file="cricket/CRICK009.WMF.svg"/> diff --git a/liveengine/bin/data/dancing.xml b/liveengine/bin/data/dancing.xml index 0106af8..74901dd 100644 --- a/liveengine/bin/data/dancing.xml +++ b/liveengine/bin/data/dancing.xml @@ -1,68 +1,68 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> - <svglayer note="36" file="dancing/LJ01700A.WMF.svg"/> - <svglayer note="37" file="dancing/LJ01546A.WMF.svg"/> - <svglayer note="38" file="dancing/LJ01595A.WMF.svg"/> - <svglayer note="39" file="dancing/LJ01560A.WMF.svg"/> - <svglayer note="40" file="dancing/LJ01551A.WMF.svg"/> - <svglayer note="41" file="dancing/LJ01712A.WMF.svg"/> - <svglayer note="42" file="dancing/LJ01559A.WMF.svg"/> - <svglayer note="43" file="dancing/LJ01569A.WMF.svg"/> - <svglayer note="44" file="dancing/LJ01698A.WMF.svg"/> - <svglayer note="45" file="dancing/LJ01544A.WMF.svg"/> - <svglayer note="46" file="dancing/LJ01557A.WMF.svg"/> - <svglayer note="47" file="dancing/LJ01598A.WMF.svg"/> - <svglayer note="48" file="dancing/LJ01567A.WMF.svg"/> - <svglayer note="49" file="dancing/LJ01543A.WMF.svg"/> - <svglayer note="50" file="dancing/LJ01558A.WMF.svg"/> - <svglayer note="51" file="dancing/LJ01545A.WMF.svg"/> - <svglayer note="52" file="dancing/LJ01584A.WMF.svg"/> - <svglayer note="53" file="dancing/LJ01542A.WMF.svg"/> - <svglayer note="54" file="dancing/LJ01702A.WMF.svg"/> - <svglayer note="55" file="dancing/LJ01604A.WMF.svg"/> - <svglayer note="56" file="dancing/LJ01699A.WMF.svg"/> - <svglayer note="57" file="dancing/LJ01701A.WMF.svg"/> - <svglayer note="58" file="dancing/LJ01596A.WMF.svg"/> - <svglayer note="59" file="dancing/LJ01700A.WMF.svg"/> - <svglayer note="60" file="dancing/LJ01546A.WMF.svg"/> - <svglayer note="61" file="dancing/LJ01595A.WMF.svg"/> - <svglayer note="62" file="dancing/LJ01560A.WMF.svg"/> - <svglayer note="63" file="dancing/LJ01551A.WMF.svg"/> - <svglayer note="64" file="dancing/LJ01712A.WMF.svg"/> - <svglayer note="65" file="dancing/LJ01559A.WMF.svg"/> - <svglayer note="66" file="dancing/LJ01569A.WMF.svg"/> - <svglayer note="67" file="dancing/LJ01698A.WMF.svg"/> - <svglayer note="68" file="dancing/LJ01544A.WMF.svg"/> - <svglayer note="69" file="dancing/LJ01557A.WMF.svg"/> - <svglayer note="70" file="dancing/LJ01598A.WMF.svg"/> - <svglayer note="71" file="dancing/LJ01567A.WMF.svg"/> - <svglayer note="72" file="dancing/LJ01543A.WMF.svg"/> - <svglayer note="73" file="dancing/LJ01558A.WMF.svg"/> - <svglayer note="74" file="dancing/LJ01545A.WMF.svg"/> - <svglayer note="75" file="dancing/LJ01584A.WMF.svg"/> - <svglayer note="76" file="dancing/LJ01542A.WMF.svg"/> - <svglayer note="77" file="dancing/LJ01702A.WMF.svg"/> - <svglayer note="78" file="dancing/LJ01604A.WMF.svg"/> - <svglayer note="79" file="dancing/LJ01699A.WMF.svg"/> - <svglayer note="80" file="dancing/LJ01701A.WMF.svg"/> - <svglayer note="81" file="dancing/LJ01596A.WMF.svg"/> - <svglayer note="82" file="dancing/LJ01700A.WMF.svg"/> - <svglayer note="83" file="dancing/LJ01546A.WMF.svg"/> - <svglayer note="84" file="dancing/LJ01595A.WMF.svg"/> - <svglayer note="85" file="dancing/LJ01560A.WMF.svg"/> - <svglayer note="86" file="dancing/LJ01551A.WMF.svg"/> - <svglayer note="87" file="dancing/LJ01712A.WMF.svg"/> - <svglayer note="88" file="dancing/LJ01559A.WMF.svg"/> - <svglayer note="89" file="dancing/LJ01569A.WMF.svg"/> - <svglayer note="90" file="dancing/LJ01698A.WMF.svg"/> - <svglayer note="91" file="dancing/LJ01544A.WMF.svg"/> - <svglayer note="92" file="dancing/LJ01557A.WMF.svg"/> - <svglayer note="93" file="dancing/LJ01598A.WMF.svg"/> - <svglayer note="94" file="dancing/LJ01567A.WMF.svg"/> - <svglayer note="95" file="dancing/LJ01543A.WMF.svg"/> - <svglayer note="96" file="dancing/LJ01558A.WMF.svg"/> - <svglayer note="97" file="dancing/LJ01545A.WMF.svg"/> - <svglayer note="98" file="dancing/LJ01584A.WMF.svg"/> - <svglayer note="99" file="dancing/LJ01542A.WMF.svg"/> - <svglayer note="100" file="dancing/LJ01702A.WMF.svg"/> +<playlist name="Dancing"> + <svglayer note="36" file="dancing/LJ01542A.WMF.svg"/> + <svglayer note="37" file="dancing/LJ01543A.WMF.svg"/> + <svglayer note="38" file="dancing/LJ01544A.WMF.svg"/> + <svglayer note="39" file="dancing/LJ01545A.WMF.svg"/> + <svglayer note="40" file="dancing/LJ01546A.WMF.svg"/> + <svglayer note="41" file="dancing/LJ01551A.WMF.svg"/> + <svglayer note="42" file="dancing/LJ01557A.WMF.svg"/> + <svglayer note="43" file="dancing/LJ01558A.WMF.svg"/> + <svglayer note="44" file="dancing/LJ01559A.WMF.svg"/> + <svglayer note="45" file="dancing/LJ01560A.WMF.svg"/> + <svglayer note="46" file="dancing/LJ01567A.WMF.svg"/> + <svglayer note="47" file="dancing/LJ01569A.WMF.svg"/> + <svglayer note="48" file="dancing/LJ01584A.WMF.svg"/> + <svglayer note="49" file="dancing/LJ01595A.WMF.svg"/> + <svglayer note="50" file="dancing/LJ01596A.WMF.svg"/> + <svglayer note="51" file="dancing/LJ01598A.WMF.svg"/> + <svglayer note="52" file="dancing/LJ01604A.WMF.svg"/> + <svglayer note="53" file="dancing/LJ01698A.WMF.svg"/> + <svglayer note="54" file="dancing/LJ01699A.WMF.svg"/> + <svglayer note="55" file="dancing/LJ01700A.WMF.svg"/> + <svglayer note="56" file="dancing/LJ01701A.WMF.svg"/> + <svglayer note="57" file="dancing/LJ01702A.WMF.svg"/> + <svglayer note="58" file="dancing/LJ01712A.WMF.svg"/> + <svglayer note="59" file="dancing/LJ01542A.WMF.svg"/> + <svglayer note="60" file="dancing/LJ01543A.WMF.svg"/> + <svglayer note="61" file="dancing/LJ01544A.WMF.svg"/> + <svglayer note="62" file="dancing/LJ01545A.WMF.svg"/> + <svglayer note="63" file="dancing/LJ01546A.WMF.svg"/> + <svglayer note="64" file="dancing/LJ01551A.WMF.svg"/> + <svglayer note="65" file="dancing/LJ01557A.WMF.svg"/> + <svglayer note="66" file="dancing/LJ01558A.WMF.svg"/> + <svglayer note="67" file="dancing/LJ01559A.WMF.svg"/> + <svglayer note="68" file="dancing/LJ01560A.WMF.svg"/> + <svglayer note="69" file="dancing/LJ01567A.WMF.svg"/> + <svglayer note="70" file="dancing/LJ01569A.WMF.svg"/> + <svglayer note="71" file="dancing/LJ01584A.WMF.svg"/> + <svglayer note="72" file="dancing/LJ01595A.WMF.svg"/> + <svglayer note="73" file="dancing/LJ01596A.WMF.svg"/> + <svglayer note="74" file="dancing/LJ01598A.WMF.svg"/> + <svglayer note="75" file="dancing/LJ01604A.WMF.svg"/> + <svglayer note="76" file="dancing/LJ01698A.WMF.svg"/> + <svglayer note="77" file="dancing/LJ01699A.WMF.svg"/> + <svglayer note="78" file="dancing/LJ01700A.WMF.svg"/> + <svglayer note="79" file="dancing/LJ01701A.WMF.svg"/> + <svglayer note="80" file="dancing/LJ01702A.WMF.svg"/> + <svglayer note="81" file="dancing/LJ01712A.WMF.svg"/> + <svglayer note="82" file="dancing/LJ01542A.WMF.svg"/> + <svglayer note="83" file="dancing/LJ01543A.WMF.svg"/> + <svglayer note="84" file="dancing/LJ01544A.WMF.svg"/> + <svglayer note="85" file="dancing/LJ01545A.WMF.svg"/> + <svglayer note="86" file="dancing/LJ01546A.WMF.svg"/> + <svglayer note="87" file="dancing/LJ01551A.WMF.svg"/> + <svglayer note="88" file="dancing/LJ01557A.WMF.svg"/> + <svglayer note="89" file="dancing/LJ01558A.WMF.svg"/> + <svglayer note="90" file="dancing/LJ01559A.WMF.svg"/> + <svglayer note="91" file="dancing/LJ01560A.WMF.svg"/> + <svglayer note="92" file="dancing/LJ01567A.WMF.svg"/> + <svglayer note="93" file="dancing/LJ01569A.WMF.svg"/> + <svglayer note="94" file="dancing/LJ01584A.WMF.svg"/> + <svglayer note="95" file="dancing/LJ01595A.WMF.svg"/> + <svglayer note="96" file="dancing/LJ01596A.WMF.svg"/> + <svglayer note="97" file="dancing/LJ01598A.WMF.svg"/> + <svglayer note="98" file="dancing/LJ01604A.WMF.svg"/> + <svglayer note="99" file="dancing/LJ01698A.WMF.svg"/> + <svglayer note="100" file="dancing/LJ01699A.WMF.svg"/> </playlist> diff --git a/liveengine/bin/data/food.xml b/liveengine/bin/data/food.xml index 10253cd..44c1514 100644 --- a/liveengine/bin/data/food.xml +++ b/liveengine/bin/data/food.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Food"> <svglayer note="36" file="food/E01003B.WMF.svg"/> <svglayer note="37" file="food/E01006B.WMF.svg"/> <svglayer note="38" file="food/E01007C.WMF.svg"/> diff --git a/liveengine/bin/data/insects.xml b/liveengine/bin/data/insects.xml index 68af409..534e45c 100644 --- a/liveengine/bin/data/insects.xml +++ b/liveengine/bin/data/insects.xml @@ -1,57 +1,68 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<playlist> - <svglayer note="36" file="insects/Ag01036x.wmf.svg"/>
-
- <svglayer note="38" file="insects/Bit1123.wmf.svg"/>
- <svglayer note="39" file="insects/Bit1139.wmf.svg"/>
- <svglayer note="40" file="insects/MMA00001.wmf.svg"/>
- <svglayer note="41" file="insects/MMA00002.wmf.svg"/>
- <svglayer note="42" file="insects/MMA00003.wmf.svg"/>
- <svglayer note="43" file="insects/MMA00004.wmf.svg"/>
- <svglayer note="44" file="insects/MMA00005.wmf.svg"/>
- <svglayer note="45" file="insects/MMA00006.wmf.svg"/>
- <svglayer note="46" file="insects/MMA00007.wmf.svg"/>
- <svglayer note="47" file="insects/MMA00008.wmf.svg"/>
- <svglayer note="48" file="insects/MMA00009.wmf.svg"/>
- <svglayer note="49" file="insects/MMA00010.wmf.svg"/>
- <svglayer note="50" file="insects/MMA00011.wmf.svg"/>
- <svglayer note="51" file="insects/MMA00012.wmf.svg"/>
- <svglayer note="52" file="insects/MMA00013.wmf.svg"/>
- <svglayer note="53" file="insects/MMA00014.wmf.svg"/>
- <svglayer note="54" file="insects/MMA00015.wmf.svg"/>
- <svglayer note="55" file="insects/MMA00016.wmf.svg"/>
- <svglayer note="56" file="insects/MMA00017.wmf.svg"/>
- <svglayer note="57" file="insects/MMA00018.wmf.svg"/>
- <svglayer note="58" file="insects/MMA00019.wmf.svg"/>
- <svglayer note="59" file="insects/MMA00020.wmf.svg"/>
- <svglayer note="60" file="insects/MMA00021.wmf.svg"/>
- <svglayer note="61" file="insects/MMA00022.wmf.svg"/>
- <svglayer note="62" file="insects/MMA00023.wmf.svg"/>
- <svglayer note="63" file="insects/MMA00024.wmf.svg"/>
- <svglayer note="64" file="insects/MMA00025.wmf.svg"/>
- <svglayer note="65" file="insects/MMA00026.wmf.svg"/>
- <svglayer note="66" file="insects/MMA00027.wmf.svg"/>
- <svglayer note="67" file="insects/MMA00028.wmf.svg"/>
- <svglayer note="68" file="insects/MMA00029.wmf.svg"/>
- <svglayer note="69" file="insects/MMA00030.wmf.svg"/>
- <svglayer note="70" file="insects/MMA00031.wmf.svg"/>
- <svglayer note="71" file="insects/MMA00032.wmf.svg"/>
- <svglayer note="72" file="insects/MMA00033.wmf.svg"/>
- <svglayer note="73" file="insects/MMA00034.wmf.svg"/>
- <svglayer note="74" file="insects/MMA00035.wmf.svg"/>
- <svglayer note="75" file="insects/MMA00036.wmf.svg"/>
- <svglayer note="76" file="insects/MMA00037.wmf.svg"/>
- <svglayer note="77" file="insects/MMA00038.wmf.svg"/>
- <svglayer note="78" file="insects/MMA00039.wmf.svg"/>
- <svglayer note="79" file="insects/MMA00040.wmf.svg"/>
- <svglayer note="80" file="insects/MMA00041.wmf.svg"/>
- <svglayer note="81" file="insects/MMA00042.wmf.svg"/>
- <svglayer note="82" file="insects/MMA00043.wmf.svg"/>
- <svglayer note="83" file="insects/MMA00044.wmf.svg"/>
- <svglayer note="84" file="insects/MMA00045.wmf.svg"/>
- <svglayer note="85" file="insects/MMA00046.wmf.svg"/>
- <svglayer note="86" file="insects/MMA00047.wmf.svg"/>
- <svglayer note="87" file="insects/MMA00048.wmf.svg"/>
- <svglayer note="88" file="insects/MMA00049.wmf.svg"/>
- <svglayer note="89" file="insects/MMA00050.wmf.svg"/> +<?xml version='1.0' encoding='utf-8'?> +<playlist name="Insects"> + <svglayer note="36" file="insects/Ag01036x.wmf.svg"/> + <svglayer note="37" file="insects/Bit1120.wmf.svg"/> + <svglayer note="38" file="insects/Bit1123.wmf.svg"/> + <svglayer note="39" file="insects/Bit1139.wmf.svg"/> + <svglayer note="40" file="insects/MMA00001.wmf.svg"/> + <svglayer note="41" file="insects/MMA00002.wmf.svg"/> + <svglayer note="42" file="insects/MMA00003.wmf.svg"/> + <svglayer note="43" file="insects/MMA00004.wmf.svg"/> + <svglayer note="44" file="insects/MMA00005.wmf.svg"/> + <svglayer note="45" file="insects/MMA00006.wmf.svg"/> + <svglayer note="46" file="insects/MMA00007.wmf.svg"/> + <svglayer note="47" file="insects/MMA00008.wmf.svg"/> + <svglayer note="48" file="insects/MMA00009.wmf.svg"/> + <svglayer note="49" file="insects/MMA00010.wmf.svg"/> + <svglayer note="50" file="insects/MMA00011.wmf.svg"/> + <svglayer note="51" file="insects/MMA00012.wmf.svg"/> + <svglayer note="52" file="insects/MMA00013.wmf.svg"/> + <svglayer note="53" file="insects/MMA00014.wmf.svg"/> + <svglayer note="54" file="insects/MMA00015.wmf.svg"/> + <svglayer note="55" file="insects/MMA00016.wmf.svg"/> + <svglayer note="56" file="insects/MMA00017.wmf.svg"/> + <svglayer note="57" file="insects/MMA00018.wmf.svg"/> + <svglayer note="58" file="insects/MMA00019.wmf.svg"/> + <svglayer note="59" file="insects/MMA00020.wmf.svg"/> + <svglayer note="60" file="insects/MMA00021.wmf.svg"/> + <svglayer note="61" file="insects/MMA00022.wmf.svg"/> + <svglayer note="62" file="insects/MMA00023.wmf.svg"/> + <svglayer note="63" file="insects/MMA00024.wmf.svg"/> + <svglayer note="64" file="insects/MMA00025.wmf.svg"/> + <svglayer note="65" file="insects/MMA00026.wmf.svg"/> + <svglayer note="66" file="insects/MMA00027.wmf.svg"/> + <svglayer note="67" file="insects/MMA00028.wmf.svg"/> + <svglayer note="68" file="insects/MMA00029.wmf.svg"/> + <svglayer note="69" file="insects/MMA00030.wmf.svg"/> + <svglayer note="70" file="insects/MMA00031.wmf.svg"/> + <svglayer note="71" file="insects/MMA00032.wmf.svg"/> + <svglayer note="72" file="insects/MMA00033.wmf.svg"/> + <svglayer note="73" file="insects/MMA00034.wmf.svg"/> + <svglayer note="74" file="insects/MMA00035.wmf.svg"/> + <svglayer note="75" file="insects/MMA00036.wmf.svg"/> + <svglayer note="76" file="insects/MMA00037.wmf.svg"/> + <svglayer note="77" file="insects/MMA00038.wmf.svg"/> + <svglayer note="78" file="insects/MMA00039.wmf.svg"/> + <svglayer note="79" file="insects/MMA00040.wmf.svg"/> + <svglayer note="80" file="insects/MMA00041.wmf.svg"/> + <svglayer note="81" file="insects/MMA00042.wmf.svg"/> + <svglayer note="82" file="insects/MMA00043.wmf.svg"/> + <svglayer note="83" file="insects/MMA00044.wmf.svg"/> + <svglayer note="84" file="insects/MMA00045.wmf.svg"/> + <svglayer note="85" file="insects/MMA00046.wmf.svg"/> + <svglayer note="86" file="insects/MMA00047.wmf.svg"/> + <svglayer note="87" file="insects/MMA00048.wmf.svg"/> + <svglayer note="88" file="insects/MMA00049.wmf.svg"/> + <svglayer note="89" file="insects/MMA00050.wmf.svg"/> + <svglayer note="90" file="insects/MMA00051.wmf.svg"/> + <svglayer note="91" file="insects/MMA00052.wmf.svg"/> + <svglayer note="92" file="insects/ag01501a.wmf.svg"/> + <svglayer note="93" file="insects/ag01502a.wmf.svg"/> + <svglayer note="94" file="insects/ag01503a.wmf.svg"/> + <svglayer note="95" file="insects/ag01504a.wmf.svg"/> + <svglayer note="96" file="insects/ag01505a.wmf.svg"/> + <svglayer note="97" file="insects/ag01506a.wmf.svg"/> + <svglayer note="98" file="insects/ag01507a.wmf.svg"/> + <svglayer note="99" file="insects/ag35003b.wmf.svg"/> + <svglayer note="100" file="insects/ag35004b.wmf.svg"/> </playlist> diff --git a/liveengine/bin/data/makeplaylist.py b/liveengine/bin/data/makeplaylist.py index 92ff865..2376f3d 100755 --- a/liveengine/bin/data/makeplaylist.py +++ b/liveengine/bin/data/makeplaylist.py @@ -1,26 +1,32 @@ #!/usr/bin/python from lxml import etree -import sys,os +import sys,os,random if len(sys.argv)<2: - print "usage: makeplaylist source_directory" + print "usage: makeplaylist source_directory playlist_name" sys.exit(0) sourcedir=sys.argv[1] +playlistname=sys.argv[1] -page = etree.Element('playlist') +if len(sys.argv)>2: + playlistname=sys.argv[2] + +page = etree.Element('playlist',name=playlistname) doc = etree.ElementTree(page) dirList=sorted(os.listdir(sourcedir)) -note = 36 -while note<100: +nums=range(64) +random.shuffle(nums) +note = 0 +while note<64: for fname in dirList: pageElement = etree.SubElement(page, 'svglayer', - note=str(note), + note=str(nums[note]+36), file=sourcedir+"/"+fname) note +=1 - if note>100: + if note>63: break file= open(sourcedir+".xml", "w") diff --git a/liveengine/bin/data/mil_historic.xml b/liveengine/bin/data/mil_historic.xml index 3f8f9e7..20101c3 100644 --- a/liveengine/bin/data/mil_historic.xml +++ b/liveengine/bin/data/mil_historic.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Historic Military"> <svglayer note="36" file="mil_historic/LD01187A.WMF.svg"/> <svglayer note="37" file="mil_historic/LD01196A.WMF.svg"/> <svglayer note="38" file="mil_historic/LD01225A.WMF.svg"/> diff --git a/liveengine/bin/data/military_ethnic.xml b/liveengine/bin/data/military_ethnic.xml index babad30..01486b8 100644 --- a/liveengine/bin/data/military_ethnic.xml +++ b/liveengine/bin/data/military_ethnic.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Ethnic Military"> <svglayer note="36" file="military_ethnic/NA01408A.WMF.svg"/> <svglayer note="37" file="military_ethnic/NA01419A.WMF.svg"/> <svglayer note="38" file="military_ethnic/NA01422A.WMF.svg"/> diff --git a/liveengine/bin/data/miltary_ladies.xml b/liveengine/bin/data/miltary_ladies.xml deleted file mode 100644 index 4cabbd4..0000000 --- a/liveengine/bin/data/miltary_ladies.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<playlist> - <svglayer note="36" file="miltary_ladies/LH01116A.WMF.svg"/> - <svglayer note="37" file="miltary_ladies/LH01117A.WMF.svg"/> - <svglayer note="38" file="miltary_ladies/LH01118A.WMF.svg"/> - <svglayer note="39" file="miltary_ladies/LH01119A.WMF.svg"/> - <svglayer note="40" file="miltary_ladies/LH01122A.WMF.svg"/> - <svglayer note="41" file="miltary_ladies/LH01123A.WMF.svg"/> - <svglayer note="42" file="miltary_ladies/LH01124A.WMF.svg"/> - <svglayer note="43" file="miltary_ladies/LH01173A.WMF.svg"/> - <svglayer note="44" file="miltary_ladies/LH01174A.WMF.svg"/> - <svglayer note="45" file="miltary_ladies/LH01183A.WMF.svg"/> - <svglayer note="46" file="miltary_ladies/LH01184A.WMF.svg"/> - <svglayer note="47" file="miltary_ladies/LH01212A.WMF.svg"/> - <svglayer note="48" file="miltary_ladies/LH01116A.WMF.svg"/> - <svglayer note="49" file="miltary_ladies/LH01117A.WMF.svg"/> - <svglayer note="50" file="miltary_ladies/LH01118A.WMF.svg"/> - <svglayer note="51" file="miltary_ladies/LH01119A.WMF.svg"/> - <svglayer note="52" file="miltary_ladies/LH01122A.WMF.svg"/> - <svglayer note="53" file="miltary_ladies/LH01123A.WMF.svg"/> - <svglayer note="54" file="miltary_ladies/LH01124A.WMF.svg"/> - <svglayer note="55" file="miltary_ladies/LH01173A.WMF.svg"/> - <svglayer note="56" file="miltary_ladies/LH01174A.WMF.svg"/> - <svglayer note="57" file="miltary_ladies/LH01183A.WMF.svg"/> - <svglayer note="58" file="miltary_ladies/LH01184A.WMF.svg"/> - <svglayer note="59" file="miltary_ladies/LH01212A.WMF.svg"/> - <svglayer note="60" file="miltary_ladies/LH01116A.WMF.svg"/> - <svglayer note="61" file="miltary_ladies/LH01117A.WMF.svg"/> - <svglayer note="62" file="miltary_ladies/LH01118A.WMF.svg"/> - <svglayer note="63" file="miltary_ladies/LH01119A.WMF.svg"/> - <svglayer note="64" file="miltary_ladies/LH01122A.WMF.svg"/> - <svglayer note="65" file="miltary_ladies/LH01123A.WMF.svg"/> - <svglayer note="66" file="miltary_ladies/LH01124A.WMF.svg"/> - <svglayer note="67" file="miltary_ladies/LH01173A.WMF.svg"/> - <svglayer note="68" file="miltary_ladies/LH01174A.WMF.svg"/> - <svglayer note="69" file="miltary_ladies/LH01183A.WMF.svg"/> - <svglayer note="70" file="miltary_ladies/LH01184A.WMF.svg"/> - <svglayer note="71" file="miltary_ladies/LH01212A.WMF.svg"/> - <svglayer note="72" file="miltary_ladies/LH01116A.WMF.svg"/> - <svglayer note="73" file="miltary_ladies/LH01117A.WMF.svg"/> - <svglayer note="74" file="miltary_ladies/LH01118A.WMF.svg"/> - <svglayer note="75" file="miltary_ladies/LH01119A.WMF.svg"/> - <svglayer note="76" file="miltary_ladies/LH01122A.WMF.svg"/> - <svglayer note="77" file="miltary_ladies/LH01123A.WMF.svg"/> - <svglayer note="78" file="miltary_ladies/LH01124A.WMF.svg"/> - <svglayer note="79" file="miltary_ladies/LH01173A.WMF.svg"/> - <svglayer note="80" file="miltary_ladies/LH01174A.WMF.svg"/> - <svglayer note="81" file="miltary_ladies/LH01183A.WMF.svg"/> - <svglayer note="82" file="miltary_ladies/LH01184A.WMF.svg"/> - <svglayer note="83" file="miltary_ladies/LH01212A.WMF.svg"/> - <svglayer note="84" file="miltary_ladies/LH01116A.WMF.svg"/> - <svglayer note="85" file="miltary_ladies/LH01117A.WMF.svg"/> - <svglayer note="86" file="miltary_ladies/LH01118A.WMF.svg"/> - <svglayer note="87" file="miltary_ladies/LH01119A.WMF.svg"/> - <svglayer note="88" file="miltary_ladies/LH01122A.WMF.svg"/> - <svglayer note="89" file="miltary_ladies/LH01123A.WMF.svg"/> - <svglayer note="90" file="miltary_ladies/LH01124A.WMF.svg"/> - <svglayer note="91" file="miltary_ladies/LH01173A.WMF.svg"/> - <svglayer note="92" file="miltary_ladies/LH01174A.WMF.svg"/> - <svglayer note="93" file="miltary_ladies/LH01183A.WMF.svg"/> - <svglayer note="94" file="miltary_ladies/LH01184A.WMF.svg"/> - <svglayer note="95" file="miltary_ladies/LH01212A.WMF.svg"/> - <svglayer note="96" file="miltary_ladies/LH01116A.WMF.svg"/> - <svglayer note="97" file="miltary_ladies/LH01117A.WMF.svg"/> - <svglayer note="98" file="miltary_ladies/LH01118A.WMF.svg"/> - <svglayer note="99" file="miltary_ladies/LH01119A.WMF.svg"/> - <svglayer note="100" file="miltary_ladies/LH01122A.WMF.svg"/> -</playlist> diff --git a/liveengine/bin/data/organs.xml b/liveengine/bin/data/organs.xml index dba72d4..3b1c530 100644 --- a/liveengine/bin/data/organs.xml +++ b/liveengine/bin/data/organs.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Organs"> <svglayer note="36" file="organs/ABS1.WMF.svg"/> <svglayer note="37" file="organs/ABS2.WMF.svg"/> <svglayer note="38" file="organs/ANATM003.WMF.svg"/> diff --git a/liveengine/bin/data/reptiles.xml b/liveengine/bin/data/reptiles.xml index 7113a35..ca38f60 100644 --- a/liveengine/bin/data/reptiles.xml +++ b/liveengine/bin/data/reptiles.xml @@ -1,69 +1,68 @@ -<?xml version="1.0" encoding="UTF-8" ?>
-<playlist>
- <svglayer note="36" file="reptiles/01LIZARD.WMF.svg"/>
- <svglayer note="37" file="reptiles/AA01001A.WMF.svg"/>
- <svglayer note="38" file="reptiles/AA01002A.WMF.svg"/>
- <svglayer note="39" file="reptiles/AA01003A.WMF.svg"/>
- <svglayer note="40" file="reptiles/AA01004A.WMF.svg"/>
- <svglayer note="41" file="reptiles/AA01005A.WMF.svg"/>
- <svglayer note="42" file="reptiles/AA01006A.WMF.svg"/>
- <svglayer note="43" file="reptiles/AA01008A.WMF.svg"/>
- <svglayer note="44" file="reptiles/AA01009A.WMF.svg"/>
- <svglayer note="45" file="reptiles/AA01010A.WMF.svg"/>
- <svglayer note="46" file="reptiles/AA01011A.WMF.svg"/>
- <svglayer note="47" file="reptiles/AA01012A.WMF.svg"/>
- <svglayer note="48" file="reptiles/AA01013A.WMF.svg"/>
- <svglayer note="49" file="reptiles/AA01014A.WMF.svg"/>
- <svglayer note="50" file="reptiles/AA01015A.WMF.svg"/>
- <svglayer note="51" file="reptiles/AA01016A.WMF.svg"/>
- <svglayer note="52" file="reptiles/CS000343.WMF.svg"/>
- <svglayer note="53" file="reptiles/AA01018A.WMF.svg"/>
- <svglayer note="54" file="reptiles/AA01019A.WMF.svg"/>
- <svglayer note="55" file="reptiles/AA01020A.WMF.svg"/>
- <svglayer note="56" file="reptiles/AA01021A.WMF.svg"/>
- <svglayer note="57" file="reptiles/AA01022A.WMF.svg"/>
- <svglayer note="58" file="reptiles/AA01023A.WMF.svg"/>
- <svglayer note="59" file="reptiles/AA01024A.WMF.svg"/>
- <svglayer note="60" file="reptiles/AA01025A.WMF.svg"/>
- <svglayer note="61" file="reptiles/AA01026A.WMF.svg"/>
- <svglayer note="62" file="reptiles/AA01027A.WMF.svg"/>
- <svglayer note="63" file="reptiles/AA01028A.WMF.svg"/>
- <svglayer note="64" file="reptiles/AA01029A.WMF.svg"/>
- <svglayer note="65" file="reptiles/AA01030A.WMF.svg"/>
- <svglayer note="66" file="reptiles/AA01031A.WMF.svg"/>
- <svglayer note="67" file="reptiles/AA01032A.WMF.svg"/>
- <svglayer note="68" file="reptiles/AA01033A.WMF.svg"/>
- <svglayer note="69" file="reptiles/AA01034A.WMF.svg"/>
- <svglayer note="70" file="reptiles/AA01035A.WMF.svg"/>
- <svglayer note="71" file="reptiles/AA01036A.WMF.svg"/>
- <svglayer note="72" file="reptiles/AA01037A.WMF.svg"/>
- <svglayer note="73" file="reptiles/AA01038A.WMF.svg"/>
- <svglayer note="74" file="reptiles/AA01039A.WMF.svg"/>
- <svglayer note="75" file="reptiles/AA01040A.WMF.svg"/>
- <svglayer note="76" file="reptiles/AA01041A.WMF.svg"/>
- <svglayer note="77" file="reptiles/AA01042A.WMF.svg"/>
- <svglayer note="78" file="reptiles/AA01043A.WMF.svg"/>
- <svglayer note="79" file="reptiles/AA01044A.WMF.svg"/>
- <svglayer note="80" file="reptiles/AA01045A.WMF.svg"/>
- <svglayer note="81" file="reptiles/AA01046A.WMF.svg"/>
- <svglayer note="82" file="reptiles/AA01047A.WMF.svg"/>
- <svglayer note="83" file="reptiles/AA01048A.WMF.svg"/>
- <svglayer note="84" file="reptiles/AA01049A.WMF.svg"/>
- <svglayer note="85" file="reptiles/AA01050A.WMF.svg"/>
- <svglayer note="86" file="reptiles/AA01051A.WMF.svg"/>
- <svglayer note="87" file="reptiles/AA01052A.WMF.svg"/>
- <svglayer note="88" file="reptiles/AA01053A.WMF.svg"/>
- <svglayer note="89" file="reptiles/AA01054A.WMF.svg"/>
- <svglayer note="90" file="reptiles/AA01055A.WMF.svg"/>
- <svglayer note="91" file="reptiles/AA01056A.WMF.svg"/>
- <svglayer note="92" file="reptiles/AA01057A.WMF.svg"/>
- <svglayer note="93" file="reptiles/AA01058A.WMF.svg"/>
- <svglayer note="94" file="reptiles/AA01059A.WMF.svg"/>
- <svglayer note="95" file="reptiles/AA01060A.WMF.svg"/>
- <svglayer note="96" file="reptiles/AA01061A.WMF.svg"/>
- <svglayer note="97" file="reptiles/AA01062A.WMF.svg"/>
- <svglayer note="98" file="reptiles/AA01063A.WMF.svg"/>
- <svglayer note="99" file="reptiles/AA01064A.WMF.svg"/>
- <svglayer note="100" file="reptiles/AA01065A.WMF.svg"/>
-</playlist>
- +<?xml version='1.0' encoding='utf-8'?> +<playlist name="Reptiles"> + <svglayer note="36" file="reptiles/01LIZARD.WMF.svg"/> + <svglayer note="37" file="reptiles/AA01001A.WMF.svg"/> + <svglayer note="38" file="reptiles/AA01002A.WMF.svg"/> + <svglayer note="39" file="reptiles/AA01003A.WMF.svg"/> + <svglayer note="40" file="reptiles/AA01004A.WMF.svg"/> + <svglayer note="41" file="reptiles/AA01005A.WMF.svg"/> + <svglayer note="42" file="reptiles/AA01006A.WMF.svg"/> + <svglayer note="43" file="reptiles/AA01008A.WMF.svg"/> + <svglayer note="44" file="reptiles/AA01009A.WMF.svg"/> + <svglayer note="45" file="reptiles/AA01010A.WMF.svg"/> + <svglayer note="46" file="reptiles/AA01011A.WMF.svg"/> + <svglayer note="47" file="reptiles/AA01012A.WMF.svg"/> + <svglayer note="48" file="reptiles/AA01013A.WMF.svg"/> + <svglayer note="49" file="reptiles/AA01014A.WMF.svg"/> + <svglayer note="50" file="reptiles/AA01015A.WMF.svg"/> + <svglayer note="51" file="reptiles/AA01016A.WMF.svg"/> + <svglayer note="52" file="reptiles/AA01018A.WMF.svg"/> + <svglayer note="53" file="reptiles/AA01019A.WMF.svg"/> + <svglayer note="54" file="reptiles/AA01020A.WMF.svg"/> + <svglayer note="55" file="reptiles/AA01021A.WMF.svg"/> + <svglayer note="56" file="reptiles/AA01022A.WMF.svg"/> + <svglayer note="57" file="reptiles/AA01023A.WMF.svg"/> + <svglayer note="58" file="reptiles/AA01024A.WMF.svg"/> + <svglayer note="59" file="reptiles/AA01025A.WMF.svg"/> + <svglayer note="60" file="reptiles/AA01026A.WMF.svg"/> + <svglayer note="61" file="reptiles/AA01027A.WMF.svg"/> + <svglayer note="62" file="reptiles/AA01028A.WMF.svg"/> + <svglayer note="63" file="reptiles/AA01029A.WMF.svg"/> + <svglayer note="64" file="reptiles/AA01030A.WMF.svg"/> + <svglayer note="65" file="reptiles/AA01031A.WMF.svg"/> + <svglayer note="66" file="reptiles/AA01032A.WMF.svg"/> + <svglayer note="67" file="reptiles/AA01033A.WMF.svg"/> + <svglayer note="68" file="reptiles/AA01034A.WMF.svg"/> + <svglayer note="69" file="reptiles/AA01035A.WMF.svg"/> + <svglayer note="70" file="reptiles/AA01036A.WMF.svg"/> + <svglayer note="71" file="reptiles/AA01037A.WMF.svg"/> + <svglayer note="72" file="reptiles/AA01038A.WMF.svg"/> + <svglayer note="73" file="reptiles/AA01039A.WMF.svg"/> + <svglayer note="74" file="reptiles/AA01040A.WMF.svg"/> + <svglayer note="75" file="reptiles/AA01041A.WMF.svg"/> + <svglayer note="76" file="reptiles/AA01042A.WMF.svg"/> + <svglayer note="77" file="reptiles/AA01043A.WMF.svg"/> + <svglayer note="78" file="reptiles/AA01044A.WMF.svg"/> + <svglayer note="79" file="reptiles/AA01045A.WMF.svg"/> + <svglayer note="80" file="reptiles/AA01046A.WMF.svg"/> + <svglayer note="81" file="reptiles/AA01047A.WMF.svg"/> + <svglayer note="82" file="reptiles/AA01048A.WMF.svg"/> + <svglayer note="83" file="reptiles/AA01049A.WMF.svg"/> + <svglayer note="84" file="reptiles/AA01050A.WMF.svg"/> + <svglayer note="85" file="reptiles/AA01051A.WMF.svg"/> + <svglayer note="86" file="reptiles/AA01052A.WMF.svg"/> + <svglayer note="87" file="reptiles/AA01053A.WMF.svg"/> + <svglayer note="88" file="reptiles/AA01054A.WMF.svg"/> + <svglayer note="89" file="reptiles/AA01055A.WMF.svg"/> + <svglayer note="90" file="reptiles/AA01056A.WMF.svg"/> + <svglayer note="91" file="reptiles/AA01057A.WMF.svg"/> + <svglayer note="92" file="reptiles/AA01058A.WMF.svg"/> + <svglayer note="93" file="reptiles/AA01059A.WMF.svg"/> + <svglayer note="94" file="reptiles/AA01060A.WMF.svg"/> + <svglayer note="95" file="reptiles/AA01061A.WMF.svg"/> + <svglayer note="96" file="reptiles/AA01062A.WMF.svg"/> + <svglayer note="97" file="reptiles/AA01063A.WMF.svg"/> + <svglayer note="98" file="reptiles/AA01064A.WMF.svg"/> + <svglayer note="99" file="reptiles/AA01065A.WMF.svg"/> + <svglayer note="100" file="reptiles/AA01066A.WMF.svg"/> +</playlist> diff --git a/liveengine/bin/data/settings.xml b/liveengine/bin/data/settings.xml index 68896b8..d1af114 100755 --- a/liveengine/bin/data/settings.xml +++ b/liveengine/bin/data/settings.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?>
<liveEngine port="1" channel="0">
+ <viewport mapped="1" w="1024" h="768" x="0" y="0" rot="0" ox="-512" oy="-384"/>
</liveEngine>
diff --git a/liveengine/bin/data/tai_chi.xml b/liveengine/bin/data/tai_chi.xml index 58b891b..4488753 100644 --- a/liveengine/bin/data/tai_chi.xml +++ b/liveengine/bin/data/tai_chi.xml @@ -1,69 +1,68 @@ -<?xml version="1.0" encoding="UTF-8" ?>
-<playlist>
- <svglayer note="36" file="tai_chi/RG01030A.WMF.svg"/>
- <svglayer note="37" file="tai_chi/RG01031A.WMF.svg"/>
- <svglayer note="38" file="tai_chi/RG01032A.WMF.svg"/>
- <svglayer note="39" file="tai_chi/RG01033A.WMF.svg"/>
- <svglayer note="40" file="tai_chi/RG01034A.WMF.svg"/>
- <svglayer note="41" file="tai_chi/RG01035A.WMF.svg"/>
- <svglayer note="42" file="tai_chi/RG01036A.WMF.svg"/>
- <svglayer note="43" file="tai_chi/RG01037A.WMF.svg"/>
- <svglayer note="44" file="tai_chi/RG01038A.WMF.svg"/>
- <svglayer note="45" file="tai_chi/RG01039A.WMF.svg"/>
- <svglayer note="46" file="tai_chi/RG01040A.WMF.svg"/>
- <svglayer note="47" file="tai_chi/RG01041A.WMF.svg"/>
- <svglayer note="48" file="tai_chi/RG01042A.WMF.svg"/>
- <svglayer note="49" file="tai_chi/RG01043A.WMF.svg"/>
- <svglayer note="50" file="tai_chi/RG01044A.WMF.svg"/>
- <svglayer note="51" file="tai_chi/RG01045A.WMF.svg"/>
- <svglayer note="52" file="tai_chi/RG01046A.WMF.svg"/>
- <svglayer note="53" file="tai_chi/RG01047A.WMF.svg"/>
- <svglayer note="54" file="tai_chi/RG01048A.WMF.svg"/>
- <svglayer note="55" file="tai_chi/RG01049A.WMF.svg"/>
- <svglayer note="56" file="tai_chi/RG01050A.WMF.svg"/>
- <svglayer note="57" file="tai_chi/RG01051A.WMF.svg"/>
- <svglayer note="58" file="tai_chi/RG01052A.WMF.svg"/>
- <svglayer note="59" file="tai_chi/RG01053A.WMF.svg"/>
- <svglayer note="60" file="tai_chi/RG01054A.WMF.svg"/>
- <svglayer note="61" file="tai_chi/RG01055A.WMF.svg"/>
- <svglayer note="62" file="tai_chi/RG01056A.WMF.svg"/>
- <svglayer note="63" file="tai_chi/RG01057A.WMF.svg"/>
- <svglayer note="64" file="tai_chi/RG01058A.WMF.svg"/>
- <svglayer note="65" file="tai_chi/RG01059A.WMF.svg"/>
- <svglayer note="66" file="tai_chi/RG01060A.WMF.svg"/>
- <svglayer note="67" file="tai_chi/RG01061A.WMF.svg"/>
- <svglayer note="68" file="tai_chi/RG01062A.WMF.svg"/>
- <svglayer note="69" file="tai_chi/RG01063A.WMF.svg"/>
- <svglayer note="70" file="tai_chi/RG01064A.WMF.svg"/>
- <svglayer note="71" file="tai_chi/RG01065A.WMF.svg"/>
- <svglayer note="72" file="tai_chi/RG01066A.WMF.svg"/>
- <svglayer note="73" file="tai_chi/RG01067A.WMF.svg"/>
- <svglayer note="74" file="tai_chi/RG01068A.WMF.svg"/>
- <svglayer note="75" file="tai_chi/RG01069A.WMF.svg"/>
- <svglayer note="76" file="tai_chi/RG01070A.WMF.svg"/>
- <svglayer note="77" file="tai_chi/RG01071A.WMF.svg"/>
- <svglayer note="78" file="tai_chi/RG01072A.WMF.svg"/>
- <svglayer note="79" file="tai_chi/RG01073A.WMF.svg"/>
- <svglayer note="80" file="tai_chi/RG01074A.WMF.svg"/>
- <svglayer note="81" file="tai_chi/RG01075A.WMF.svg"/>
- <svglayer note="82" file="tai_chi/RG01076A.WMF.svg"/>
- <svglayer note="83" file="tai_chi/RG01077A.WMF.svg"/>
- <svglayer note="84" file="tai_chi/RG01078A.WMF.svg"/>
- <svglayer note="85" file="tai_chi/RG01079A.WMF.svg"/>
- <svglayer note="86" file="tai_chi/RG01080A.WMF.svg"/>
- <svglayer note="87" file="tai_chi/RG01081A.WMF.svg"/>
- <svglayer note="88" file="tai_chi/RG01082A.WMF.svg"/>
- <svglayer note="89" file="tai_chi/RG01083A.WMF.svg"/>
- <svglayer note="90" file="tai_chi/RG01084A.WMF.svg"/>
- <svglayer note="91" file="tai_chi/RG01085A.WMF.svg"/>
- <svglayer note="92" file="tai_chi/RG01086A.WMF.svg"/>
- <svglayer note="93" file="tai_chi/RG01087A.WMF.svg"/>
- <svglayer note="94" file="tai_chi/RG01088A.WMF.svg"/>
- <svglayer note="95" file="tai_chi/RG01089A.WMF.svg"/>
- <svglayer note="96" file="tai_chi/RG01090A.WMF.svg"/>
- <svglayer note="97" file="tai_chi/RG01095A.WMF.svg"/>
- <svglayer note="98" file="tai_chi/RG01096A.WMF.svg"/>
- <svglayer note="99" file="tai_chi/RG01097A.WMF.svg"/>
- <svglayer note="100" file="tai_chi/RG01098A.WMF.svg"/>
-</playlist>
- +<?xml version='1.0' encoding='utf-8'?> +<playlist name="Tai Chi"> + <svglayer note="36" file="tai_chi/RG01030A.WMF.svg"/> + <svglayer note="37" file="tai_chi/RG01031A.WMF.svg"/> + <svglayer note="38" file="tai_chi/RG01032A.WMF.svg"/> + <svglayer note="39" file="tai_chi/RG01033A.WMF.svg"/> + <svglayer note="40" file="tai_chi/RG01034A.WMF.svg"/> + <svglayer note="41" file="tai_chi/RG01035A.WMF.svg"/> + <svglayer note="42" file="tai_chi/RG01036A.WMF.svg"/> + <svglayer note="43" file="tai_chi/RG01037A.WMF.svg"/> + <svglayer note="44" file="tai_chi/RG01038A.WMF.svg"/> + <svglayer note="45" file="tai_chi/RG01039A.WMF.svg"/> + <svglayer note="46" file="tai_chi/RG01040A.WMF.svg"/> + <svglayer note="47" file="tai_chi/RG01041A.WMF.svg"/> + <svglayer note="48" file="tai_chi/RG01042A.WMF.svg"/> + <svglayer note="49" file="tai_chi/RG01043A.WMF.svg"/> + <svglayer note="50" file="tai_chi/RG01044A.WMF.svg"/> + <svglayer note="51" file="tai_chi/RG01045A.WMF.svg"/> + <svglayer note="52" file="tai_chi/RG01046A.WMF.svg"/> + <svglayer note="53" file="tai_chi/RG01047A.WMF.svg"/> + <svglayer note="54" file="tai_chi/RG01048A.WMF.svg"/> + <svglayer note="55" file="tai_chi/RG01049A.WMF.svg"/> + <svglayer note="56" file="tai_chi/RG01050A.WMF.svg"/> + <svglayer note="57" file="tai_chi/RG01051A.WMF.svg"/> + <svglayer note="58" file="tai_chi/RG01052A.WMF.svg"/> + <svglayer note="59" file="tai_chi/RG01053A.WMF.svg"/> + <svglayer note="60" file="tai_chi/RG01054A.WMF.svg"/> + <svglayer note="61" file="tai_chi/RG01055A.WMF.svg"/> + <svglayer note="62" file="tai_chi/RG01056A.WMF.svg"/> + <svglayer note="63" file="tai_chi/RG01057A.WMF.svg"/> + <svglayer note="64" file="tai_chi/RG01058A.WMF.svg"/> + <svglayer note="65" file="tai_chi/RG01059A.WMF.svg"/> + <svglayer note="66" file="tai_chi/RG01060A.WMF.svg"/> + <svglayer note="67" file="tai_chi/RG01061A.WMF.svg"/> + <svglayer note="68" file="tai_chi/RG01062A.WMF.svg"/> + <svglayer note="69" file="tai_chi/RG01063A.WMF.svg"/> + <svglayer note="70" file="tai_chi/RG01064A.WMF.svg"/> + <svglayer note="71" file="tai_chi/RG01065A.WMF.svg"/> + <svglayer note="72" file="tai_chi/RG01066A.WMF.svg"/> + <svglayer note="73" file="tai_chi/RG01067A.WMF.svg"/> + <svglayer note="74" file="tai_chi/RG01068A.WMF.svg"/> + <svglayer note="75" file="tai_chi/RG01069A.WMF.svg"/> + <svglayer note="76" file="tai_chi/RG01070A.WMF.svg"/> + <svglayer note="77" file="tai_chi/RG01071A.WMF.svg"/> + <svglayer note="78" file="tai_chi/RG01072A.WMF.svg"/> + <svglayer note="79" file="tai_chi/RG01073A.WMF.svg"/> + <svglayer note="80" file="tai_chi/RG01074A.WMF.svg"/> + <svglayer note="81" file="tai_chi/RG01075A.WMF.svg"/> + <svglayer note="82" file="tai_chi/RG01076A.WMF.svg"/> + <svglayer note="83" file="tai_chi/RG01077A.WMF.svg"/> + <svglayer note="84" file="tai_chi/RG01078A.WMF.svg"/> + <svglayer note="85" file="tai_chi/RG01079A.WMF.svg"/> + <svglayer note="86" file="tai_chi/RG01080A.WMF.svg"/> + <svglayer note="87" file="tai_chi/RG01081A.WMF.svg"/> + <svglayer note="88" file="tai_chi/RG01082A.WMF.svg"/> + <svglayer note="89" file="tai_chi/RG01083A.WMF.svg"/> + <svglayer note="90" file="tai_chi/RG01084A.WMF.svg"/> + <svglayer note="91" file="tai_chi/RG01085A.WMF.svg"/> + <svglayer note="92" file="tai_chi/RG01086A.WMF.svg"/> + <svglayer note="93" file="tai_chi/RG01087A.WMF.svg"/> + <svglayer note="94" file="tai_chi/RG01088A.WMF.svg"/> + <svglayer note="95" file="tai_chi/RG01089A.WMF.svg"/> + <svglayer note="96" file="tai_chi/RG01090A.WMF.svg"/> + <svglayer note="97" file="tai_chi/RG01095A.WMF.svg"/> + <svglayer note="98" file="tai_chi/RG01096A.WMF.svg"/> + <svglayer note="99" file="tai_chi/RG01097A.WMF.svg"/> + <svglayer note="100" file="tai_chi/RG01098A.WMF.svg"/> +</playlist> diff --git a/liveengine/bin/data/teamsports.xml b/liveengine/bin/data/teamsports.xml index 3c7ff16..0d16db2 100644 --- a/liveengine/bin/data/teamsports.xml +++ b/liveengine/bin/data/teamsports.xml @@ -1,68 +1,67 @@ -<?xml version='1.0' encoding='utf-8'?> -<playlist> - <svglayer note="36" file="teamsports/HOCKEY1.WMF.svg"/> - <svglayer note="37" file="teamsports/HOCKEY2.WMF.svg"/> - <svglayer note="38" file="teamsports/HOCKEY3.WMF.svg"/> - <svglayer note="39" file="teamsports/HOCKEY4.WMF.svg"/> - <svglayer note="40" file="teamsports/HOCKEYA.WMF.svg"/> - <svglayer note="41" file="teamsports/HOCKEY_1.WMF.svg"/> - <svglayer note="42" file="teamsports/RD01003A.WMF.svg"/> - <svglayer note="43" file="teamsports/RD01021A.WMF.svg"/> - <svglayer note="44" file="teamsports/RD01026A.WMF.svg"/> - <svglayer note="45" file="teamsports/RD01085A.WMF.svg"/> - <svglayer note="46" file="teamsports/RD01104A.WMF.svg"/> - <svglayer note="47" file="teamsports/RD01105A.WMF.svg"/> - <svglayer note="48" file="teamsports/RD01110A.WMF.svg"/> - <svglayer note="49" file="teamsports/RD01111A.WMF.svg"/> +<?xml version='1.0' encoding='UTF-8'?> +<playlist name="teamsports"> + <svglayer note="69" file="teamsports/HOCKEY1.WMF.svg"/> + <svglayer note="57" file="teamsports/HOCKEY2.WMF.svg"/> + <svglayer note="71" file="teamsports/HOCKEY3.WMF.svg"/> + <svglayer note="51" file="teamsports/HOCKEY4.WMF.svg"/> + <svglayer note="42" file="teamsports/HOCKEYA.WMF.svg"/> + <svglayer note="88" file="teamsports/HOCKEY_1.WMF.svg"/> + <svglayer note="54" file="teamsports/RD01003A.WMF.svg"/> + <svglayer note="85" file="teamsports/RD01021A.WMF.svg"/> + <svglayer note="76" file="teamsports/RD01026A.WMF.svg"/> + <svglayer note="84" file="teamsports/RD01085A.WMF.svg"/> + <svglayer note="53" file="teamsports/RD01104A.WMF.svg"/> + <svglayer note="90" file="teamsports/RD01105A.WMF.svg"/> + <svglayer note="94" file="teamsports/RD01110A.WMF.svg"/> + <svglayer note="97" file="teamsports/RD01111A.WMF.svg"/> <svglayer note="50" file="teamsports/RD01134A.WMF.svg"/> - <svglayer note="51" file="teamsports/RD01138A.WMF.svg"/> - <svglayer note="52" file="teamsports/RD01166A.WMF.svg"/> - <svglayer note="53" file="teamsports/RD01173A.WMF.svg"/> - <svglayer note="54" file="teamsports/RD01175A.WMF.svg"/> - <svglayer note="55" file="teamsports/RD01177A.WMF.svg"/> - <svglayer note="56" file="teamsports/RD01246A.WMF.svg"/> - <svglayer note="57" file="teamsports/RD01263A.WMF.svg"/> - <svglayer note="58" file="teamsports/RD01264A.WMF.svg"/> - <svglayer note="59" file="teamsports/RD01265A.WMF.svg"/> - <svglayer note="60" file="teamsports/RD01284A.WMF.svg"/> - <svglayer note="61" file="teamsports/RD01285A.WMF.svg"/> - <svglayer note="62" file="teamsports/RD01287A.WMF.svg"/> - <svglayer note="63" file="teamsports/RD01288A.WMF.svg"/> - <svglayer note="64" file="teamsports/RD01289A.WMF.svg"/> - <svglayer note="65" file="teamsports/RD01290A.WMF.svg"/> - <svglayer note="66" file="teamsports/RD01425A.WMF.svg"/> - <svglayer note="67" file="teamsports/RD01427A.WMF.svg"/> - <svglayer note="68" file="teamsports/RD01525A.WMF.svg"/> - <svglayer note="69" file="teamsports/RD01577A.WMF.svg"/> - <svglayer note="70" file="teamsports/RD01586A.WMF.svg"/> - <svglayer note="71" file="teamsports/RD01589A.WMF.svg"/> - <svglayer note="72" file="teamsports/RD01590A.WMF.svg"/> - <svglayer note="73" file="teamsports/RD01593A.WMF.svg"/> - <svglayer note="74" file="teamsports/RD01606A.WMF.svg"/> - <svglayer note="75" file="teamsports/RD01615A.WMF.svg"/> - <svglayer note="76" file="teamsports/RD01617A.WMF.svg"/> - <svglayer note="77" file="teamsports/RD01618A.WMF.svg"/> - <svglayer note="78" file="teamsports/RD01619A.WMF.svg"/> - <svglayer note="79" file="teamsports/RD01620A.WMF.svg"/> - <svglayer note="80" file="teamsports/RD01621A.WMF.svg"/> - <svglayer note="81" file="teamsports/RD01622A.WMF.svg"/> - <svglayer note="82" file="teamsports/RD01627A.WMF.svg"/> - <svglayer note="83" file="teamsports/RD01628A.WMF.svg"/> - <svglayer note="84" file="teamsports/RD01630A.WMF.svg"/> - <svglayer note="85" file="teamsports/RD01631A.WMF.svg"/> - <svglayer note="86" file="teamsports/RD01633A.WMF.svg"/> - <svglayer note="87" file="teamsports/RD01634A.WMF.svg"/> - <svglayer note="88" file="teamsports/RD01636A.WMF.svg"/> - <svglayer note="89" file="teamsports/RD01650A.WMF.svg"/> - <svglayer note="90" file="teamsports/RD01655A.WMF.svg"/> - <svglayer note="91" file="teamsports/RD01661A.WMF.svg"/> - <svglayer note="92" file="teamsports/RD01662A.WMF.svg"/> - <svglayer note="93" file="teamsports/RD01669A.WMF.svg"/> - <svglayer note="94" file="teamsports/RD01674A.WMF.svg"/> - <svglayer note="95" file="teamsports/RD01677A.WMF.svg"/> - <svglayer note="96" file="teamsports/RD01678A.WMF.svg"/> - <svglayer note="97" file="teamsports/RD01680A.WMF.svg"/> - <svglayer note="98" file="teamsports/RD01682A.WMF.svg"/> - <svglayer note="99" file="teamsports/RD01698A.WMF.svg"/> - <svglayer note="100" file="teamsports/RD01699A.WMF.svg"/> + <svglayer note="77" file="teamsports/RD01138A.WMF.svg"/> + <svglayer note="75" file="teamsports/RD01166A.WMF.svg"/> + <svglayer note="89" file="teamsports/RD01173A.WMF.svg"/> + <svglayer note="37" file="teamsports/RD01175A.WMF.svg"/> + <svglayer note="80" file="teamsports/RD01177A.WMF.svg"/> + <svglayer note="36" file="teamsports/RD01246A.WMF.svg"/> + <svglayer note="47" file="teamsports/RD01263A.WMF.svg"/> + <svglayer note="56" file="teamsports/RD01264A.WMF.svg"/> + <svglayer note="46" file="teamsports/RD01265A.WMF.svg"/> + <svglayer note="52" file="teamsports/RD01284A.WMF.svg"/> + <svglayer note="60" file="teamsports/RD01285A.WMF.svg"/> + <svglayer note="74" file="teamsports/RD01287A.WMF.svg"/> + <svglayer note="78" file="teamsports/RD01288A.WMF.svg"/> + <svglayer note="99" file="teamsports/RD01289A.WMF.svg"/> + <svglayer note="92" file="teamsports/RD01290A.WMF.svg"/> + <svglayer note="62" file="teamsports/RD01425A.WMF.svg"/> + <svglayer note="59" file="teamsports/RD01427A.WMF.svg"/> + <svglayer note="91" file="teamsports/RD01525A.WMF.svg"/> + <svglayer note="68" file="teamsports/RD01577A.WMF.svg"/> + <svglayer note="98" file="teamsports/RD01586A.WMF.svg"/> + <svglayer note="55" file="teamsports/RD01589A.WMF.svg"/> + <svglayer note="70" file="teamsports/RD01590A.WMF.svg"/> + <svglayer note="95" file="teamsports/RD01593A.WMF.svg"/> + <svglayer note="66" file="teamsports/RD01606A.WMF.svg"/> + <svglayer note="86" file="teamsports/RD01615A.WMF.svg"/> + <svglayer note="82" file="teamsports/RD01617A.WMF.svg"/> + <svglayer note="72" file="teamsports/RD01618A.WMF.svg"/> + <svglayer note="48" file="teamsports/RD01619A.WMF.svg"/> + <svglayer note="41" file="teamsports/RD01620A.WMF.svg"/> + <svglayer note="83" file="teamsports/RD01621A.WMF.svg"/> + <svglayer note="61" file="teamsports/RD01622A.WMF.svg"/> + <svglayer note="79" file="teamsports/RD01627A.WMF.svg"/> + <svglayer note="45" file="teamsports/RD01628A.WMF.svg"/> + <svglayer note="44" file="teamsports/RD01630A.WMF.svg"/> + <svglayer note="58" file="teamsports/RD01631A.WMF.svg"/> + <svglayer note="67" file="teamsports/RD01633A.WMF.svg"/> + <svglayer note="49" file="teamsports/RD01634A.WMF.svg"/> + <svglayer note="65" file="teamsports/RD01636A.WMF.svg"/> + <svglayer note="38" file="teamsports/RD01650A.WMF.svg"/> + <svglayer note="43" file="teamsports/RD01655A.WMF.svg"/> + <svglayer note="63" file="teamsports/RD01661A.WMF.svg"/> + <svglayer note="81" file="teamsports/RD01662A.WMF.svg"/> + <svglayer note="40" file="teamsports/RD01669A.WMF.svg"/> + <svglayer note="73" file="teamsports/RD01674A.WMF.svg"/> + <svglayer note="39" file="teamsports/RD01677A.WMF.svg"/> + <svglayer note="93" file="teamsports/RD01678A.WMF.svg"/> + <svglayer note="96" file="teamsports/RD01680A.WMF.svg"/> + <svglayer note="64" file="teamsports/RD01682A.WMF.svg"/> + <svglayer note="87" file="teamsports/RD01698A.WMF.svg"/> </playlist> diff --git a/liveengine/bin/data/tools.xml b/liveengine/bin/data/tools.xml index f18f439..7cca131 100644 --- a/liveengine/bin/data/tools.xml +++ b/liveengine/bin/data/tools.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Tools"> <svglayer note="36" file="tools/Bit0605.wmf.svg"/> <svglayer note="37" file="tools/Bit0607.wmf.svg"/> <svglayer note="38" file="tools/Bit0608.wmf.svg"/> diff --git a/liveengine/bin/data/trainers.xml b/liveengine/bin/data/trainers.xml index 624be8d..51520c6 100644 --- a/liveengine/bin/data/trainers.xml +++ b/liveengine/bin/data/trainers.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Trainers"> <svglayer note="36" file="trainers/adidas01.svg"/> <svglayer note="37" file="trainers/adidas02.svg"/> <svglayer note="38" file="trainers/adidas03.svg"/> diff --git a/liveengine/bin/data/women_ethnic.xml b/liveengine/bin/data/women_ethnic.xml index c0f9917..629ce55 100644 --- a/liveengine/bin/data/women_ethnic.xml +++ b/liveengine/bin/data/women_ethnic.xml @@ -1,70 +1,68 @@ -
-<?xml version="1.0" encoding="UTF-8" ?>
-<playlist>
- <svglayer note="36" file="women_ethnic/NA01013A.WMF.svg"/>
- <svglayer note="37" file="women_ethnic/NA01014A.WMF.svg"/>
- <svglayer note="38" file="women_ethnic/NA01017A.WMF.svg"/>
- <svglayer note="39" file="women_ethnic/NA01018A.WMF.svg"/>
- <svglayer note="40" file="women_ethnic/NA01020A.WMF.svg"/>
- <svglayer note="41" file="women_ethnic/NA01024A.WMF.svg"/>
- <svglayer note="42" file="women_ethnic/NA01025A.WMF.svg"/>
- <svglayer note="43" file="women_ethnic/NA01028A.WMF.svg"/>
- <svglayer note="44" file="women_ethnic/NA01029A.WMF.svg"/>
- <svglayer note="45" file="women_ethnic/NA01031A.WMF.svg"/>
- <svglayer note="46" file="women_ethnic/NA01038A.WMF.svg"/>
- <svglayer note="47" file="women_ethnic/NA01040A.WMF.svg"/>
- <svglayer note="48" file="women_ethnic/NA01041A.WMF.svg"/>
- <svglayer note="49" file="women_ethnic/NA01042A.WMF.svg"/>
- <svglayer note="50" file="women_ethnic/NA01032A.WMF.svg"/>
- <svglayer note="51" file="women_ethnic/NA01043A.WMF.svg"/>
- <svglayer note="52" file="women_ethnic/NA01092A.WMF.svg"/>
- <svglayer note="53" file="women_ethnic/NA01093A.WMF.svg"/>
- <svglayer note="54" file="women_ethnic/NA01095A.WMF.svg"/>
- <svglayer note="55" file="women_ethnic/NA01099A.WMF.svg"/>
- <svglayer note="56" file="women_ethnic/NA01100A.WMF.svg"/>
- <svglayer note="57" file="women_ethnic/NA01101A.WMF.svg"/>
- <svglayer note="58" file="women_ethnic/NA01104A.WMF.svg"/>
- <svglayer note="59" file="women_ethnic/NA01105A.WMF.svg"/>
- <svglayer note="60" file="women_ethnic/NA01106A.WMF.svg"/>
- <svglayer note="61" file="women_ethnic/NA01107A.WMF.svg"/>
- <svglayer note="62" file="women_ethnic/NA01108A.WMF.svg"/>
- <svglayer note="63" file="women_ethnic/NA01109A.WMF.svg"/>
- <svglayer note="64" file="women_ethnic/NA01111A.WMF.svg"/>
- <svglayer note="65" file="women_ethnic/NA01112A.WMF.svg"/>
- <svglayer note="66" file="women_ethnic/NA01115A.WMF.svg"/>
- <svglayer note="67" file="women_ethnic/NA01131A.WMF.svg"/>
- <svglayer note="68" file="women_ethnic/NA01146A.WMF.svg"/>
- <svglayer note="69" file="women_ethnic/NA01147A.WMF.svg"/>
- <svglayer note="70" file="women_ethnic/NA01181A.WMF.svg"/>
- <svglayer note="71" file="women_ethnic/NA01184A.WMF.svg"/>
- <svglayer note="72" file="women_ethnic/NA01194A.WMF.svg"/>
- <svglayer note="73" file="women_ethnic/NA01197A.WMF.svg"/>
- <svglayer note="74" file="women_ethnic/NA01198A.WMF.svg"/>
- <svglayer note="75" file="women_ethnic/NA01233A.WMF.svg"/>
- <svglayer note="76" file="women_ethnic/NA01238A.WMF.svg"/>
- <svglayer note="77" file="women_ethnic/NA01240A.WMF.svg"/>
- <svglayer note="78" file="women_ethnic/NA01244A.WMF.svg"/>
- <svglayer note="79" file="women_ethnic/NA01256A.WMF.svg"/>
- <svglayer note="80" file="women_ethnic/NA01264A.WMF.svg"/>
- <svglayer note="81" file="women_ethnic/NA01276A.WMF.svg"/>
- <svglayer note="82" file="women_ethnic/NA01282A.WMF.svg"/>
- <svglayer note="83" file="women_ethnic/NA01288A.WMF.svg"/>
- <svglayer note="84" file="women_ethnic/NA01292A.WMF.svg"/>
- <svglayer note="85" file="women_ethnic/NA01299A.WMF.svg"/>
- <svglayer note="86" file="women_ethnic/NA01302A.WMF.svg"/>
- <svglayer note="87" file="women_ethnic/NA01308A.WMF.svg"/>
- <svglayer note="88" file="women_ethnic/NA01341A.WMF.svg"/>
- <svglayer note="89" file="women_ethnic/NA01342A.WMF.svg"/>
- <svglayer note="90" file="women_ethnic/NA01343A.WMF.svg"/>
- <svglayer note="91" file="women_ethnic/NA01358A.WMF.svg"/>
- <svglayer note="92" file="women_ethnic/NA01360A.WMF.svg"/>
- <svglayer note="93" file="women_ethnic/NA01380A.WMF.svg"/>
- <svglayer note="94" file="women_ethnic/NA01415A.WMF.svg"/>
- <svglayer note="95" file="women_ethnic/NA01417A.WMF.svg"/>
- <svglayer note="96" file="women_ethnic/NA01425A.WMF.svg"/>
- <svglayer note="97" file="women_ethnic/NA01454A.WMF.svg"/>
- <svglayer note="98" file="women_ethnic/NA01455A.WMF.svg"/>
- <svglayer note="99" file="women_ethnic/NA01456A.WMF.svg"/>
- <svglayer note="100" file="women_ethnic/NA01474A.WMF.svg"/>
-</playlist>
- +<?xml version='1.0' encoding='utf-8'?> +<playlist name="Ethnic Women"> + <svglayer note="36" file="women_ethnic/NA01013A.WMF.svg"/> + <svglayer note="37" file="women_ethnic/NA01014A.WMF.svg"/> + <svglayer note="38" file="women_ethnic/NA01017A.WMF.svg"/> + <svglayer note="39" file="women_ethnic/NA01018A.WMF.svg"/> + <svglayer note="40" file="women_ethnic/NA01020A.WMF.svg"/> + <svglayer note="41" file="women_ethnic/NA01023A.WMF.svg"/> + <svglayer note="42" file="women_ethnic/NA01024A.WMF.svg"/> + <svglayer note="43" file="women_ethnic/NA01025A.WMF.svg"/> + <svglayer note="44" file="women_ethnic/NA01028A.WMF.svg"/> + <svglayer note="45" file="women_ethnic/NA01029A.WMF.svg"/> + <svglayer note="46" file="women_ethnic/NA01031A.WMF.svg"/> + <svglayer note="47" file="women_ethnic/NA01032A.WMF.svg"/> + <svglayer note="48" file="women_ethnic/NA01038A.WMF.svg"/> + <svglayer note="49" file="women_ethnic/NA01039A.WMF.svg"/> + <svglayer note="50" file="women_ethnic/NA01040A.WMF.svg"/> + <svglayer note="51" file="women_ethnic/NA01041A.WMF.svg"/> + <svglayer note="52" file="women_ethnic/NA01042A.WMF.svg"/> + <svglayer note="53" file="women_ethnic/NA01043A.WMF.svg"/> + <svglayer note="54" file="women_ethnic/NA01045A.WMF.svg"/> + <svglayer note="55" file="women_ethnic/NA01061A.WMF.svg"/> + <svglayer note="56" file="women_ethnic/NA01066A.WMF.svg"/> + <svglayer note="57" file="women_ethnic/NA01085A.WMF.svg"/> + <svglayer note="58" file="women_ethnic/NA01089A.WMF.svg"/> + <svglayer note="59" file="women_ethnic/NA01092A.WMF.svg"/> + <svglayer note="60" file="women_ethnic/NA01093A.WMF.svg"/> + <svglayer note="61" file="women_ethnic/NA01095A.WMF.svg"/> + <svglayer note="62" file="women_ethnic/NA01099A.WMF.svg"/> + <svglayer note="63" file="women_ethnic/NA01100A.WMF.svg"/> + <svglayer note="64" file="women_ethnic/NA01101A.WMF.svg"/> + <svglayer note="65" file="women_ethnic/NA01102A.WMF.svg"/> + <svglayer note="66" file="women_ethnic/NA01104A.WMF.svg"/> + <svglayer note="67" file="women_ethnic/NA01105A.WMF.svg"/> + <svglayer note="68" file="women_ethnic/NA01106A.WMF.svg"/> + <svglayer note="69" file="women_ethnic/NA01107A.WMF.svg"/> + <svglayer note="70" file="women_ethnic/NA01108A.WMF.svg"/> + <svglayer note="71" file="women_ethnic/NA01109A.WMF.svg"/> + <svglayer note="72" file="women_ethnic/NA01111A.WMF.svg"/> + <svglayer note="73" file="women_ethnic/NA01112A.WMF.svg"/> + <svglayer note="74" file="women_ethnic/NA01115A.WMF.svg"/> + <svglayer note="75" file="women_ethnic/NA01117A.WMF.svg"/> + <svglayer note="76" file="women_ethnic/NA01124A.WMF.svg"/> + <svglayer note="77" file="women_ethnic/NA01130A.WMF.svg"/> + <svglayer note="78" file="women_ethnic/NA01131A.WMF.svg"/> + <svglayer note="79" file="women_ethnic/NA01146A.WMF.svg"/> + <svglayer note="80" file="women_ethnic/NA01147A.WMF.svg"/> + <svglayer note="81" file="women_ethnic/NA01181A.WMF.svg"/> + <svglayer note="82" file="women_ethnic/NA01184A.WMF.svg"/> + <svglayer note="83" file="women_ethnic/NA01189A.WMF.svg"/> + <svglayer note="84" file="women_ethnic/NA01194A.WMF.svg"/> + <svglayer note="85" file="women_ethnic/NA01197A.WMF.svg"/> + <svglayer note="86" file="women_ethnic/NA01198A.WMF.svg"/> + <svglayer note="87" file="women_ethnic/NA01205A.WMF.svg"/> + <svglayer note="88" file="women_ethnic/NA01206A.WMF.svg"/> + <svglayer note="89" file="women_ethnic/NA01210A.WMF.svg"/> + <svglayer note="90" file="women_ethnic/NA01217A.WMF.svg"/> + <svglayer note="91" file="women_ethnic/NA01219A.WMF.svg"/> + <svglayer note="92" file="women_ethnic/NA01224A.WMF.svg"/> + <svglayer note="93" file="women_ethnic/NA01225A.WMF.svg"/> + <svglayer note="94" file="women_ethnic/NA01226A.WMF.svg"/> + <svglayer note="95" file="women_ethnic/NA01233A.WMF.svg"/> + <svglayer note="96" file="women_ethnic/NA01238A.WMF.svg"/> + <svglayer note="97" file="women_ethnic/NA01240A.WMF.svg"/> + <svglayer note="98" file="women_ethnic/NA01243A.WMF.svg"/> + <svglayer note="99" file="women_ethnic/NA01244A.WMF.svg"/> + <svglayer note="100" file="women_ethnic/NA01245A.WMF.svg"/> +</playlist> diff --git a/liveengine/bin/data/yoga.xml b/liveengine/bin/data/yoga.xml index 5c26932..1fe9793 100644 --- a/liveengine/bin/data/yoga.xml +++ b/liveengine/bin/data/yoga.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<playlist> +<playlist name="Yoga"> <svglayer note="36" file="yoga/RD01004A.WMF.svg"/> <svglayer note="37" file="yoga/RD01005A.WMF.svg"/> <svglayer note="38" file="yoga/RD01006A.WMF.svg"/> diff --git a/liveengine/config.make b/liveengine/config.make index a444a20..4202b4a 100644..100755 --- a/liveengine/config.make +++ b/liveengine/config.make @@ -3,32 +3,54 @@ # OF_ROOT allows to move projects outside apps/* just set this variable to the # absoulte path to the OF root folder -OF_ROOT = ../../openFrameworks-061812 +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 = +USER_CFLAGS = -I $(OF_ROOT)/addons/ofxOpenNI/include/openni -I $(OF_ROOT)/addons/ofxOpenNI/include/nite -I $(OF_ROOT)/addons/ofxOpenNI/src # USER_LDFLAGS allows to pass custom flags to the linker # for example libraries like: -# USER_LD_FLAGS = libs/libawesomelib.a +# USER_LDFLAGS = libs/libawesomelib.a -USER_LDFLAGS = +USER_LDFLAGS = -lOpenNI -# use this to add system libraries for example: -# USER_LIBS = -lpango - -USER_LIBS = - +EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj" # change this to add different compiler optimizations to your project USER_COMPILER_OPTIMIZATION = -march=native -mtune=native -Os -EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj" +# android specific, in case you want to use different optimizations +USER_LIBS_ARM = +USER_LIBS_ARM7 = +USER_LIBS_NEON = + +# android optimizations + +ANDROID_COMPILER_OPTIMIZATION = -Os + +NDK_PLATFORM = android-8 + +# uncomment this for custom application name (if the folder name is different than the application name) +#APPNAME = folderName + +# uncomment this for custom package name, must be the same as the java package that contains OFActivity +#PKGNAME = cc.openframeworks.$(APPNAME) + + + + + +# linux arm flags + +LINUX_ARM7_COMPILER_OPTIMIZATIONS = -march=armv7-a -mtune=cortex-a8 -finline-functions -funroll-all-loops -O3 -funsafe-math-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=hard -mfpu=vfp + + + diff --git a/liveengine/liveengine.cbp b/liveengine/liveengine.cbp index de55eca..0abe73e 100644..100755 --- a/liveengine/liveengine.cbp +++ b/liveengine/liveengine.cbp @@ -4,10 +4,9 @@ <Project> <Option title="liveengine" /> <Option makefile_is_custom="1" /> - <Option execution_dir="./" /> <Option pch_mode="2" /> <Option compiler="gcc" /> - <Option virtualFolders="src/;build config/;" /> + <Option virtualFolders="addons/;src/;build config/;" /> <Build> <Target title="Debug"> <Option output="bin/$(PROJECT_NAME)_debug" prefix_auto="1" extension_auto="1" /> @@ -28,15 +27,6 @@ <Option projectLinkerOptionsRelation="2" /> </Target> </Build> - <Unit filename="Makefile"> - <Option virtualFolder="build config/" /> - </Unit> - <Unit filename="addons.make"> - <Option virtualFolder="build config/" /> - </Unit> - <Unit filename="bin/data/insects.xml"> - <Option virtualFolder="build config/" /> - </Unit> <Unit filename="bin/data/settings.xml"> <Option virtualFolder="build config/" /> </Unit> @@ -64,8 +54,12 @@ <Unit filename="src/testApp.h"> <Option virtualFolder="src/" /> </Unit> - <Unit filename="src/viewport.cpp" /> - <Unit filename="src/viewport.h" /> + <Unit filename="src/viewport.cpp"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/viewport.h"> + <Option virtualFolder="src/" /> + </Unit> <Extensions> <code_completion /> <envvars /> diff --git a/liveengine/liveengine.layout b/liveengine/liveengine.layout index f61c0ef..d3b2e36 100644..100755 --- a/liveengine/liveengine.layout +++ b/liveengine/liveengine.layout @@ -1,43 +1,22 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="Debug" /> - <File name="Makefile" open="0" top="0" tabpos="3"> - <Cursor position="0" topLine="36" /> + <ActiveTarget name="Release" /> + <File name="bin/data/settings.xml" open="1" top="0" tabpos="6"> + <Cursor position="142" topLine="0" /> </File> - <File name="addons.make" open="1" top="0" tabpos="3"> - <Cursor position="60" topLine="0" /> - </File> - <File name="bin/data/insects.xml" open="0" top="0" tabpos="9"> - <Cursor position="3136" topLine="14" /> - </File> - <File name="bin/data/settings.xml" open="0" top="0" tabpos="5"> + <File name="config.make" open="1" top="0" tabpos="2"> <Cursor position="0" topLine="0" /> </File> - <File name="config.make" open="0" top="0" tabpos="4"> - <Cursor position="192" topLine="0" /> - </File> - <File name="src/layers.cpp" open="1" top="0" tabpos="2"> - <Cursor position="2259" topLine="55" /> - </File> - <File name="src/layers.h" open="1" top="0" tabpos="1"> - <Cursor position="995" topLine="10" /> - </File> - <File name="src/main.cpp" open="0" top="0" tabpos="5"> - <Cursor position="42" topLine="0" /> + <File name="src/main.cpp" open="1" top="0" tabpos="7"> + <Cursor position="290" topLine="0" /> </File> - <File name="src/playlist.cpp" open="0" top="0" tabpos="7"> - <Cursor position="985" topLine="2" /> + <File name="src/testApp.cpp" open="1" top="1" tabpos="3"> + <Cursor position="14559" topLine="524" /> </File> - <File name="src/testApp.cpp" open="1" top="0" tabpos="4"> - <Cursor position="10314" topLine="238" /> - </File> - <File name="src/testApp.h" open="1" top="0" tabpos="5"> - <Cursor position="2073" topLine="68" /> - </File> - <File name="src/viewport.cpp" open="0" top="0" tabpos="9"> - <Cursor position="926" topLine="6" /> + <File name="src/testApp.h" open="1" top="0" tabpos="1"> + <Cursor position="0" topLine="0" /> </File> - <File name="src/viewport.h" open="0" top="0" tabpos="8"> - <Cursor position="272" topLine="0" /> + <File name="src/viewport.h" open="1" top="0" tabpos="4"> + <Cursor position="0" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/liveengine/liveengine_win.cbp b/liveengine/liveengine_win.cbp deleted file mode 100644 index 6a475a3..0000000 --- a/liveengine/liveengine_win.cbp +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="liveengine" /> - <Option makefile="makefile" /> - <Option pch_mode="2" /> - <Option compiler="gcc" /> - <Option virtualFolders="src\;" /> - <Build> - <Target title="release"> - <Option output="bin\$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" /> - <Option working_dir="bin" /> - <Option object_output="obj\release" /> - <Option external_deps="..\..\openFrameworks-020912\libs\openFrameworksCompiled\lib\win_cb\openFrameworks.lib;" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Option projectLinkerOptionsRelation="2" /> - <Compiler> - <Add option="-O2" /> - </Compiler> - <Linker> - <Add option="-s" /> - <Add option="../../openFrameworks-020912/libs/openFrameworksCompiled/lib/win_cb/openFrameworks.lib" /> - </Linker> - </Target> - <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="..\..\openFrameworks-020912\libs\openFrameworksCompiled\lib\win_cb\openFrameworksDebug.lib;" /> - <Option type="1" /> - <Option compiler="gcc" /> - <Option projectLinkerOptionsRelation="2" /> - <Compiler> - <Add option="-g" /> - </Compiler> - <Linker> - <Add option="../../openFrameworks-020912/libs/openFrameworksCompiled/lib/win_cb/openFrameworksDebug.lib" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wno-multichar" /> - <Add directory="..\..\openFrameworks-020912\libs\glu\include" /> - <Add directory="..\..\openFrameworks-020912\libs\freetype\include" /> - <Add directory="..\..\openFrameworks-020912\libs\freetype\include\freetype2" /> - <Add directory="..\..\openFrameworks-020912\libs\FreeImage\include" /> - <Add directory="..\..\openFrameworks-020912\libs\quicktime\include" /> - <Add directory="..\..\openFrameworks-020912\libs\rtAudio\include" /> - <Add directory="..\..\openFrameworks-020912\libs\fmodex\include" /> - <Add directory="..\..\openFrameworks-020912\libs\videoInput\include" /> - <Add directory="..\..\openFrameworks-020912\libs\glew\include" /> - <Add directory="..\..\openFrameworks-020912\libs\glut\include" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\3d" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\app" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\communication" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\events" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\gl" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\graphics" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\math" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\sound" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\types" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\utils" /> - <Add directory="..\..\openFrameworks-020912\libs\openFrameworks\video" /> - <Add directory="..\..\openFrameworks-020912\libs\poco\include" /> - <Add directory="..\..\openFrameworks-020912\libs\tess2\include" /> - <Add directory="..\..\openFrameworks-020912\libs\cairo\include\cairo" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\calib3d" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\contrib" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\core" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\features2d" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\flann" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\gpu" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\highgui" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\imgproc" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\ml" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\include\opencv2\video" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\android" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\iphone" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\linux" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\linux64" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\osx" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\vs2010" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\win_cb" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\android\armeabi" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\libs\opencv\lib\android\armeabi-v7a" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\addons\ofxRay\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxOpenCv\addons\ofxGrabCam\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxRay\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxXmlSettings\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxXmlSettings\libs" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxBlobsManager\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxMidi\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxMidi\libs" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxSVGTiny\src" /> - <Add directory="..\..\openFrameworks-020912\addons\ofxSVGTiny\libs" /> - </Compiler> - <Linker> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_legacy220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_haartraining_engine.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_features2d220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_calib3d220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_objdetect220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_imgproc220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_video220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_highgui220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_ml220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_core220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_lapack.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_flann220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_contrib220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_gpu220.a" /> - <Add option="../../openFrameworks-020912/addons/ofxOpenCv/libs/opencv/lib/win_cb/libzlib.a" /> - <Add library="..\..\openFrameworks-020912\libs\FreeImage\lib\win_cb\FreeImage.lib" /> - <Add library="..\..\openFrameworks-020912\libs\rtAudio\lib\win_cb\librtaudio.a" /> - <Add library="..\..\openFrameworks-020912\libs\quicktime\lib\win_cb\qtmlClient.lib" /> - <Add library="..\..\openFrameworks-020912\libs\cairo\lib\win_cb\libcairo.a" /> - <Add library="..\..\openFrameworks-020912\libs\cairo\lib\win_cb\libpixman-1.a" /> - <Add library="..\..\openFrameworks-020912\libs\freetype\lib\win_cb\libfreetype.a" /> - <Add library="..\..\openFrameworks-020912\libs\glut\lib\win_cb\libglut.a" /> - <Add library="..\..\openFrameworks-020912\libs\videoInput\lib\win_cb\videoInputLib.a" /> - <Add library="..\..\openFrameworks-020912\libs\fmodex\lib\win_cb\libfmodex.a" /> - <Add library="..\..\openFrameworks-020912\libs\glew\lib\win_cb\glew32s.lib" /> - <Add library="..\..\openFrameworks-020912\libs\glu\lib\win_cb\glu32.lib" /> - <Add library="..\..\openFrameworks-020912\libs\poco\lib\win_cb\libPocoNetmt.a" /> - <Add library="..\..\openFrameworks-020912\libs\poco\lib\win_cb\libPocoUtilmt.a" /> - <Add library="..\..\openFrameworks-020912\libs\poco\lib\win_cb\libPocoXMLmt.a" /> - <Add library="..\..\openFrameworks-020912\libs\poco\lib\win_cb\libPocoFoundationmt.a" /> - <Add library="..\..\openFrameworks-020912\libs\tess2\lib\win_cb\libtess2.a" /> - <Add library="opengl32" /> - <Add library="gdi32" /> - <Add library="msimg32" /> - <Add library="glu32" /> - <Add library="dsound" /> - <Add library="winmm" /> - <Add library="dxguid" /> - <Add library="strmbase" /> - <Add library="strmiids" /> - <Add library="z" /> - <Add library="uuid" /> - <Add library="ole32" /> - <Add library="oleaut32" /> - <Add library="setupapi" /> - <Add library="wsock32" /> - <Add library="ws2_32" /> - <Add library="Iphlpapi" /> - </Linker> - <ExtraCommands> - <Add after='xcopy /e /i /y "$(PROJECT_DIR)..\..\openFrameworks-020912\export\win_cb\*.dll" "$(PROJECT_DIR)bin"' /> - <Add after='cmd /c if not exist "$(PROJECT_DIR)bin/data" mkdir "$(PROJECT_DIR)bin/data"' /> - <Mode after="always" /> - </ExtraCommands> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\libs\RtError.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\libs\RtMidi.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\libs\RtMidi.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\src\ofxMidi.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\src\ofxMidiConstants.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\src\ofxMidiEvents.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\src\ofxMidiIn.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\src\ofxMidiIn.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\src\ofxMidiOut.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxMidi\src\ofxMidiOut.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\libs\src_colors.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\libs\svgtiny.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\libs\svgtiny.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\libs\svgtiny_gradient.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\libs\svgtiny_internal.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\libs\svgtiny_list.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\src\ofxSVGTiny.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxSVGTiny\src\ofxSVGTiny.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxXmlSettings\libs\tinyxml.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxXmlSettings\libs\tinyxml.h" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxXmlSettings\libs\tinyxmlerror.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxXmlSettings\libs\tinyxmlparser.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxXmlSettings\src\ofxXmlSettings.cpp" /> - <Unit filename="..\..\openFrameworks-020912\addons\ofxXmlSettings\src\ofxXmlSettings.h" /> - <Unit filename="src\main.cpp"> - <Option virtualFolder="src" /> - </Unit> - <Unit filename="src\testApp.cpp"> - <Option virtualFolder="src" /> - </Unit> - <Unit filename="src\testApp.h"> - <Option virtualFolder="src" /> - </Unit> - <Extensions> - <code_completion /> - <debugger /> - <envvars /> - </Extensions> - </Project> -</CodeBlocks_project_file> diff --git a/liveengine/liveengine_win.depend b/liveengine/liveengine_win.depend deleted file mode 100644 index 3a3f757..0000000 --- a/liveengine/liveengine_win.depend +++ /dev/null @@ -1,1476 +0,0 @@ -# depslib dependency file v1.0 -1346080534 source:e:\workspace\sunkenfoal\liveengine\src\main.cpp - "ofMain.h" - "testApp.h" - "ofAppGlutWindow.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\ofmain.h - "ofConstants.h" - "ofFileUtils.h" - "ofLog.h" - "ofSystemUtils.h" - "ofThread.h" - "ofURLFileLoader.h" - "ofUtils.h" - "ofBaseTypes.h" - "ofTypes.h" - "ofColor.h" - "ofPoint.h" - "ofRectangle.h" - "ofMath.h" - "ofVectorMath.h" - "ofSerial.h" - "ofArduino.h" - "ofFbo.h" - "ofGLRenderer.h" - "ofGLUtils.h" - "ofLight.h" - "ofMaterial.h" - "ofShader.h" - "ofTexture.h" - "ofVbo.h" - "ofVboMesh.h" - "ofCairoRenderer.h" - "ofGraphics.h" - "ofImage.h" - "ofPath.h" - "ofPixels.h" - "ofPolyline.h" - "ofRendererCollection.h" - "ofTessellator.h" - "ofTrueTypeFont.h" - "ofBaseApp.h" - "ofAppRunner.h" - "ofSoundStream.h" - "ofSoundPlayer.h" - "ofVideoGrabber.h" - "ofVideoPlayer.h" - "ofEvents.h" - "of3dUtils.h" - "ofCamera.h" - "ofEasyCam.h" - "ofMesh.h" - "ofNode.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\utils\ofconstants.h - <TargetConditionals.h> - <windows.h> - "GL\glew.h" - "GL\wglew.h" - "glu.h" - <unistd.h> - "GL/glew.h" - <OpenGL/gl.h> - <ApplicationServices/ApplicationServices.h> - <unistd.h> - <GL/glew.h> - <GL/gl.h> - <GL/glx.h> - <unistd.h> - <GLES/gl.h> - <GLES/glext.h> - "glu.h" - "tesselator.h" - <cstdlib> - <cstdio> - <cstdarg> - <cmath> - <ctime> - <cstdlib> - <string> - <iostream> - <vector> - <cstring> - <sstream> - <iomanip> - <fstream> - -1333210877 e:\workspace\openframeworks-020912\libs\glew\include\gl\glew.h - <stddef.h> - <inttypes.h> - <stdint.h> - <inttypes.h> - <OpenGL/glu.h> - <GL/glu.h> - -1333210877 e:\workspace\openframeworks-020912\libs\glew\include\gl\wglew.h - <windows.h> - -1333210877 e:\workspace\openframeworks-020912\libs\glu\include\glu.h - "glu_mangle.h" - <GL/gl.h> - -1333210883 e:\workspace\openframeworks-020912\libs\tess2\include\tesselator.h - <TargetConditionals.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\utils\offileutils.h - "ofConstants.h" - "Poco/File.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\file.h - "Poco/Foundation.h" - "Poco/Timestamp.h" - <vector> - "File_WINCE.h" - "Poco/File_WIN32U.h" - "Poco/File_WIN32.h" - "Poco/File_UNIX.h" - "Poco/File_VMS.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\foundation.h - "Poco/Config.h" - "Poco/Platform.h" - "Poco/Platform_WIN32.h" - "Poco/Platform_VMS.h" - "Poco/Platform_POSIX.h" - "Poco/Bugcheck.h" - "Poco/Types.h" - <string> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\config.h - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\platform.h - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\platform_win32.h - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\platform_vms.h - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\platform_posix.h - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\bugcheck.h - "Poco/Foundation.h" - <string> - <iostream> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\types.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\timestamp.h - "Poco/Foundation.h" - <ctime> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\file_wince.h - "Poco/Foundation.h" - "Poco/Timestamp.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\file_win32u.h - "Poco/Foundation.h" - "Poco/Timestamp.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\file_win32.h - "Poco/Foundation.h" - "Poco/Timestamp.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\file_unix.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\file_vms.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\utils\oflog.h - "ofConstants.h" - "ofFileUtils.h" - "ofTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\types\oftypes.h - "ofConstants.h" - "ofColor.h" - <memory> - <tr1/memory> - "Poco/Mutex.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\types\ofcolor.h - <limits> - "ofMath.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofmath.h - "ofPoint.h" - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\types\ofpoint.h - "ofVec3f.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofvec3f.h - "ofVec2f.h" - "ofVec4f.h" - "ofConstants.h" - <cmath> - <iostream> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofvec2f.h - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofvec4f.h - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\mutex.h - "Poco/Foundation.h" - "Poco/Exception.h" - "Poco/ScopedLock.h" - "Poco/Mutex_WINCE.h" - "Poco/Mutex_WIN32.h" - "Poco/Mutex_POSIX.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\exception.h - "Poco/Foundation.h" - <stdexcept> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\scopedlock.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\mutex_wince.h - "Poco/Foundation.h" - "Poco/Exception.h" - "Poco/UnWindows.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\unwindows.h - <windows.h> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\mutex_win32.h - "Poco/Foundation.h" - "Poco/Exception.h" - "Poco/UnWindows.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\mutex_posix.h - "Poco/Foundation.h" - "Poco/Exception.h" - <pthread.h> - <errno.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\utils\ofsystemutils.h - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\utils\ofthread.h - "ofConstants.h" - "ofTypes.h" - <process.h> - <pthread.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\utils\ofurlfileloader.h - <deque> - <queue> - "ofThread.h" - "ofEvents.h" - "ofFileUtils.h" - "Poco/Condition.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\events\ofevents.h - "ofConstants.h" - "ofPoint.h" - "ofEventUtils.h" - "ofxEventUtils.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\events\ofeventutils.h - "ofConstants.h" - "Poco/FIFOEvent.h" - "Poco/Delegate.h" - <stdio.h> - <stdlib.h> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\fifoevent.h - "Poco/AbstractEvent.h" - "Poco/FIFOStrategy.h" - "Poco/AbstractDelegate.h" - "Poco/CompareFunctions.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\abstractevent.h - "Poco/Foundation.h" - "Poco/SingletonHolder.h" - "Poco/SharedPtr.h" - "Poco/ActiveResult.h" - "Poco/ActiveMethod.h" - "Poco/Mutex.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\singletonholder.h - "Poco/Foundation.h" - "Poco/Mutex.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\sharedptr.h - "Poco/Foundation.h" - "Poco/Exception.h" - "Poco/AtomicCounter.h" - <algorithm> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\atomiccounter.h - "Poco/Foundation.h" - "Poco/UnWindows.h" - <libkern/OSAtomic.h> - "Poco/Mutex.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\activeresult.h - "Poco/Foundation.h" - "Poco/Mutex.h" - "Poco/Event.h" - "Poco/RefCountedObject.h" - "Poco/Exception.h" - <algorithm> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\event.h - "Poco/Foundation.h" - "Poco/Exception.h" - "Poco/Event_WIN32.h" - "Poco/Event_POSIX.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\event_win32.h - "Poco/Foundation.h" - "Poco/Exception.h" - "Poco/UnWindows.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\event_posix.h - "Poco/Foundation.h" - "Poco/Exception.h" - <pthread.h> - <errno.h> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\refcountedobject.h - "Poco/Foundation.h" - "Poco/AtomicCounter.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\activemethod.h - "Poco/Foundation.h" - "Poco/ActiveResult.h" - "Poco/ActiveRunnable.h" - "Poco/ActiveStarter.h" - "Poco/AutoPtr.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\activerunnable.h - "Poco/Foundation.h" - "Poco/ActiveResult.h" - "Poco/Runnable.h" - "Poco/RefCountedObject.h" - "Poco/AutoPtr.h" - "Poco/Exception.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\runnable.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\autoptr.h - "Poco/Foundation.h" - "Poco/Exception.h" - <algorithm> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\activestarter.h - "Poco/Foundation.h" - "Poco/ThreadPool.h" - "Poco/ActiveRunnable.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\threadpool.h - "Poco/Foundation.h" - "Poco/Thread.h" - "Poco/Mutex.h" - <vector> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\thread.h - "Poco/Foundation.h" - "Poco/Mutex.h" - "Poco/Thread_WINCE.h" - "Poco/Thread_WIN32.h" - "Poco/Thread_POSIX.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\thread_wince.h - "Poco/Foundation.h" - "Poco/Runnable.h" - "Poco/UnWindows.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\thread_win32.h - "Poco/Foundation.h" - "Poco/Runnable.h" - "Poco/UnWindows.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\thread_posix.h - "Poco/Foundation.h" - "Poco/Runnable.h" - "Poco/SignalHandler.h" - "Poco/Event.h" - "Poco/RefCountedObject.h" - "Poco/AutoPtr.h" - <pthread.h> - <limits.h> - <sys/select.h> - <errno.h> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\signalhandler.h - "Poco/Foundation.h" - <vector> - <setjmp.h> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\fifostrategy.h - "Poco/NotificationStrategy.h" - <map> - <list> - <memory> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\notificationstrategy.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\abstractdelegate.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\comparefunctions.h - "Poco/Foundation.h" - <functional> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\delegate.h - "Poco/Foundation.h" - "Poco/AbstractDelegate.h" - "Poco/FunctionDelegate.h" - "Poco/Expire.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\functiondelegate.h - "Poco/Foundation.h" - "Poco/AbstractDelegate.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\expire.h - "Poco/Foundation.h" - "Poco/AbstractDelegate.h" - "Poco/Timestamp.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\condition.h - "Poco/Foundation.h" - "Poco/Mutex.h" - "Poco/ScopedUnlock.h" - "Poco/Event.h" - "Poco/Exception.h" - <deque> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\scopedunlock.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\utils\ofutils.h - "ofConstants.h" - <bitset> - "ofLog.h" - <shellapi.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\types\ofbasetypes.h - "ofPoint.h" - "ofRectangle.h" - "ofConstants.h" - "ofColor.h" - "ofMesh.h" - "ofPixels.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\types\ofrectangle.h - "ofPoint.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\3d\ofmesh.h - "ofVec3f.h" - "ofVec2f.h" - "ofColor.h" - "ofUtils.h" - "ofConstants.h" - "ofGLUtils.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\ofglutils.h - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\ofpixels.h - "ofConstants.h" - "ofUtils.h" - "ofColor.h" - "ofMath.h" - <limits> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofvectormath.h - "ofVec2f.h" - "ofVec3f.h" - "ofVec4f.h" - "ofMatrix3x3.h" - "ofMatrix4x4.h" - "ofQuaternion.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofmatrix3x3.h - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofmatrix4x4.h - "ofVec3f.h" - "ofVec4f.h" - "ofQuaternion.h" - "ofConstants.h" - <cmath> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\math\ofquaternion.h - "ofConstants.h" - "ofVec3f.h" - "ofVec4f.h" - <cmath> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\communication\ofserial.h - "ofConstants.h" - "ofTypes.h" - <termios.h> - <winbase.h> - <tchar.h> - <iostream> - <string.h> - <setupapi.h> - <regstr.h> - <winioctl.h> - <initguid.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\communication\ofarduino.h - <list> - <vector> - <string> - <iostream> - "ofEvents.h" - "ofSerial.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\offbo.h - "ofTexture.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\oftexture.h - "ofPoint.h" - "ofRectangle.h" - "ofBaseTypes.h" - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\ofglrenderer.h - "ofBaseTypes.h" - "ofPolyline.h" - <stack> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\ofpolyline.h - "ofPoint.h" - "ofConstants.h" - <deque> - "ofRectangle.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\oflight.h - "ofNode.h" - "ofColor.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\3d\ofnode.h - "ofVectorMath.h" - "of3dUtils.h" - "ofGraphics.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\3d\of3dutils.h - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\ofgraphics.h - "ofConstants.h" - "ofColor.h" - "ofPoint.h" - "ofMatrix4x4.h" - "ofRectangle.h" - "ofTypes.h" - "ofBaseTypes.h" - "ofGLRenderer.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\ofmaterial.h - "ofColor.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\ofshader.h - "ofConstants.h" - "ofBaseTypes.h" - "ofTexture.h" - <map> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\ofvbo.h - "ofConstants.h" - "ofVec3f.h" - "ofColor.h" - "ofUtils.h" - "ofMesh.h" - "ofGLUtils.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\gl\ofvbomesh.h - "ofMesh.h" - "ofVbo.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\ofcairorenderer.h - "cairo-features.h" - "cairo-pdf.h" - "cairo-svg.h" - "cairo.h" - <deque> - <stack> - "ofMatrix4x4.h" - "ofBaseTypes.h" - "ofPath.h" - -1333210876 e:\workspace\openframeworks-020912\libs\cairo\include\cairo\cairo-features.h - -1333210876 e:\workspace\openframeworks-020912\libs\cairo\include\cairo\cairo-pdf.h - "cairo.h" - -1333210876 e:\workspace\openframeworks-020912\libs\cairo\include\cairo\cairo.h - "cairo-version.h" - "cairo-features.h" - "cairo-deprecated.h" - -1333210876 e:\workspace\openframeworks-020912\libs\cairo\include\cairo\cairo-version.h - -1333210876 e:\workspace\openframeworks-020912\libs\cairo\include\cairo\cairo-deprecated.h - -1333210876 e:\workspace\openframeworks-020912\libs\cairo\include\cairo\cairo-svg.h - "cairo.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\ofpath.h - "ofConstants.h" - "ofPoint.h" - "ofColor.h" - "ofPolyline.h" - "ofBaseTypes.h" - "ofMesh.h" - "ofTessellator.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\oftessellator.h - "ofConstants.h" - "ofMesh.h" - "ofTypes.h" - "ofPolyline.h" - "tesselator.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\ofimage.h - "ofFileUtils.h" - "ofTexture.h" - "ofPixels.h" - "ofBaseTypes.h" - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\ofrenderercollection.h - "ofBaseTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\graphics\oftruetypefont.h - <vector> - "ofPoint.h" - "ofRectangle.h" - "ofConstants.h" - "ofPath.h" - "ofTexture.h" - "ofMesh.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\app\ofbaseapp.h - "ofPoint.h" - "ofEvents.h" - "ofBaseTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\app\ofapprunner.h - "ofConstants.h" - "ofPoint.h" - "ofRectangle.h" - "ofTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofsoundstream.h - "ofConstants.h" - "ofBaseTypes.h" - "ofBaseApp.h" - "ofTypes.h" - "ofBaseSoundStream.h" - "ofRtAudioSoundStream.h" - "ofPASoundStream.h" - "ofxAndroidSoundStream.h" - "ofxiPhoneSoundStream.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofbasesoundstream.h - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofrtaudiosoundstream.h - "ofConstants.h" - "ofBaseSoundStream.h" - "ofTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofpasoundstream.h - "ofConstants.h" - "ofBaseSoundStream.h" - "ofTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofxiphonesoundstream.h - "ofConstants.h" - "ofBaseSoundStream.h" - "ofTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofsoundplayer.h - "ofConstants.h" - "ofTypes.h" - "ofBaseTypes.h" - "ofBaseSoundPlayer.h" - "ofQuicktimeSoundPlayer.h" - "ofFmodSoundPlayer.h" - "ofOpenALSoundPlayer.h" - "ofxOpenALSoundPlayer.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofbasesoundplayer.h - "ofConstants.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\offmodsoundplayer.h - "ofConstants.h" - "ofBaseSoundPlayer.h" - "fmod.h" - "fmod_errors.h" - -1333210877 e:\workspace\openframeworks-020912\libs\fmodex\include\fmod.h - "fmod_codec.h" - "fmod_dsp.h" - "fmod_memoryinfo.h" - -1333210877 e:\workspace\openframeworks-020912\libs\fmodex\include\fmod_codec.h - -1333210877 e:\workspace\openframeworks-020912\libs\fmodex\include\fmod_dsp.h - -1333210877 e:\workspace\openframeworks-020912\libs\fmodex\include\fmod_memoryinfo.h - -1333210877 e:\workspace\openframeworks-020912\libs\fmodex\include\fmod_errors.h - "fmod.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\sound\ofopenalsoundplayer.h - "ofConstants.h" - "ofBaseSoundPlayer.h" - "ofEvents.h" - "ofThread.h" - <OpenAL/al.h> - <OpenAL/alc.h> - <AL/al.h> - <AL/alc.h> - "kiss_fft.h" - "kiss_fftr.h" - <sndfile.h> - <mpg123.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofvideograbber.h - "ofConstants.h" - "ofTexture.h" - "ofBaseTypes.h" - "ofPixels.h" - "ofTypes.h" - "ofiPhoneVideoGrabber.h" - "ofQuickTimeGrabber.h" - "ofDirectShowGrabber.h" - "ofGstVideoGrabber.h" - "ofxAndroidVideoGrabber.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofiphonevideograbber.h - "ofVideoGrabber.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofquicktimegrabber.h - "ofConstants.h" - "ofQtUtils.h" - "ofTexture.h" - "ofBaseTypes.h" - "ofPixels.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofqtutils.h - "ofConstants.h" - <QuickTime/QuickTime.h> - <CoreServices/CoreServices.h> - <ApplicationServices/ApplicationServices.h> - <QTML.h> - <FixMath.h> - <QuickTimeComponents.h> - <TextUtils.h> - <MediaHandlers.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\qtml.h - <MacTypes.h> - <MacMemory.h> - <MacWindows.h> - <OSUtils.h> - <Files.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\mactypes.h - <ConditionalMacros.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\conditionalmacros.h - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\macmemory.h - <MacTypes.h> - <MixedMode.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\mixedmode.h - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\macwindows.h - <MacTypes.h> - <Aliases.h> - <AppleEvents.h> - <Collections.h> - <Drag.h> - <Events.h> - <Menus.h> - <MixedMode.h> - <QDOffscreen.h> - <Quickdraw.h> - <TextCommon.h> - <Icons.h> - <MacErrors.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\aliases.h - <MacTypes.h> - <AppleTalk.h> - <Files.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\appletalk.h - <MacTypes.h> - <OSUtils.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\osutils.h - <MacTypes.h> - <MixedMode.h> - <MacMemory.h> - <Patches.h> - <DateTimeUtils.h> - <Endian.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\patches.h - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\datetimeutils.h - <ConditionalMacros.h> - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\endian.h - <ConditionalMacros.h> - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\files.h - <MacTypes.h> - <MixedMode.h> - <OSUtils.h> - <TextCommon.h> - <UTCUtils.h> - <Finder.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\textcommon.h - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\utcutils.h - <MacTypes.h> - <MacErrors.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\macerrors.h - <ConditionalMacros.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\finder.h - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\appleevents.h - <MacTypes.h> - <MixedMode.h> - <Notification.h> - <Events.h> - <AEDataModel.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\notification.h - <MacTypes.h> - <OSUtils.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\events.h - <OSUtils.h> - <Quickdraw.h> - <MacTypes.h> - <Endian.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\quickdraw.h - <Components.h> - <MacTypes.h> - <MixedMode.h> - <QuickdrawText.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\components.h - <MacErrors.h> - <MacTypes.h> - <MixedMode.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\quickdrawtext.h - <MacTypes.h> - <MixedMode.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\aedatamodel.h - <MacTypes.h> - <MixedMode.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\collections.h - <MacTypes.h> - <MixedMode.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\drag.h - <MacTypes.h> - <Events.h> - <Files.h> - <AppleEvents.h> - <Quickdraw.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\menus.h - <MacTypes.h> - <Events.h> - <Quickdraw.h> - <Fonts.h> - <TextCommon.h> - <Processes.h> - <AppleEvents.h> - <Collections.h> - <MacErrors.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\fonts.h - <MacTypes.h> - <Files.h> - <Quickdraw.h> - <TextCommon.h> - <MacErrors.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\processes.h - <MacTypes.h> - <Events.h> - <Files.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\qdoffscreen.h - <MacErrors.h> - <Quickdraw.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\icons.h - <MacTypes.h> - <Quickdraw.h> - <Files.h> - <CodeFragments.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\codefragments.h - <MacTypes.h> - <Files.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\fixmath.h - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\quicktimecomponents.h - <MacTypes.h> - <MixedMode.h> - <Components.h> - <ImageCompression.h> - <Movies.h> - <Quickdraw.h> - <Video.h> - <Sound.h> - <QuickTimeMusic.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\imagecompression.h - <MacTypes.h> - <Quickdraw.h> - <QDOffscreen.h> - <Components.h> - <StandardFile.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\standardfile.h - <MacTypes.h> - <Dialogs.h> - <Files.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\dialogs.h - <MacTypes.h> - <MixedMode.h> - <Events.h> - <MacWindows.h> - <TextEdit.h> - <Controls.h> - <MacErrors.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\textedit.h - <MacTypes.h> - <Quickdraw.h> - <MixedMode.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\controls.h - <MacTypes.h> - <Quickdraw.h> - <Menus.h> - <TextEdit.h> - <Drag.h> - <Icons.h> - <Collections.h> - <MacErrors.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\movies.h - <Quickdraw.h> - <Aliases.h> - <Events.h> - <Menus.h> - <Components.h> - <ImageCompression.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\video.h - <Quickdraw.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\sound.h - <MacTypes.h> - <Dialogs.h> - <Components.h> - <MixedMode.h> - <Movies.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\quicktimemusic.h - <Components.h> - <ImageCompression.h> - <Movies.h> - <Quickdraw.h> - <Video.h> - <MacMemory.h> - <Sound.h> - <Endian.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\textutils.h - <MacTypes.h> - <NumberFormatting.h> - <StringCompare.h> - <DateTimeUtils.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\numberformatting.h - <ConditionalMacros.h> - <MacTypes.h> - <IntlResources.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\intlresources.h - <MacTypes.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\stringcompare.h - <MacTypes.h> - <TextCommon.h> - <Script.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\script.h - <MacTypes.h> - <Quickdraw.h> - <IntlResources.h> - <Events.h> - -1333210883 e:\workspace\openframeworks-020912\libs\quicktime\include\mediahandlers.h - <ConditionalMacros.h> - <MacTypes.h> - <Components.h> - <Movies.h> - <Sound.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofdirectshowgrabber.h - "ofConstants.h" - "ofTexture.h" - "ofBaseTypes.h" - "ofPixels.h" - "videoInput.h" - -1333210883 e:\workspace\openframeworks-020912\libs\videoinput\include\videoinput.h - <stdlib.h> - <stdio.h> - <math.h> - <string.h> - <wchar.h> - <windows.h> - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofgstvideograbber.h - "ofGstUtils.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofgstutils.h - "ofConstants.h" - <gst/gst.h> - <gst/app/gstappsink.h> - "ofConstants.h" - "ofBaseTypes.h" - "ofPixels.h" - "ofTypes.h" - "ofEvents.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofvideoplayer.h - "ofConstants.h" - "ofTexture.h" - "ofBaseTypes.h" - "ofTypes.h" - "ofGstVideoPlayer.h" - "ofQuickTimePlayer.h" - "ofiPhoneVideoPlayer.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofgstvideoplayer.h - "ofGstUtils.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofquicktimeplayer.h - "ofConstants.h" - "ofBaseTypes.h" - "ofPixels.h" - "ofQtUtils.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\video\ofiphonevideoplayer.h - "ofPixels.h" - "ofBaseTypes.h" - "ofTexture.h" - "ofVideoPlayer.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\3d\ofcamera.h - "ofRectangle.h" - "ofAppRunner.h" - "ofNode.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\3d\ofeasycam.h - "ofCamera.h" - "ofEvents.h" - -1346080565 e:\workspace\sunkenfoal\liveengine\src\testapp.h - "ofMain.h" - "ofxXmlSettings.h" - "ofxMidi.h" - "ofxSVGTiny.h" - -1333210870 e:\workspace\openframeworks-020912\addons\ofxxmlsettings\src\ofxxmlsettings.h - "ofMain.h" - <string.h> - "tinyxml.h" - -1333210870 e:\workspace\openframeworks-020912\addons\ofxxmlsettings\libs\tinyxml.h - <ctype.h> - <stdio.h> - <stdlib.h> - <string.h> - <assert.h> - <string> - <iostream> - <sstream> - "tinystr.h" - -1345104033 e:\workspace\openframeworks-020912\addons\ofxmidi\src\ofxmidi.h - <iostream> - "RtMidi.h" - "ofxMidiConstants.h" - "ofxMidiEvents.h" - "ofxMidiIn.h" - "ofxMidiOut.h" - -1345104033 e:\workspace\openframeworks-020912\addons\ofxmidi\libs\rtmidi.h - "RtError.h" - <string> - "ofxMidiConstants.h" - <vector> - <queue> - -1345104033 e:\workspace\openframeworks-020912\addons\ofxmidi\libs\rterror.h - <iostream> - <string> - -1345104033 e:\workspace\openframeworks-020912\addons\ofxmidi\src\ofxmidiconstants.h - "ofConstants.h" - -1345104033 e:\workspace\openframeworks-020912\addons\ofxmidi\src\ofxmidievents.h - "ofMain.h" - <map> - -1345104033 e:\workspace\openframeworks-020912\addons\ofxmidi\src\ofxmidiin.h - <iostream> - "RtMidi.h" - "ofxMidiConstants.h" - "ofxMidiEvents.h" - "ofMain.h" - -1345104033 e:\workspace\openframeworks-020912\addons\ofxmidi\src\ofxmidiout.h - <iostream> - "RtMidi.h" - "ofxMidiConstants.h" - "ofxMidiEvents.h" - "ofMain.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\app\ofappglutwindow.h - "ofConstants.h" - "ofAppBaseWindow.h" - "ofEvents.h" - "ofTypes.h" - -1333210877 e:\workspace\openframeworks-020912\libs\openframeworks\app\ofappbasewindow.h - "ofPoint.h" - "ofTypes.h" - -1346080534 source:e:\workspace\sunkenfoal\liveengine\src\testapp.cpp - "testApp.h" - -1345104033 source:e:\workspace\openframeworks-020912\addons\ofxmidi\src\ofxmidiin.cpp - "ofxMidiIn.h" - -1345104033 source:e:\workspace\openframeworks-020912\addons\ofxmidi\src\ofxmidiout.cpp - "ofxMidiOut.h" - -1345104033 source:e:\workspace\openframeworks-020912\addons\ofxmidi\libs\rtmidi.cpp - "RtMidi.h" - <sstream> - <CoreMIDI/CoreMIDI.h> - <CoreAudio/HostTime.h> - <pthread.h> - <sys/time.h> - <alsa/asoundlib.h> - <pthread.h> - <sys/time.h> - <unistd.h> - <dmedia/midi.h> - <windows.h> - <mmsystem.h> - -1333210870 source:e:\workspace\openframeworks-020912\addons\ofxxmlsettings\src\ofxxmlsettings.cpp - "ofxXmlSettings.h" - <vector> - <string> - <iostream> - -1333210870 source:e:\workspace\openframeworks-020912\addons\ofxxmlsettings\libs\tinyxml.cpp - <ctype.h> - <sstream> - <iostream> - "tinyxml.h" - -1333210870 source:e:\workspace\openframeworks-020912\addons\ofxxmlsettings\libs\tinyxmlerror.cpp - "tinyxml.h" - -1333210870 source:e:\workspace\openframeworks-020912\addons\ofxxmlsettings\libs\tinyxmlparser.cpp - <ctype.h> - <stddef.h> - "tinyxml.h" - <windows.h> - -1345903225 e:\workspace\openframeworks-020912\addons\ofxsvgtiny\src\ofxsvgtiny.h - "ofMain.h" - "svgtiny.h" - -1345903225 e:\workspace\openframeworks-020912\addons\ofxsvgtiny\libs\svgtiny.h - "Poco/URIStreamOpener.h" - "Poco/StreamCopier.h" - "Poco/Path.h" - "Poco/URI.h" - "Poco/Exception.h" - "Poco/Net/HTTPStreamFactory.h" - "Poco/XML/XMLString.h" - "Poco/DOM/DOMParser.h" - "Poco/DOM/Document.h" - "Poco/DOM/Attr.h" - "Poco/DOM/NodeIterator.h" - "Poco/DOM/NodeFilter.h" - "Poco/DOM/NamedNodeMap.h" - "Poco/DOM/ChildNodesList.h" - <iostream> - <string> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\uristreamopener.h - "Poco/Foundation.h" - "Poco/Mutex.h" - <istream> - <map> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\streamcopier.h - "Poco/Foundation.h" - <istream> - <ostream> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\path.h - "Poco/Foundation.h" - <vector> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\uri.h - "Poco/Foundation.h" - <vector> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\httpstreamfactory.h - "Poco/Net/Net.h" - "Poco/Net/HTTPSession.h" - "Poco/URIStreamFactory.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\net.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\httpsession.h - "Poco/Net/Net.h" - "Poco/Net/StreamSocket.h" - "Poco/Timespan.h" - "Poco/Exception.h" - "Poco/Any.h" - <ios> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\streamsocket.h - "Poco/Net/Net.h" - "Poco/Net/Socket.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\socket.h - "Poco/Net/Net.h" - "Poco/Net/SocketImpl.h" - <vector> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\socketimpl.h - "Poco/Net/Net.h" - "Poco/Net/SocketDefs.h" - "Poco/Net/SocketAddress.h" - "Poco/RefCountedObject.h" - "Poco/Timespan.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\socketdefs.h - "Poco/UnWindows.h" - <winsock2.h> - <ws2tcpip.h> - <unistd.h> - <errno.h> - <sys/types.h> - <sys/socket.h> - <sys/select.h> - <sys/ioctl.h> - <inet.h> - <arpa/inet.h> - <netinet/in.h> - <netinet/tcp.h> - <netdb.h> - <net/if.h> - <sys/sockio.h> - <sys/filio.h> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\socketaddress.h - "Poco/Net/Net.h" - "Poco/Net/SocketDefs.h" - "Poco/Net/IPAddress.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\net\ipaddress.h - "Poco/Net/Net.h" - "Poco/Net/SocketDefs.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\timespan.h - "Poco/Foundation.h" - "Poco/Timestamp.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\any.h - "Poco/Exception.h" - <algorithm> - <typeinfo> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\uristreamfactory.h - "Poco/Foundation.h" - <istream> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\xmlstring.h - "Poco/XML/XML.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\xml.h - "Poco/Foundation.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\domparser.h - "Poco/XML/XML.h" - "Poco/SAX/SAXParser.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\sax\saxparser.h - "Poco/XML/XML.h" - "Poco/SAX/XMLReader.h" - "Poco/XML/ParserEngine.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\sax\xmlreader.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\parserengine.h - "Poco/XML/XML.h" - <expat.h> - "Poco/XML/expat.h" - "Poco/XML/XMLString.h" - "Poco/XML/XMLStream.h" - "Poco/SAX/Locator.h" - "Poco/TextEncoding.h" - <map> - <vector> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\expat.h - <stdlib.h> - "expat_external.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\expat_external.h - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\xmlstream.h - "Poco/XML/XML.h" - <istream> - <ostream> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\sax\locator.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\textencoding.h - "Poco/Foundation.h" - "Poco/SharedPtr.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\document.h - "Poco/XML/XML.h" - "Poco/DOM/AbstractContainerNode.h" - "Poco/DOM/DocumentEvent.h" - "Poco/DOM/Element.h" - "Poco/XML/XMLString.h" - "Poco/XML/NamePool.h" - "Poco/AutoReleasePool.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\abstractcontainernode.h - "Poco/XML/XML.h" - "Poco/DOM/AbstractNode.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\abstractnode.h - "Poco/XML/XML.h" - "Poco/DOM/Node.h" - "Poco/DOM/MutationEvent.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\node.h - "Poco/XML/XML.h" - "Poco/DOM/EventTarget.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\eventtarget.h - "Poco/XML/XML.h" - "Poco/DOM/DOMObject.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\domobject.h - "Poco/XML/XML.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\mutationevent.h - "Poco/XML/XML.h" - "Poco/DOM/Event.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\event.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - "Poco/DOM/DOMObject.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\documentevent.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\element.h - "Poco/XML/XML.h" - "Poco/DOM/AbstractContainerNode.h" - "Poco/XML/Name.h" - "Poco/SAX/NamespaceSupport.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\name.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\sax\namespacesupport.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - <set> - <map> - <vector> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\xml\namepool.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - "Poco/XML/Name.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\autoreleasepool.h - "Poco/Foundation.h" - <list> - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\attr.h - "Poco/XML/XML.h" - "Poco/DOM/AbstractNode.h" - "Poco/DOM/Element.h" - "Poco/XML/Name.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\nodeiterator.h - "Poco/XML/XML.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\nodefilter.h - "Poco/XML/XML.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\namednodemap.h - "Poco/XML/XML.h" - "Poco/DOM/DOMObject.h" - "Poco/XML/XMLString.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\childnodeslist.h - "Poco/XML/XML.h" - "Poco/DOM/NodeList.h" - -1333210877 e:\workspace\openframeworks-020912\libs\poco\include\poco\dom\nodelist.h - "Poco/XML/XML.h" - "Poco/DOM/DOMObject.h" - diff --git a/liveengine/liveengine_win.layout b/liveengine/liveengine_win.layout deleted file mode 100644 index e92bca7..0000000 --- a/liveengine/liveengine_win.layout +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_layout_file> - <ActiveTarget name="debug" /> - <File name="src\main.cpp" open="1" top="0" tabpos="1"> - <Cursor position="0" topLine="0" /> - </File> - <File name="src\testApp.cpp" open="1" top="1" tabpos="2"> - <Cursor position="3156" topLine="29" /> - </File> - <File name="src\testApp.h" open="1" top="0" tabpos="3"> - <Cursor position="1608" topLine="42" /> - </File> -</CodeBlocks_layout_file> diff --git a/liveengine/src/layers.cpp b/liveengine/src/layers.cpp index 6724255..4ac0c59 100755 --- a/liveengine/src/layers.cpp +++ b/liveengine/src/layers.cpp @@ -38,7 +38,7 @@ void svglayer::draw(float a,int cx,int cy,float colShift) { svg.getPathAt(i).draw(xo,yo); }
} - +/* void svglayer::draw(float a,unsigned char* controllers,int cx,int cy,bool transparentBlack,float colShift) {
getCentre(cx,cy); //draw layers tinted by controllers
@@ -56,6 +56,22 @@ void svglayer::draw(float a,unsigned char* controllers,int cx,int cy,bool transp svg.getPathAt(i).draw(xo,yo); } }
+}
+*/
+
+void svglayer::draw(float a,unsigned char* controllers,int cx,int cy,bool transparentBlack,float colShift) {
+ getCentre(cx,cy);
+ //draw layers grouped by controllers
+ float layerspercontroller=((float)svg.getNumPath())/6.0f;
+
+ for (int i=0;i<6;i++) {
+ for (int j=(int)(i*layerspercontroller);j<(int)((i+1)*layerspercontroller);j++) {
+ svg.getPathAt(j).setFillColor(fills[i]*a*controllers[i]);
+ if (!transparentBlack||((a*controllers[i])/127.0)>0.1) {
+ svg.getPathAt(j).draw(xo,yo);
+ }
+ }
+ }
} diff --git a/liveengine/src/layers.h b/liveengine/src/layers.h index 3a7883e..c6f4171 100755 --- a/liveengine/src/layers.h +++ b/liveengine/src/layers.h @@ -1,7 +1,8 @@ #ifndef SVGLAYER_H
#define SVGLAYER_H
-#include "ofxSVGTiny.h"
+#include "ofxSVGTiny.h" +#include "ofMain.h"
class layer
{
@@ -16,7 +17,7 @@ class layer protected: bool isLoaded;
private:
-
+
};
class svglayer: public layer
diff --git a/liveengine/src/main.cpp b/liveengine/src/main.cpp index dadd89f..f0c0c0f 100755 --- a/liveengine/src/main.cpp +++ b/liveengine/src/main.cpp @@ -7,7 +7,7 @@ int main( ){ ofAppGlutWindow window; - ofSetupOpenGL(ofxFensterManager::get(),2048,768, OF_WINDOW); + ofSetupOpenGL(ofxFensterManager::get(),1024,768, OF_WINDOW); //2048,768 //ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context //ofSetupOpenGL(&window, 1024,768, OF_WINDOW); diff --git a/liveengine/src/playlist.cpp b/liveengine/src/playlist.cpp index af44940..51bd852 100755 --- a/liveengine/src/playlist.cpp +++ b/liveengine/src/playlist.cpp @@ -1,11 +1,14 @@ #include "playlist.h"
playlist::playlist()
-{
+{ + name=""; + thumbnail.allocate(128,128,GL_RGB); + thumbnailed=false;
} void playlist::load(string _name){ - printf("loading %s\n",_name.c_str()); + //printf("loading %s\n",_name.c_str()); if( !XML.loadFile(_name) ){
@@ -28,23 +31,42 @@ void playlist::threadedFunction(){ }
void playlist::loadsvg(){ - int numLayers=0; - layers.clear(); - if(XML.pushTag("playlist")) {
- numLayers=XML.getNumTags("svglayer");
- if(numLayers) {
- for (int i=0;i<numLayers;i++) {
- string s=XML.getAttribute("svglayer", "file", "",i);
- printf("loading %s: ",s.c_str());
- layers[XML.getAttribute("svglayer", "note", 0,i)]=new svglayer(XML.getAttribute("svglayer", "file", "",i));
- }
- }
- else printf("no SVG layers loaded!\n"); - XML.popTag();
- } + int numLayers=0; + layers.clear(); + name=XML.getAttribute("playlist", "name", ""); + if(XML.pushTag("playlist")) {
+ numLayers=XML.getNumTags("svglayer");
+ if(numLayers) {
+ for (int i=0;i<numLayers;i++) {
+ string s=XML.getAttribute("svglayer", "file", "",i);
+ printf("loading %s: ",s.c_str());
+ layers[XML.getAttribute("svglayer", "note", 0,i)]=new svglayer(XML.getAttribute("svglayer", "file", "",i));
+ } + thumbnailed=false;
+ }
+ else printf("no SVG layers loaded!\n"); + XML.popTag();
+ } } +void playlist::makeThumbnail(){ + if (layers.size()) { + thumbnail.begin(); + ofBackground(0,0,0); + ofPushMatrix(); + ofTranslate(64,64); + ofScale(0.2,0.2,0.2); + ofTranslate(-64,-64); + map<int,layer*>::iterator i=layers.begin(); + i->second->draw(1.0,64,64,0.0); + ofPopMatrix(); + thumbnail.end(); + thumbnailed=true; + } +} + + void playlist::loadimg(){ int numLayers=0; layers.clear(); diff --git a/liveengine/src/playlist.h b/liveengine/src/playlist.h index 43982f9..846de74 100644..100755 --- a/liveengine/src/playlist.h +++ b/liveengine/src/playlist.h @@ -4,8 +4,8 @@ #include "ofThread.h" #include "ofxXmlSettings.h" -#include "layers.h"
-
+#include "layers.h" +#include "ofMain.h"
class playlist : public ofThread {
public:
@@ -14,10 +14,15 @@ class playlist : public ofThread { void loadimg(); void loadsvg(); void load(string _name); - void threadedFunction(); + void threadedFunction();
+ void makeThumbnail(); +
+ ofFbo thumbnail;
+ bool thumbnailed;
ofxXmlSettings XML; map<int,layer*> layers;
+ string name;
protected:
private:
};
diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp index 7f0ff47..8527f73 100755 --- a/liveengine/src/testApp.cpp +++ b/liveengine/src/testApp.cpp @@ -8,7 +8,7 @@ void previewWindow::setBuffer(ofFbo *buffer){ } void previewWindow::draw(){ - rb->draw(0,0,ofGetWidth(),ofGetHeight()); + rb->draw(0,0,ofGetWidth(),ofGetHeight()); //why crash? } //-------------------------------------------------------------- @@ -22,26 +22,103 @@ void guiWindow::setParent(testApp *p){ void guiWindow::draw(){ parent->gui.draw(); + if (parent->list.lock()) { //if loaded + if (!parent->list.thumbnailed) parent->list.makeThumbnail(); + if (parent->list.thumbnailed) parent->list.thumbnail.draw(20,ofGetHeight()-150); + parent->list.unlock(); + } + ofDrawBitmapString(parent->list.name,20,ofGetHeight()-10); } void guiWindow::dragEvent(ofDragInfo dragInfo, ofxFenster* win){ - printf("gui received file:%s\n",dragInfo.files[0].c_str()); + parent->dragEvent(dragInfo); +} +void guiWindow::windowMoved(int x,int y){ + //printf("window moved!\n"); +} + +//---------------------------------------------------------------------- + +kinectWindow::~kinectWindow(){ + cout << "kinect window destroyed" << endl; +} +void kinectWindow::setup(){ +} +void kinectWindow::setParent(testApp *p){ + parent=p; +} +void kinectWindow::draw(){ + parent->recordDepth.draw(0,0,ofGetWidth(),ofGetHeight()); + parent->recordUser.draw(ofGetWidth(),ofGetHeight()); } + //-------------------------------------------------------------- void testApp::setup(){
int midiPort=0;
- midiChannel=0;
+ midiChannel=0; + useKinect=false;
if( !XML.loadFile("settings.xml") ){
printf("unable to load settings.xml check data/ folder\n");
}else{
printf("settings loaded!\n");
midiPort=ofToInt(XML.getAttribute("liveEngine", "port", "0")); //default to 0/all
- midiChannel=ofToInt(XML.getAttribute("liveEngine", "channel", "0"));
- if (midiChannel) printf("listening on port %d, midi channel %d\n",midiPort,midiChannel);
- else printf("listening on port %d, all midi channels\n",midiPort);
- }
-
+ midiChannel=ofToInt(XML.getAttribute("liveEngine", "channel", "0"));
+ if (midiChannel) printf("listening on port %d, midi channel %d\n",midiPort,midiChannel);
+ else printf("listening on port %d, all midi channels\n",midiPort); + if(XML.pushTag("liveEngine")) { + int numViews=XML.getNumTags("viewport"); + if(numViews) { + for (int i=0;i<numViews;i++) { + int w=XML.getAttribute("viewport", "w",0,i); + int h=XML.getAttribute("viewport", "h",0,i); + int x=XML.getAttribute("viewport", "x",0,i); + int y=XML.getAttribute("viewport", "y",0,i); + int rot=XML.getAttribute("viewport", "rot",0,i); + int ox=XML.getAttribute("viewport", "ox",0,i); + int oy=XML.getAttribute("viewport", "oy",0,i); + printf("viewport %i: %ix%i\n",i,w,h); + if (XML.getAttribute("viewport", "mapped",0,i)==1) { + if (!useKinect) { + //set up preview window and kinect classes + useKinect=true; + kinectWin=new kinectWindow(); + ofxFenster* kw=ofxFensterManager::get()->createFenster(0, 0, 320, 240, OF_WINDOW); + kw->setWindowTitle("kinect"); + kw->addListener(kinectWin); + kinectWin->setup(); + kinectWin->setParent(this); + + isLive = true; + isTracking = false; + isFiltering = false; + isMasking = true; + isCloud = false; + + nearThreshold = 500; + farThreshold = 1000; + + filterFactor = 10.0f; + + recordContext.setup(); + recordDepth.setup(&recordContext); + recordImage.setup(&recordContext); + recordUser.setup(&recordContext); + recordUser.setSmoothing(filterFactor); // built in openni skeleton smoothing... + recordUser.setUseMaskPixels(isMasking); + recordUser.setUseCloudPoints(isCloud); + recordUser.setMaxNumberOfUsers(2); + } + viewports.push_back(new viewport(w,h,x,y,rot,ox,oy)); + viewports[viewports.size()-1]->setUG(&recordUser); + } + else viewports.push_back(new viewport(w,h,x,y,rot,ox,oy)); + } + } + else printf("no viewports!\n"); + }
+ } +
midiIn.listPorts();
midiIn.openPort(midiPort);
midiIn.addListener(this);
@@ -65,8 +142,8 @@ void testApp::setup(){ transparentBlack=false; reversemain=false; - vp1.setup(768,1024,1024,0,-90,-256,-384); - vp2.setup(1024,768,0,0,0,-512,-384); + //vp1.setup(768,1024,1024,0,-90,-256,-384); + //vp2.setup(1024,768,0,0,0,-512,-384); showFPS=false;
ofBackground(0,0,0); @@ -103,11 +180,10 @@ void testApp::setup(){ ofAddListener(win->events.mouseDragged, this, &testApp::mousePressedEvent); ofAddListener(win->events.mousePressed, this, &testApp::mousePressedEvent); ofAddListener(win->events.keyPressed, this, &testApp::keyPressedEvent); - ofAddListener(win->events.fileDragEvent, this, &testApp::refDragEvent); win->setWindowTitle("preview"); win->addListener(prevWin); prevWin->setup(); - prevWin->setBuffer(&vp1.rb2); + prevWin->setBuffer(&viewports[0]->rb2); fullscreenoutput=false; @@ -125,9 +201,9 @@ void testApp::setup(){ //gui window stuff ofxFenster* win2=ofxFensterManager::get()->createFenster(0, 0, 200, 400, OF_WINDOW); - ofAddListener(win2->events.fileDragEvent, this, &testApp::refDragEvent); - //ofAddListener(win2->events.mousePressed, 0, &testApp::mousePressedEvent); - //ofAddListener(win2->events.keyPressed, this, &testApp::keyPressedEvent); + + ofAddListener(win2->events.windowResized, this, &testApp::windowEvent); + win2->setWindowTitle("config"); win2->addListener(guiWin); guiWin->setup(); @@ -151,6 +227,13 @@ void testApp::makeColours() { //-------------------------------------------------------------- void testApp::update(){
//for (int i=0;i<numLayers;i++) layers[i]->update(); + + if (useKinect) { + recordContext.update(); + recordDepth.update(); + recordImage.update(); + recordUser.update(); + } } //-------------------------------------------------------------- @@ -160,8 +243,13 @@ void testApp::draw(){ ofSetColor(255-fadetime,255-fadetime,255-fadetime); //for feedback
- vp1.draw(lambda,controllers,xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,scale,fscale,noteRandomiseColours?colShift:0.0f); - vp2.draw(lambda,controllers,reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,reversemain?1.0f/scale:scale,reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f); + //vp1.draw(lambda,controllers,xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,scale,fscale,noteRandomiseColours?colShift:0.0f); + //vp2.draw(lambda,controllers,reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,reversemain?1.0f/scale:scale,reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f); + for (int i=0;i<viewports.size();i++) { + bool even=!(i%2); + if (viewports[i]->isMapped) viewports[i]->mapdraw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/scale:scale,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f); + else viewports[i]->draw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/scale:scale,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f); + } ofSetColor(255,255,255); if (showFPS) ofDrawBitmapString(ofToString(ofGetFrameRate(), 2),20,20); @@ -459,14 +547,21 @@ void testApp::gotMessage(ofMessage msg){ } //-------------------------------------------------------------- -void testApp::refDragEvent(ofDragInfo &dragInfo){ - dragEvent(dragInfo); -} + void testApp::dragEvent(ofDragInfo dragInfo, ofxFenster* win){ dragEvent(dragInfo); } void testApp::dragEvent(ofDragInfo dragInfo){ - printf("received file:%s\n",dragInfo.files[0].c_str()); + printf("got draginfo: %s\n",dragInfo.files[0].c_str()); + int sta=dragInfo.files[0].find_last_of("\\/")+1; + int len=(dragInfo.files[0].find_last_of(".")+4)-sta; + string filename=dragInfo.files[0].substr(sta,len); + printf("loading %s\n",filename.c_str()); + + list.load(filename); +} +void testApp::windowEvent(ofResizeEventArgs &args){ + printf("window event\n"); } void testApp::mousePressedEvent(ofMouseEventArgs &args) { diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h index a03ad4b..e0a00cc 100755 --- a/liveengine/src/testApp.h +++ b/liveengine/src/testApp.h @@ -2,6 +2,7 @@ //#include <GL/glxew.h> +#include "ofxOpenNI.h" #include "ofMain.h" #include "ofxXmlSettings.h" @@ -94,6 +95,7 @@ enum PropertyAttribute { class previewWindow; class guiWindow; +class kinectWindow; //#define GRAB_TEXTURE @@ -117,9 +119,9 @@ class testApp : public ofxFensterListener, public ofxMidiListener{ void dragEvent(ofDragInfo dragInfo); void dragEvent(ofDragInfo dragInfo,ofxFenster* win); - void refDragEvent(ofDragInfo &args); void mousePressedEvent(ofMouseEventArgs &args); void keyPressedEvent(ofKeyEventArgs &args); + void windowEvent(ofResizeEventArgs &args); void makeColours(); @@ -151,9 +153,11 @@ class testApp : public ofxFensterListener, public ofxMidiListener{ float colShift; viewport vp1,vp2; + vector<viewport*> viewports; previewWindow *prevWin; guiWindow *guiWin; + kinectWindow *kinectWin; ofxFenster* win; @@ -164,6 +168,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{ void newMidiMessage(ofxMidiEventArgs& eventArgs); playlist list; + ofxPanel gui; ofxToggle reversemain; @@ -175,10 +180,33 @@ class testApp : public ofxFensterListener, public ofxMidiListener{ void resetDrawscalePressed(bool & pressed); void resetFBscalePressed(bool & pressed); + + //kinect stuff + + bool useKinect; + + bool isLive, isTracking, isMasking, isFiltering, isCloud; + + ofxOpenNIContext recordContext; + ofxDepthGenerator recordDepth; + ofxImageGenerator recordImage; + ofxUserGenerator recordUser; + + int nearThreshold, farThreshold; + float filterFactor; }; +class kinectWindow: public ofxFensterListener{ +public: + ~kinectWindow(); + testApp *parent; + void setup(); + void setParent(testApp *p); + void draw(); +}; + class previewWindow: public ofxFensterListener{ public: @@ -197,6 +225,7 @@ public: void setParent(testApp *p); void draw(); void dragEvent(ofDragInfo dragInfo,ofxFenster* win); + void windowMoved(int x, int y); }; diff --git a/liveengine/src/viewport.cpp b/liveengine/src/viewport.cpp index ce67b37..82ee5a0 100755 --- a/liveengine/src/viewport.cpp +++ b/liveengine/src/viewport.cpp @@ -1,11 +1,62 @@ #include "viewport.h"
+//texture binding with normalised coords
+void bindTexture(ofBaseHasTexture &t) {
+ ofTexture &tex = t.getTextureReference();
+ tex.bind();
+ glMatrixMode(GL_TEXTURE);
+ glPushMatrix();
+ glLoadIdentity();
+
+ ofTextureData texData = tex.getTextureData();
+ if(texData.textureTarget == GL_TEXTURE_RECTANGLE_ARB) {
+ glScalef(tex.getWidth(), tex.getHeight(), 1.0f);
+ } else {
+ glScalef(tex.getWidth() / texData.tex_w, tex.getHeight() / texData.tex_h, 1.0f);
+ }
+
+ glMatrixMode(GL_MODELVIEW);
+}
+void unbindTexture(ofBaseHasTexture &t) {
+ t.getTextureReference().unbind();
+
+ glMatrixMode(GL_TEXTURE);
+ glPopMatrix();
+ glMatrixMode(GL_MODELVIEW);
+}
+void bindTex(ofTexture &tex) {
+ tex.bind();
+
+ glMatrixMode(GL_TEXTURE);
+ glPushMatrix();
+ glLoadIdentity();
+
+ ofTextureData texData = tex.getTextureData();
+ if(texData.textureTarget == GL_TEXTURE_RECTANGLE_ARB) {
+ glScalef(tex.getWidth(), tex.getHeight(), 1.0f);
+ } else {
+ glScalef(tex.getWidth() / texData.tex_w, tex.getHeight() / texData.tex_h, 1.0f);
+ }
+
+ glMatrixMode(GL_MODELVIEW);
+}
+void unbindTex(ofTexture &tex) {
+ tex.unbind();
+
+ glMatrixMode(GL_TEXTURE);
+ glPopMatrix();
+ glMatrixMode(GL_MODELVIEW);
+}
+//--------------------------------------------------
viewport::viewport()
{
//ctor
}
+viewport::viewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy) {
+ setup(_w,_h,_x,_y,_r,_ox,_oy);
+}
void viewport::setup(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy) {
r=_r;
@@ -105,3 +156,186 @@ viewport::~viewport() {
//dtor
}
+
+void viewport::setUG(ofxUserGenerator *_rUser){
+ rUser=_rUser;
+ isMapped=true;
+}
+
+//-------------------------
+mappedviewport::mappedviewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy) {
+ setup(_w,_h,_x,_y,_r,_ox,_oy);
+}
+void mappedviewport::setUG(ofxUserGenerator *_rUser){
+ rUser=_rUser;
+}
+void viewport::mapdraw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift){
+ //printf("draw mapped%s\n",ofGetFrameNum());
+ rb1.begin();
+ int startx=((w-(w*fscale))/2)+xshift;
+ while (startx>0) startx-=(w*fscale);
+ int starty=((h-(h*fscale))/2)+yshift;
+ while (starty>0) starty-=(h*fscale);
+
+ for (int i=startx;i<w*2;i+=(w*fscale)) {
+ for (int j=starty;j<h*2;j+=(h*fscale)) {
+ rb2.draw(i,j,w*fscale,h*fscale);
+ }
+ }
+
+ float notewidth=w/NUM_NOTES;
+ float noteheight=h/NUM_CONTROLLERS;
+
+ ofPushStyle();
+
+ if (note>0) {
+ switch(mode) {
+ case BLOCKS:
+ for (int i=0;i<NUM_CONTROLLERS;i++){
+ ofSetColor(ofColor((controller_colours[i].r*controllers[i])>>7,(controller_colours[i].g*controllers[i])>>7,(controller_colours[i].b*controllers[i])>>7));
+ ofRect((note-START_NOTE)*notewidth,i*noteheight,notewidth,noteheight);
+ }
+ break;
+ case LIST:
+ if (list.lock()) { //if playlist is loaded
+ if (list.layers.find(note)!=list.layers.end()) {
+ ofPushMatrix();
+ ofTranslate(w/2,h/2);
+ ofScale(scale,scale,scale);
+ ofTranslate(-w/2,-h/2);
+ if (controlColours) list.layers[note]->draw(a,controllers,w,h,transparentBlack,colShift);
+ else list.layers[note]->draw(a,w,h,colShift);
+ ofPopMatrix();
+ }
+ list.unlock();
+ }
+ break;
+ }
+ }
+
+ rb1.end();
+
+ rb2.begin();
+ ofSetColor(255,255,255);
+ ofBackground(0,0,0);
+ //rb1.draw(0,0);
+
+ //map on kinect skeleton
+ bindTexture(rb1);
+
+ glPushMatrix();
+ glScalef(ofGetWidth()/640.0f,ofGetHeight()/480.0f, 1);
+ for (int i=0;i<rUser->getNumberOfTrackedUsers();i++){
+ ofxTrackedUser* u=(rUser->getTrackedUser(i+1));
+
+ //if (u->skeletonTracking) {
+ if (u->neck.found) {
+ // u->debugDraw();
+ //ofxTrackedUser* u=
+ //printf("%i\n",(int)recordUser.getTrackedUser(i)->id);
+ //printf("tracking\n");
+
+ /*
+ glBegin(GL_QUADS);
+ glVertex3i(u->hip.position[0].X, u->hip.position[0].Y,u->hip.position[0].Z);
+ glVertex3i(u->hip.position[1].X, u->hip.position[1].Y,u->hip.position[1].Z);
+ glVertex3i(u->right_shoulder.position[1].X, u->right_shoulder.position[1].Y,u->right_shoulder.position[1].Z);
+ glVertex3i(u->left_shoulder.position[1].X, u->left_shoulder.position[1].Y, u->left_shoulder.position[1].Z);
+ glEnd();
+ */
+
+ /*
+ glBegin(GL_QUADS);
+ glVertex3i(u->hip.position[0].X, u->hip.position[0].Y,0);
+ glVertex3i(u->hip.position[1].X, u->hip.position[1].Y,0);
+ glVertex3i(u->right_shoulder.position[1].X, u->right_shoulder.position[1].Y,0);
+ glVertex3i(u->left_shoulder.position[1].X, u->left_shoulder.position[1].Y,0);
+ glEnd();
+ */
+
+ float ratio=16.0f/9.0f;
+ float heightratio=0.8f;
+ float widthratio=0.8f;
+
+ float ax=((float)(u->hip.position[1].X-u->hip.position[0].X)); //hip width x
+ float ay=((float)(u->hip.position[1].Y-u->hip.position[0].Y)); //hip width y
+
+ float cx=(float)(u->hip.position[0].X)+(ax*0.5f); //centre of hips
+ float cy=(float)(u->hip.position[0].Y)+(ay*0.5f);
+
+ float hx=(((float)(u->left_shoulder.position[0].X))-cx); //height of torso
+ float hy=(((float)(u->left_shoulder.position[0].Y))-cy);
+
+ float p1x=cx+(hx*(1.0f-heightratio)*0.5f); //centre of frame bottom
+ float p1y=cy+(hy*(1.0f-heightratio)*0.5f);
+
+ float p2x=cx+(hx*(1.0f-((1.0f-heightratio)*0.5f))); //centre of frame top
+ float p2y=cy+(hy*(1.0f-((1.0f-heightratio)*0.5f)));
+
+ ofVec3f c1=ofVec3f(p2x-(ax*0.5*widthratio), p2y-(ay*0.5*widthratio),0);
+ ofVec3f c2=ofVec3f(p2x+(ax*0.5*widthratio), p2y+(ay*0.5*widthratio),0);
+ ofVec3f c3=ofVec3f(p1x-(ax*0.5*widthratio), p1y-(ay*0.5*widthratio),0);
+ ofVec3f c4=ofVec3f(p1x+(ax*0.5*widthratio), p1y+(ay*0.5*widthratio),0);
+
+
+ /*
+ ofVec3f c1=ofVec3f(u->left_shoulder.position[1].X, u->left_shoulder.position[1].Y,0);
+ ofVec3f c2=ofVec3f(u->right_shoulder.position[1].X, u->right_shoulder.position[1].Y,0);
+ ofVec3f c3=ofVec3f(u->hip.position[1].X, u->hip.position[1].Y,0);
+ ofVec3f c4=ofVec3f(u->hip.position[0].X, u->hip.position[0].Y,0);
+ */
+
+
+ /*
+ glBegin(GL_QUADS);
+ glVertex3i(u->hip.position[1].X, u->hip.position[1].Y,0);
+ glVertex3i(u->hip.position[0].X, u->hip.position[0].Y,0);
+ glVertex3i(u->left_shoulder.position[1].X, u->left_shoulder.position[1].Y,0);
+ glVertex3i(u->right_shoulder.position[1].X, u->right_shoulder.position[1].Y,0);
+ glEnd();
+ */
+
+
+ ofMesh targ;
+ targ.addVertex(c1);
+ targ.addTexCoord(ofVec2f(0,0));
+ targ.addVertex(c2);
+ targ.addTexCoord(ofVec2f(1,0));
+ targ.addVertex(c3);
+ targ.addTexCoord(ofVec2f(0,1));
+ targ.addVertex(c3);
+ targ.addTexCoord(ofVec2f(0,1));
+ targ.addVertex(c2);
+ targ.addTexCoord(ofVec2f(1,0));
+ targ.addVertex(c4);
+ targ.addTexCoord(ofVec2f(1,1));
+ targ.draw();
+
+
+
+ //ofLine(u->left_shoulder.position[1].X,u->left_shoulder.position[1].Y,u->left_shoulder.position[1].Z,u->right_shoulder.position[1].X,u->right_shoulder.position[1].Y,u->right_shoulder.position[1].Z);
+ ofLine(u->right_shoulder.position[1].X,u->right_shoulder.position[1].Y,u->right_shoulder.position[1].Z,u->right_lower_torso.position[1].X,u->right_lower_torso.position[1].Y,u->right_lower_torso.position[1].Z);
+ ofLine(u->right_lower_torso.position[1].X,u->right_lower_torso.position[1].Y,u->right_lower_torso.position[1].Z,u->left_lower_torso.position[1].X,u->left_lower_torso.position[1].Y,u->left_lower_torso.position[1].Z);
+ ofLine(u->left_lower_torso.position[1].X,u->left_lower_torso.position[1].Y,u->left_lower_torso.position[1].Z,u->left_shoulder.position[1].X,u->left_shoulder.position[1].Y,u->left_shoulder.position[1].Z);
+
+ }
+ }
+ glPopMatrix();
+ unbindTexture(rb1);
+
+
+ rb2.end();
+
+ ofPushMatrix();
+ ofTranslate(x+(w/2),y+(h/2));
+ ofRotate(r);
+ //ofTranslate(-abs(sin(ofDegToRad(r))*h/2)-abs(cos(ofDegToRad(r))*w/2),-abs(sin(ofDegToRad(r))*w/2)-abs(cos(ofDegToRad(r))*h/2));
+ ofTranslate(ox,oy);
+
+ rb2.draw(0,0);
+
+ ofPopStyle();
+
+ ofPopMatrix();
+
+}
diff --git a/liveengine/src/viewport.h b/liveengine/src/viewport.h index 4f29a5b..350ea5d 100755 --- a/liveengine/src/viewport.h +++ b/liveengine/src/viewport.h @@ -1,6 +1,7 @@ #ifndef VIEWPORT_H
#define VIEWPORT_H
+#include "ofxOpenNI.h"
#include "ofMain.h"
#include "playlist.h"
@@ -13,21 +14,40 @@ #define BLOCKS 1
#define LIST 2
-
+void bindTexture(ofBaseHasTexture &t);
+void unbindTexture(ofBaseHasTexture &t);
+void bindTex(ofTexture &tex);
+void unbindTex(ofTexture &tex);
class viewport
{
public:
viewport();
- void setup(int w,int h,int x, int y,float r,int _ox,int _oy);
+ viewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
+ void setup(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
void draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
- virtual ~viewport();
+ void mapdraw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
+
+ virtual ~viewport();
+ void setUG(ofxUserGenerator *_rUser);
ofFbo rb1,rb2;
float r;
+ bool isMapped;
protected:
+ int x, y,w,h,ox,oy;
+
+ ofxUserGenerator *rUser;
private:
- int x, y,w,h,ox,oy;
+
+};
+
+class mappedviewport: public viewport {
+ public:
+ mappedviewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
+ void setUG(ofxUserGenerator *_rUser);
+ void mapdraw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
+ ofxUserGenerator *rUser;
};
#endif // VIEWPORT_H
|