From 796d647fd38f7cf01cb70bbb0700b75427e42d55 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 28 Oct 2012 17:40:19 +0000 Subject: starting to build kinect addition --- liveengine/Makefile | 466 +-------- liveengine/addons.make | 6 +- liveengine/bin/data/american_football.xml | 2 +- liveengine/bin/data/birds.xml | 2 +- liveengine/bin/data/computers.xml | 2 +- liveengine/bin/data/crests.xml | 2 +- liveengine/bin/data/cricket.xml | 2 +- liveengine/bin/data/dancing.xml | 132 +-- liveengine/bin/data/food.xml | 2 +- liveengine/bin/data/insects.xml | 123 +-- liveengine/bin/data/makeplaylist.py | 20 +- liveengine/bin/data/mil_historic.xml | 2 +- liveengine/bin/data/military_ethnic.xml | 2 +- liveengine/bin/data/miltary_ladies.xml | 68 -- liveengine/bin/data/organs.xml | 2 +- liveengine/bin/data/reptiles.xml | 137 ++- liveengine/bin/data/settings.xml | 1 + liveengine/bin/data/tai_chi.xml | 137 ++- liveengine/bin/data/teamsports.xml | 131 ++- liveengine/bin/data/tools.xml | 2 +- liveengine/bin/data/trainers.xml | 2 +- liveengine/bin/data/women_ethnic.xml | 138 ++- liveengine/bin/data/yoga.xml | 2 +- liveengine/config.make | 42 +- liveengine/liveengine.cbp | 20 +- liveengine/liveengine.layout | 45 +- liveengine/liveengine_win.cbp | 203 ---- liveengine/liveengine_win.depend | 1476 ----------------------------- liveengine/liveengine_win.layout | 13 - liveengine/src/layers.cpp | 18 +- liveengine/src/layers.h | 5 +- liveengine/src/main.cpp | 2 +- liveengine/src/playlist.cpp | 54 +- liveengine/src/playlist.h | 11 +- liveengine/src/testApp.cpp | 137 ++- liveengine/src/testApp.h | 31 +- liveengine/src/viewport.cpp | 234 +++++ liveengine/src/viewport.h | 28 +- liveengineUnmapped/src/layers.cpp | 115 +++ liveengineUnmapped/src/layers.h | 54 ++ liveengineUnmapped/src/main.cpp | 20 + liveengineUnmapped/src/playlist.cpp | 91 ++ liveengineUnmapped/src/playlist.h | 30 + liveengineUnmapped/src/testApp.cpp | 577 +++++++++++ liveengineUnmapped/src/testApp.h | 205 ++++ liveengineUnmapped/src/viewport.cpp | 110 +++ liveengineUnmapped/src/viewport.h | 34 + 47 files changed, 2190 insertions(+), 2748 deletions(-) mode change 100644 => 100755 liveengine/Makefile delete mode 100644 liveengine/bin/data/miltary_ladies.xml mode change 100644 => 100755 liveengine/config.make mode change 100644 => 100755 liveengine/liveengine.cbp mode change 100644 => 100755 liveengine/liveengine.layout delete mode 100644 liveengine/liveengine_win.cbp delete mode 100644 liveengine/liveengine_win.depend delete mode 100644 liveengine/liveengine_win.layout mode change 100644 => 100755 liveengine/src/playlist.h create mode 100755 liveengineUnmapped/src/layers.cpp create mode 100755 liveengineUnmapped/src/layers.h create mode 100755 liveengineUnmapped/src/main.cpp create mode 100755 liveengineUnmapped/src/playlist.cpp create mode 100755 liveengineUnmapped/src/playlist.h create mode 100755 liveengineUnmapped/src/testApp.cpp create mode 100755 liveengineUnmapped/src/testApp.h create mode 100755 liveengineUnmapped/src/viewport.cpp create mode 100755 liveengineUnmapped/src/viewport.h diff --git a/liveengine/Makefile b/liveengine/Makefile old mode 100644 new mode 100755 index a6b3711..2d83a77 --- 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + 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 @@ - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + 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 @@ - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + diff --git a/liveengine/config.make b/liveengine/config.make old mode 100644 new mode 100755 index a444a20..4202b4a --- 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 old mode 100644 new mode 100755 index de55eca..0abe73e --- a/liveengine/liveengine.cbp +++ b/liveengine/liveengine.cbp @@ -4,10 +4,9 @@