Skip to content

Commit 8db799e

Browse files
motoishmzmotoishmz
committed
Squashed commit of the following:
commit 253cc6c Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sat Jun 8 22:32:57 2013 +0900 added tiny script to kill all ds_store commit 517422f Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sat Jun 8 22:01:31 2013 +0900 ignored *.app commit 82c2842 Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sat Jun 8 21:42:58 2013 +0900 added second args to ramInitialize(). bool usePresetScenes is used for show/hide preset scene buttons on GUI commit 7a03aa5 Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sat Jun 8 20:44:13 2013 +0900 added Preprocessor Macros commit 8c7e5ca Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Fri Jun 7 17:27:45 2013 +0900 changed revision commit 6b5d746 Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Fri Jun 7 16:50:29 2013 +0900 added revision specification commit c77c5e8 Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Thu Jun 6 22:13:11 2013 +0900 changed deployment target, base sdk settings commit 900bc7c Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sun Apr 28 22:10:56 2013 +0900 ignored MotionData-OSCServer commit 6dad9cf Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sun Apr 28 21:31:24 2013 +0900 added release build setting commit ef58b6d Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sun Apr 28 14:54:44 2013 +0900 added vs2010proj file commit a561d72 Author: Motoi Shimizu <shimizu.motoi@gmail.com> Date: Sun Apr 28 02:25:38 2013 +0900 RAMOSCServer initital commit
1 parent 7f39c9d commit 8db799e

38 files changed

Lines changed: 3293 additions & 50 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ bin/data
3535

3636
resources/Sounds/
3737
resources/MotionData/
38+
resources/MotionData-OSCServer/
3839
resources/Settings/cache/
3940
!resources/Sounds/.gitkeep
4041
!resources/MotionData/.gitkeep
4142
!resources/Settings/cache/.gitkeep
42-
resources/Settings/presets/preset.init.xml
43+
resources/Settings/presets/preset.init.xml

‎apps/RAMDanceToolkit/RAMDanceToolkit.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
E45BE9770E8CC7DD009D7055 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
151151
E45BE9790E8CC7DD009D7055 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
152152
E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
153-
E4B69B5B0A3A1756003C02F2 /* RAMDanceToolkitDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = RAMDanceToolkitDebug.app; path = "RAM Dance ToolkitDebug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
153+
E4B69B5B0A3A1756003C02F2 /* RAM Dance ToolkitDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RAM Dance ToolkitDebug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
154154
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
155155
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; };
156156
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; };
@@ -522,7 +522,7 @@
522522
E4EEC9E9138DF44700A80321 /* openFrameworks */,
523523
BB4B014C10F69532006C3DED /* addons */,
524524
E45BE5980E8CC70C009D7055 /* frameworks */,
525-
E4B69B5B0A3A1756003C02F2 /* RAMDanceToolkitDebug.app */,
525+
E4B69B5B0A3A1756003C02F2 /* RAM Dance ToolkitDebug.app */,
526526
);
527527
sourceTree = "<group>";
528528
};
@@ -567,7 +567,7 @@
567567
);
568568
name = "RAM Dance Toolkit";
569569
productName = myOFApp;
570-
productReference = E4B69B5B0A3A1756003C02F2 /* RAMDanceToolkitDebug.app */;
570+
productReference = E4B69B5B0A3A1756003C02F2 /* RAM Dance ToolkitDebug.app */;
571571
productType = "com.apple.product-type.application";
572572
};
573573
/* End PBXNativeTarget section */
@@ -697,11 +697,13 @@
697697
GCC_WARN_UNINITIALIZED_AUTOS = NO;
698698
GCC_WARN_UNUSED_VALUE = NO;
699699
GCC_WARN_UNUSED_VARIABLE = NO;
700+
MACOSX_DEPLOYMENT_TARGET = 10.7;
700701
OTHER_CPLUSPLUSFLAGS = (
701702
"-D__MACOSX_CORE__",
702703
"-lpthread",
703704
"-mtune=native",
704705
);
706+
SDKROOT = macosx10.7;
705707
VALID_ARCHS = i386;
706708
};
707709
name = Debug;
@@ -727,11 +729,13 @@
727729
GCC_WARN_UNINITIALIZED_AUTOS = NO;
728730
GCC_WARN_UNUSED_VALUE = NO;
729731
GCC_WARN_UNUSED_VARIABLE = NO;
732+
MACOSX_DEPLOYMENT_TARGET = 10.7;
730733
OTHER_CPLUSPLUSFLAGS = (
731734
"-D__MACOSX_CORE__",
732735
"-lpthread",
733736
"-mtune=native",
734737
);
738+
SDKROOT = macosx10.7;
735739
VALID_ARCHS = i386;
736740
};
737741
name = Release;
@@ -751,6 +755,7 @@
751755
GCC_MODEL_TUNING = NONE;
752756
GCC_PRECOMPILE_PREFIX_HEADER = YES;
753757
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
758+
GCC_PREPROCESSOR_DEFINITIONS = "";
754759
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
755760
INFOPLIST_FILE = "openFrameworks-Info.plist";
756761
INSTALL_PATH = "$(HOME)/Applications";
@@ -829,7 +834,9 @@
829834
"\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/vs2010\"",
830835
"\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/win_cb\"",
831836
);
837+
MACOSX_DEPLOYMENT_TARGET = 10.7;
832838
PRODUCT_NAME = "$(TARGET_NAME)Debug";
839+
SDKROOT = macosx10.7;
833840
VALID_ARCHS = i386;
834841
WRAPPER_EXTENSION = app;
835842
};
@@ -849,6 +856,7 @@
849856
GCC_MODEL_TUNING = NONE;
850857
GCC_PRECOMPILE_PREFIX_HEADER = YES;
851858
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
859+
GCC_PREPROCESSOR_DEFINITIONS = "";
852860
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
853861
INFOPLIST_FILE = "openFrameworks-Info.plist";
854862
INSTALL_PATH = "$(HOME)/Applications";
@@ -927,7 +935,9 @@
927935
"\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/vs2010\"",
928936
"\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/win_cb\"",
929937
);
938+
MACOSX_DEPLOYMENT_TARGET = 10.7;
930939
PRODUCT_NAME = "$(TARGET_NAME)";
940+
SDKROOT = macosx10.7;
931941
VALID_ARCHS = i386;
932942
WRAPPER_EXTENSION = app;
933943
};

