diff --git a/example/meshExample/addons.make b/example/addons.make similarity index 100% rename from example/meshExample/addons.make rename to example/addons.make diff --git a/example/meshExample/bin/data/.gitkeep b/example/bin/data/.gitkeep similarity index 100% rename from example/meshExample/bin/data/.gitkeep rename to example/bin/data/.gitkeep diff --git a/example/meshExample/Project.xcconfig b/example/meshExample/Project.xcconfig deleted file mode 100644 index 72633e9..0000000 --- a/example/meshExample/Project.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED -OF_PATH = ../../../.. - -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE -#include "../../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" - -OTHER_LDFLAGS = $(OF_CORE_LIBS) -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) diff --git a/example/meshExample/meshExample.xcodeproj/project.pbxproj b/example/meshExample/meshExample.xcodeproj/project.pbxproj deleted file mode 100644 index 27d4e82..0000000 --- a/example/meshExample/meshExample.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1217 +0,0 @@ - - - - archiveVersion - 1 - classes - - objectVersion - 42 - objects - - 7938a53245bbe5d005288b3f06fdd748 - - explicitFileType - sourcecode.c.h - fileEncoding - 30 - isa - PBXFileReference - name - triangle.h - path - ../../../../addons/ofxTriangleMesh/libs/Triangle/triangle.h - sourceTree - SOURCE_ROOT - - 7e04d4fab9708987a9d1971851b4ac81 - - children - - a8e43c90843d9da179bd5f6d338dd0fa - 7938a53245bbe5d005288b3f06fdd748 - - isa - PBXGroup - name - Triangle - sourceTree - <group> - - fcaa0cca876cd31f282d632f5d8cb6b6 - - children - - 7e04d4fab9708987a9d1971851b4ac81 - - isa - PBXGroup - name - libs - sourceTree - <group> - - a58e30f81ffc795a1919b2b0b4f81dcd - - fileRef - a8e43c90843d9da179bd5f6d338dd0fa - isa - PBXBuildFile - - a8e43c90843d9da179bd5f6d338dd0fa - - explicitFileType - sourcecode.cpp.cpp - fileEncoding - 30 - isa - PBXFileReference - name - triangle.cpp - path - ../../../../addons/ofxTriangleMesh/libs/Triangle/triangle.cpp - sourceTree - SOURCE_ROOT - - 20896a8747958ab7edb07f1812b539cf - - explicitFileType - sourcecode.c.h - fileEncoding - 30 - isa - PBXFileReference - name - ofxTriangleMesh.h - path - ../../../../addons/ofxTriangleMesh/src/ofxTriangleMesh.h - sourceTree - SOURCE_ROOT - - 374c131120f53c04b100fe9033bdbbf8 - - children - - 3e88bb56bfb0306d19ddb1ac0c375b45 - 20896a8747958ab7edb07f1812b539cf - - isa - PBXGroup - name - src - sourceTree - <group> - - 53bebf43328554cda832cc05f26a9bcf - - children - - 374c131120f53c04b100fe9033bdbbf8 - fcaa0cca876cd31f282d632f5d8cb6b6 - - isa - PBXGroup - name - ofxTriangleMesh - sourceTree - <group> - - 220d3fa0b8d1a5e3af568f1594e7f026 - - fileRef - 3e88bb56bfb0306d19ddb1ac0c375b45 - isa - PBXBuildFile - - 3e88bb56bfb0306d19ddb1ac0c375b45 - - explicitFileType - sourcecode.cpp.cpp - fileEncoding - 30 - isa - PBXFileReference - name - ofxTriangleMesh.cpp - path - ../../../../addons/ofxTriangleMesh/src/ofxTriangleMesh.cpp - sourceTree - SOURCE_ROOT - - BB4B014C10F69532006C3DED - - children - - 53bebf43328554cda832cc05f26a9bcf - - isa - PBXGroup - name - addons - sourceTree - <group> - - BBAB23BE13894E4700AA2426 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - GLUT.framework - path - ../../../../libs/glut/lib/osx/GLUT.framework - sourceTree - <group> - - BBAB23C913894ECA00AA2426 - - children - - E4C2424410CC5A17004149E2 - E4C2424510CC5A17004149E2 - E4C2424610CC5A17004149E2 - E45BE9710E8CC7DD009D7055 - E45BE9720E8CC7DD009D7055 - E45BE9730E8CC7DD009D7055 - E45BE9740E8CC7DD009D7055 - E45BE9750E8CC7DD009D7055 - E45BE9760E8CC7DD009D7055 - E45BE9770E8CC7DD009D7055 - E45BE9790E8CC7DD009D7055 - E45BE97A0E8CC7DD009D7055 - - isa - PBXGroup - name - system frameworks - sourceTree - <group> - - BBAB23CA13894EDB00AA2426 - - children - - BBAB23BE13894E4700AA2426 - - isa - PBXGroup - name - 3rd party frameworks - sourceTree - <group> - - BBAB23CB13894F3D00AA2426 - - fileRef - BBAB23BE13894E4700AA2426 - isa - PBXBuildFile - - E4328143138ABC890047C5CB - - isa - PBXFileReference - lastKnownFileType - wrapper.pb-project - name - openFrameworksLib.xcodeproj - path - ../../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj - sourceTree - SOURCE_ROOT - - E4328144138ABC890047C5CB - - children - - E4328148138ABC890047C5CB - - isa - PBXGroup - name - Products - sourceTree - <group> - - E4328147138ABC890047C5CB - - containerPortal - E4328143138ABC890047C5CB - isa - PBXContainerItemProxy - proxyType - 2 - remoteGlobalIDString - E4B27C1510CBEB8E00536013 - remoteInfo - openFrameworks - - E4328148138ABC890047C5CB - - fileType - archive.ar - isa - PBXReferenceProxy - path - openFrameworks.a - remoteRef - E4328147138ABC890047C5CB - sourceTree - BUILT_PRODUCTS_DIR - - E4328149138ABC9F0047C5CB - - fileRef - E4328148138ABC890047C5CB - isa - PBXBuildFile - - E45BE5980E8CC70C009D7055 - - children - - BBAB23CA13894EDB00AA2426 - BBAB23C913894ECA00AA2426 - - isa - PBXGroup - name - frameworks - sourceTree - <group> - - E45BE9710E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - AGL.framework - path - /System/Library/Frameworks/AGL.framework - sourceTree - <absolute> - - E45BE9720E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - ApplicationServices.framework - path - /System/Library/Frameworks/ApplicationServices.framework - sourceTree - <absolute> - - E45BE9730E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - AudioToolbox.framework - path - /System/Library/Frameworks/AudioToolbox.framework - sourceTree - <absolute> - - E45BE9740E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - Carbon.framework - path - /System/Library/Frameworks/Carbon.framework - sourceTree - <absolute> - - E45BE9750E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreAudio.framework - path - /System/Library/Frameworks/CoreAudio.framework - sourceTree - <absolute> - - E45BE9760E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreFoundation.framework - path - /System/Library/Frameworks/CoreFoundation.framework - sourceTree - <absolute> - - E45BE9770E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreServices.framework - path - /System/Library/Frameworks/CoreServices.framework - sourceTree - <absolute> - - E45BE9790E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - OpenGL.framework - path - /System/Library/Frameworks/OpenGL.framework - sourceTree - <absolute> - - E45BE97A0E8CC7DD009D7055 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - QuickTime.framework - path - /System/Library/Frameworks/QuickTime.framework - sourceTree - <absolute> - - E45BE97B0E8CC7DD009D7055 - - fileRef - E45BE9710E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE97C0E8CC7DD009D7055 - - fileRef - E45BE9720E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE97D0E8CC7DD009D7055 - - fileRef - E45BE9730E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE97E0E8CC7DD009D7055 - - fileRef - E45BE9740E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE97F0E8CC7DD009D7055 - - fileRef - E45BE9750E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE9800E8CC7DD009D7055 - - fileRef - E45BE9760E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE9810E8CC7DD009D7055 - - fileRef - E45BE9770E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE9830E8CC7DD009D7055 - - fileRef - E45BE9790E8CC7DD009D7055 - isa - PBXBuildFile - - E45BE9840E8CC7DD009D7055 - - fileRef - E45BE97A0E8CC7DD009D7055 - isa - PBXBuildFile - - E4B69B4A0A3A1720003C02F2 - - children - - E4B6FCAD0C3E899E008CF71C - E4EB6923138AFD0F00A09F29 - E4B69E1C0A3A1BDC003C02F2 - E4EEC9E9138DF44700A80321 - BB4B014C10F69532006C3DED - E45BE5980E8CC70C009D7055 - E4B69B5B0A3A1756003C02F2 - - isa - PBXGroup - sourceTree - <group> - - E4B69B4C0A3A1720003C02F2 - - buildConfigurationList - E4B69B4D0A3A1720003C02F2 - compatibilityVersion - Xcode 2.4 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions - - English - Japanese - French - German - - mainGroup - E4B69B4A0A3A1720003C02F2 - productRefGroup - E4B69B4A0A3A1720003C02F2 - projectDirPath - - projectReferences - - - ProductGroup - E4328144138ABC890047C5CB - ProjectRef - E4328143138ABC890047C5CB - - - projectRoot - - targets - - E4B69B5A0A3A1756003C02F2 - - - E4B69B4D0A3A1720003C02F2 - - buildConfigurations - - E4B69B4E0A3A1720003C02F2 - E4B69B4F0A3A1720003C02F2 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - E4B69B4E0A3A1720003C02F2 - - baseConfigurationReference - E4EB6923138AFD0F00A09F29 - buildSettings - - HEADER_SEARCH_PATHS - - $(OF_CORE_HEADERS) - ../../../../addons/ofxTriangleMesh/libs - ../../../../addons/ofxTriangleMesh/libs/Triangle - ../../../../addons/ofxTriangleMesh/src - - ARCHS - $(NATIVE_ARCH) - CONFIGURATION_BUILD_DIR - $(SRCROOT)/bin/ - COPY_PHASE_STRIP - NO - DEAD_CODE_STRIPPING - YES - GCC_AUTO_VECTORIZATION - YES - GCC_ENABLE_SSE3_EXTENSIONS - YES - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS - YES - GCC_INLINES_ARE_PRIVATE_EXTERN - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS - NO - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO - NO - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL - NO - GCC_WARN_UNINITIALIZED_AUTOS - NO - GCC_WARN_UNUSED_VALUE - NO - GCC_WARN_UNUSED_VARIABLE - NO - OTHER_CPLUSPLUSFLAGS - - -D__MACOSX_CORE__ - -lpthread - -mtune=native - - - isa - XCBuildConfiguration - name - Debug - - E4B69B4F0A3A1720003C02F2 - - baseConfigurationReference - E4EB6923138AFD0F00A09F29 - buildSettings - - HEADER_SEARCH_PATHS - - $(OF_CORE_HEADERS) - ../../../../addons/ofxTriangleMesh/libs - ../../../../addons/ofxTriangleMesh/libs/Triangle - ../../../../addons/ofxTriangleMesh/src - - ARCHS - $(NATIVE_ARCH) - CONFIGURATION_BUILD_DIR - $(SRCROOT)/bin/ - COPY_PHASE_STRIP - YES - DEAD_CODE_STRIPPING - YES - GCC_AUTO_VECTORIZATION - YES - GCC_ENABLE_SSE3_EXTENSIONS - YES - GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS - YES - GCC_INLINES_ARE_PRIVATE_EXTERN - NO - GCC_OPTIMIZATION_LEVEL - 3 - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_UNROLL_LOOPS - YES - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS - NO - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO - NO - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL - NO - GCC_WARN_UNINITIALIZED_AUTOS - NO - GCC_WARN_UNUSED_VALUE - NO - GCC_WARN_UNUSED_VARIABLE - NO - OTHER_CPLUSPLUSFLAGS - - -D__MACOSX_CORE__ - -lpthread - -mtune=native - - - isa - XCBuildConfiguration - name - Release - - E4B69B580A3A1756003C02F2 - - buildActionMask - 2147483647 - files - - E4B69E200A3A1BDC003C02F2 - E4B69E210A3A1BDC003C02F2 - 220d3fa0b8d1a5e3af568f1594e7f026 - a58e30f81ffc795a1919b2b0b4f81dcd - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - E4B69B590A3A1756003C02F2 - - buildActionMask - 2147483647 - files - - E4EB6799138ADC1D00A09F29 - E4328149138ABC9F0047C5CB - E45BE97B0E8CC7DD009D7055 - E45BE97C0E8CC7DD009D7055 - E45BE97D0E8CC7DD009D7055 - E45BE97E0E8CC7DD009D7055 - E45BE97F0E8CC7DD009D7055 - E45BE9800E8CC7DD009D7055 - E45BE9810E8CC7DD009D7055 - E45BE9830E8CC7DD009D7055 - E45BE9840E8CC7DD009D7055 - E4C2424710CC5A17004149E2 - E4C2424810CC5A17004149E2 - E4C2424910CC5A17004149E2 - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - E4B69B5A0A3A1756003C02F2 - - buildConfigurationList - E4B69B5F0A3A1757003C02F2 - buildPhases - - E4B69B580A3A1756003C02F2 - E4B69B590A3A1756003C02F2 - E4B6FFFD0C3F9AB9008CF71C - E4C2427710CC5ABF004149E2 - - buildRules - - dependencies - - E4EEB9AC138B136A00A80321 - - isa - PBXNativeTarget - name - meshExample - productName - myOFApp - productReference - E4B69B5B0A3A1756003C02F2 - productType - com.apple.product-type.application - - E4B69B5B0A3A1756003C02F2 - - explicitFileType - wrapper.application - includeInIndex - 0 - isa - PBXFileReference - path - meshExampleDebug.app - sourceTree - BUILT_PRODUCTS_DIR - - E4B69B5F0A3A1757003C02F2 - - buildConfigurations - - E4B69B600A3A1757003C02F2 - E4B69B610A3A1757003C02F2 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - E4B69B600A3A1757003C02F2 - - buildSettings - - COPY_PHASE_STRIP - NO - FRAMEWORK_SEARCH_PATHS - - $(inherited) - $(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1) - - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 - "$(SRCROOT)/../../../../libs/glut/lib/osx" - GCC_DYNAMIC_NO_PIC - NO - GCC_ENABLE_FIX_AND_CONTINUE - YES - GCC_GENERATE_DEBUGGING_SYMBOLS - YES - GCC_MODEL_TUNING - NONE - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h - INFOPLIST_FILE - openFrameworks-Info.plist - INSTALL_PATH - $(HOME)/Applications - LIBRARY_SEARCH_PATHS - - $(inherited) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52) - - PREBINDING - NO - PRODUCT_NAME - $(TARGET_NAME)Debug - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Debug - - E4B69B610A3A1757003C02F2 - - buildSettings - - COPY_PHASE_STRIP - YES - FRAMEWORK_SEARCH_PATHS - - $(inherited) - $(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1) - - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 - "$(SRCROOT)/../../../../libs/glut/lib/osx" - GCC_ENABLE_FIX_AND_CONTINUE - NO - GCC_GENERATE_DEBUGGING_SYMBOLS - YES - GCC_MODEL_TUNING - NONE - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h - INFOPLIST_FILE - openFrameworks-Info.plist - INSTALL_PATH - $(HOME)/Applications - LIBRARY_SEARCH_PATHS - - $(inherited) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2) - $(LIBRARY_SEARCH_PATHS_QUOTED_1) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50) - $(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51) - - PREBINDING - NO - PRODUCT_NAME - $(TARGET_NAME) - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Release - - E4B69E1C0A3A1BDC003C02F2 - - children - - E4B69E1D0A3A1BDC003C02F2 - E4B69E1E0A3A1BDC003C02F2 - E4B69E1F0A3A1BDC003C02F2 - - isa - PBXGroup - path - src - sourceTree - SOURCE_ROOT - - E4B69E1D0A3A1BDC003C02F2 - - fileEncoding - 30 - isa - PBXFileReference - lastKnownFileType - sourcecode.cpp.cpp - name - main.cpp - path - src/main.cpp - sourceTree - SOURCE_ROOT - - E4B69E1E0A3A1BDC003C02F2 - - explicitFileType - sourcecode.cpp.cpp - fileEncoding - 30 - isa - PBXFileReference - name - testApp.cpp - path - src/testApp.cpp - sourceTree - SOURCE_ROOT - - E4B69E1F0A3A1BDC003C02F2 - - fileEncoding - 30 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - testApp.h - path - src/testApp.h - sourceTree - SOURCE_ROOT - - E4B69E200A3A1BDC003C02F2 - - fileRef - E4B69E1D0A3A1BDC003C02F2 - isa - PBXBuildFile - - E4B69E210A3A1BDC003C02F2 - - fileRef - E4B69E1E0A3A1BDC003C02F2 - isa - PBXBuildFile - - E4B6FCAD0C3E899E008CF71C - - fileEncoding - 30 - isa - PBXFileReference - lastKnownFileType - text.plist.xml - path - openFrameworks-Info.plist - sourceTree - <group> - - E4B6FFFD0C3F9AB9008CF71C - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - cp -f ../../../../libs/fmodex/lib/osx/libfmodex.dylib "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME"; - - E4C2424410CC5A17004149E2 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - AppKit.framework - path - /System/Library/Frameworks/AppKit.framework - sourceTree - <absolute> - - E4C2424510CC5A17004149E2 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - Cocoa.framework - path - /System/Library/Frameworks/Cocoa.framework - sourceTree - <absolute> - - E4C2424610CC5A17004149E2 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - IOKit.framework - path - /System/Library/Frameworks/IOKit.framework - sourceTree - <absolute> - - E4C2424710CC5A17004149E2 - - fileRef - E4C2424410CC5A17004149E2 - isa - PBXBuildFile - - E4C2424810CC5A17004149E2 - - fileRef - E4C2424510CC5A17004149E2 - isa - PBXBuildFile - - E4C2424910CC5A17004149E2 - - fileRef - E4C2424610CC5A17004149E2 - isa - PBXBuildFile - - E4C2427710CC5ABF004149E2 - - buildActionMask - 2147483647 - dstPath - - dstSubfolderSpec - 10 - files - - BBAB23CB13894F3D00AA2426 - - isa - PBXCopyFilesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - E4EB6799138ADC1D00A09F29 - - fileRef - BBAB23BE13894E4700AA2426 - isa - PBXBuildFile - - E4EB691F138AFCF100A09F29 - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - CoreOF.xcconfig - path - ../../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig - sourceTree - SOURCE_ROOT - - E4EB6923138AFD0F00A09F29 - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Project.xcconfig - sourceTree - <group> - - E4EEB9AB138B136A00A80321 - - containerPortal - E4328143138ABC890047C5CB - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - E4B27C1410CBEB8E00536013 - remoteInfo - openFrameworks - - E4EEB9AC138B136A00A80321 - - isa - PBXTargetDependency - name - openFrameworks - targetProxy - E4EEB9AB138B136A00A80321 - - E4EEC9E9138DF44700A80321 - - children - - E4EB691F138AFCF100A09F29 - E4328143138ABC890047C5CB - - isa - PBXGroup - name - openFrameworks - sourceTree - <group> - - - rootObject - E4B69B4C0A3A1720003C02F2 - - diff --git a/example/meshExample/meshExample.xcodeproj/xcshareddata/xcschemes/meshExample Debug.xcscheme b/example/meshExample/meshExample.xcodeproj/xcshareddata/xcschemes/meshExample Debug.xcscheme deleted file mode 100644 index bc30738..0000000 --- a/example/meshExample/meshExample.xcodeproj/xcshareddata/xcschemes/meshExample Debug.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/meshExample/meshExample.xcodeproj/xcshareddata/xcschemes/meshExample Release.xcscheme b/example/meshExample/meshExample.xcodeproj/xcshareddata/xcschemes/meshExample Release.xcscheme deleted file mode 100644 index b264d3a..0000000 --- a/example/meshExample/meshExample.xcodeproj/xcshareddata/xcschemes/meshExample Release.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/meshExample/openFrameworks-Info.plist b/example/meshExample/openFrameworks-Info.plist deleted file mode 100644 index e5db555..0000000 --- a/example/meshExample/openFrameworks-Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.yourcompany.openFrameworks - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - diff --git a/example/meshExample/src/main.cpp b/example/src/main.cpp similarity index 54% rename from example/meshExample/src/main.cpp rename to example/src/main.cpp index 6a32c6a..8bce185 100644 --- a/example/meshExample/src/main.cpp +++ b/example/src/main.cpp @@ -1,16 +1,14 @@ #include "ofMain.h" -#include "testApp.h" -#include "ofAppGlutWindow.h" +#include "ofApp.h" //======================================================================== int main( ){ - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context + ofSetupOpenGL(1024,768, OF_WINDOW); // <-------- setup the GL context // this kicks off the running of my app // can be OF_WINDOW or OF_FULLSCREEN // pass in width and height too: - ofRunApp( new testApp()); + ofRunApp( new ofApp()); } diff --git a/example/meshExample/src/testApp.cpp b/example/src/ofApp.cpp similarity index 80% rename from example/meshExample/src/testApp.cpp rename to example/src/ofApp.cpp index 8143a8f..0252b41 100644 --- a/example/meshExample/src/testApp.cpp +++ b/example/src/ofApp.cpp @@ -1,18 +1,18 @@ -#include "testApp.h" +#include "ofApp.h" //-------------------------------------------------------------- -void testApp::setup(){ +void ofApp::setup(){ } //-------------------------------------------------------------- -void testApp::update(){ +void ofApp::update(){ } //-------------------------------------------------------------- -void testApp::draw(){ +void ofApp::draw(){ ofBackgroundGradient(ofColor::white, ofColor(200,200,200), OF_GRADIENT_LINEAR); @@ -24,36 +24,36 @@ void testApp::draw(){ } //-------------------------------------------------------------- -void testApp::keyPressed(int key){ +void ofApp::keyPressed(int key){ } //-------------------------------------------------------------- -void testApp::keyReleased(int key){ +void ofApp::keyReleased(int key){ } //-------------------------------------------------------------- -void testApp::mouseMoved(int x, int y ){ +void ofApp::mouseMoved(int x, int y ){ } //-------------------------------------------------------------- -void testApp::mouseDragged(int x, int y, int button){ +void ofApp::mouseDragged(int x, int y, int button){ line.addVertex(ofPoint(x, y)); } //-------------------------------------------------------------- -void testApp::mousePressed(int x, int y, int button){ +void ofApp::mousePressed(int x, int y, int button){ line.clear(); line.addVertex(ofPoint(x, y)); } //-------------------------------------------------------------- -void testApp::mouseReleased(int x, int y, int button){ +void ofApp::mouseReleased(int x, int y, int button){ if (line.size() > 2){ @@ -84,16 +84,16 @@ void testApp::mouseReleased(int x, int y, int button){ } //-------------------------------------------------------------- -void testApp::windowResized(int w, int h){ +void ofApp::windowResized(int w, int h){ } //-------------------------------------------------------------- -void testApp::gotMessage(ofMessage msg){ +void ofApp::gotMessage(ofMessage msg){ } //-------------------------------------------------------------- -void testApp::dragEvent(ofDragInfo dragInfo){ +void ofApp::dragEvent(ofDragInfo dragInfo){ } \ No newline at end of file diff --git a/example/meshExample/src/testApp.h b/example/src/ofApp.h similarity index 94% rename from example/meshExample/src/testApp.h rename to example/src/ofApp.h index 24c3541..8490ffa 100644 --- a/example/meshExample/src/testApp.h +++ b/example/src/ofApp.h @@ -5,7 +5,7 @@ -class testApp : public ofBaseApp{ +class ofApp : public ofBaseApp{ public: void setup(); diff --git a/src/ofxTriangleMesh.cpp b/src/ofxTriangleMesh.cpp index f33de83..962009f 100755 --- a/src/ofxTriangleMesh.cpp +++ b/src/ofxTriangleMesh.cpp @@ -118,7 +118,7 @@ void ofxTriangleMesh::triangulate(ofPolyline contour, float angleConstraint, flo // here we check if a triangle is "inside" a contour to drop non inner triangles - if( isPointInsidePolygon(&contour[0], contour.size(), getTriangleCenter(tr) ) ) { + if( isPointInsidePolygon(contour.getVertices(), contour.size(), getTriangleCenter(tr) ) ) { triangle.randomColor = ofColor(ofRandom(0,255), ofRandom(0,255), ofRandom(0,255)); triangles.push_back(triangle); @@ -192,12 +192,12 @@ ofPoint ofxTriangleMesh::getTriangleCenter(ofPoint *tr){ return ofPoint(c_x, c_y); } -bool ofxTriangleMesh::isPointInsidePolygon(ofPoint *polygon,int N, ofPoint p) +bool ofxTriangleMesh::isPointInsidePolygon(const vector& polygon,int N, ofPoint p) { int counter = 0; int i; double xinters; - ofPoint p1,p2; + ofDefaultVec3 p1,p2; p1 = polygon[0]; @@ -230,9 +230,9 @@ void ofxTriangleMesh::draw() { ofFill(); ofSetColor( triangles[i].randomColor); - ofTriangle( outputPts[triangles[i].index[0]], - outputPts[triangles[i].index[1]], - outputPts[triangles[i].index[2]]); + ofDrawTriangle( outputPts[triangles[i].index[0]], + outputPts[triangles[i].index[1]], + outputPts[triangles[i].index[2]] ); } @@ -242,3 +242,4 @@ void ofxTriangleMesh::draw() { triangulatedMesh.drawWireframe(); } + diff --git a/src/ofxTriangleMesh.h b/src/ofxTriangleMesh.h index 06d8944..79f4a36 100755 --- a/src/ofxTriangleMesh.h +++ b/src/ofxTriangleMesh.h @@ -65,7 +65,7 @@ class ofxTriangleMesh { ofPoint getTriangleCenter(ofPoint *tr); - bool isPointInsidePolygon(ofPoint *polygon,int N, ofPoint p); + bool isPointInsidePolygon(const vector& polygon,int N, ofPoint p); void draw(); void clear(); @@ -79,4 +79,5 @@ class ofxTriangleMesh { -}; \ No newline at end of file +}; +