‎apps/RAMDanceToolkit/RAMDanceToolkit.xcodeproj/xcshareddata/xcschemes/RAMDanceToolkit Release.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
launchStyle = "0"
4545
useCustomWorkingDirectory = "NO"
4646
buildConfiguration = "Release"
47+
ignoresPersistentStateOnLaunch = "NO"
4748
debugDocumentVersioning = "YES"
4849
allowLocationSimulation = "YES">
4950
<BuildableProductRunnable>

‎apps/RAMDanceToolkit/src/testApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void testApp::setup()
9090

9191
/// ram setup
9292
// ------------------
93-
ramInitialize(10000);
93+
ramInitialize(10000, true);
9494

9595

9696
/// scenes setup

‎apps/RAMOSCServer/Project.xcconfig‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT.
2+
//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
3+
OF_PATH = ../../..
4+
5+
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
6+
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
7+
#include "../../libs/project/osx/ramProject.xcconfig"
8+
9+
OTHER_LDFLAGS = $(OF_CORE_LIBS)
10+
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(RAM_HEADER_SEARCH_PATHS)

‎apps/RAMOSCServer/RAMOSCServer.sln‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RAMOSCServer", "RAMOSCServer.vcxproj", "{7D93DFB1-5004-CD4D-876F-2571B87FB6AA}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|Win32 = Debug|Win32
9+
Release|Win32 = Release|Win32
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12+
{7D93DFB1-5004-CD4D-876F-2571B87FB6AA}.Debug|Win32.ActiveCfg = Debug|Win32
13+
{7D93DFB1-5004-CD4D-876F-2571B87FB6AA}.Debug|Win32.Build.0 = Debug|Win32
14+
{7D93DFB1-5004-CD4D-876F-2571B87FB6AA}.Release|Win32.ActiveCfg = Release|Win32
15+
{7D93DFB1-5004-CD4D-876F-2571B87FB6AA}.Release|Win32.Build.0 = Release|Win32
16+
EndGlobalSection
17+
GlobalSection(SolutionProperties) = preSolution
18+
HideSolutionNode = FALSE
19+
EndGlobalSection
20+
EndGlobal

0 commit comments

Comments
 (0)