Skip to content

Commit

Permalink
using
Browse files Browse the repository at this point in the history
  • Loading branch information
Gorka Cortazar committed Jul 24, 2014
1 parent 28bf61d commit fa264ea
Show file tree
Hide file tree
Showing 3 changed files with 809 additions and 517 deletions.
62 changes: 40 additions & 22 deletions CloudsStoryEngine/StoryEngine64.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@
E7211C2718A284400063EF97 /* ofxEasingQuint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E721191118A284350063EF97 /* ofxEasingQuint.cpp */; };
E7211C2818A284400063EF97 /* ofxEasingSine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E721191318A284350063EF97 /* ofxEasingSine.cpp */; };
E7211C2918A284400063EF97 /* ofxTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E721191518A284350063EF97 /* ofxTween.cpp */; };
E7211C5818A284400063EF97 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7211BAB18A2843F0063EF97 /* tinyxml.cpp */; };
E7211C5918A284400063EF97 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7211BAD18A2843F0063EF97 /* tinyxmlerror.cpp */; };
E7211C5A18A284400063EF97 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7211BAE18A2843F0063EF97 /* tinyxmlparser.cpp */; };
E7211C5B18A284400063EF97 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7211BB018A2843F0063EF97 /* ofxXmlSettings.cpp */; };
E7211CD118A2858F0063EF97 /* CloudsRGBDCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7211CC618A2858F0063EF97 /* CloudsRGBDCamera.cpp */; };
E7211CD218A2858F0063EF97 /* CloudsRGBDVideoPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7211CC818A2858F0063EF97 /* CloudsRGBDVideoPlayer.cpp */; };
Expand Down Expand Up @@ -169,6 +166,9 @@
E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */; };
E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E715D3B6510020DFD4 /* QTKit.framework */; };
E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F985F515E0DE99003869B5 /* Accelerate.framework */; };
EFF5656B1962DD990051BE34 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EFF565671962DD990051BE34 /* tinyxml.cpp */; };
EFF5656C1962DD990051BE34 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EFF565691962DD990051BE34 /* tinyxmlerror.cpp */; };
EFF5656D1962DD990051BE34 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EFF5656A1962DD990051BE34 /* tinyxmlparser.cpp */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -441,10 +441,6 @@
E721191418A284350063EF97 /* ofxEasingSine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingSine.h; sourceTree = "<group>"; };
E721191518A284350063EF97 /* ofxTween.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxTween.cpp; sourceTree = "<group>"; };
E721191618A284350063EF97 /* ofxTween.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxTween.h; sourceTree = "<group>"; };
E7211BAB18A2843F0063EF97 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = "<group>"; };
E7211BAC18A2843F0063EF97 /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml.h; sourceTree = "<group>"; };
E7211BAD18A2843F0063EF97 /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlerror.cpp; sourceTree = "<group>"; };
E7211BAE18A2843F0063EF97 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlparser.cpp; sourceTree = "<group>"; };
E7211BB018A2843F0063EF97 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxXmlSettings.cpp; sourceTree = "<group>"; };
E7211BB118A2843F0063EF97 /* ofxXmlSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxXmlSettings.h; sourceTree = "<group>"; };
E7211CC618A2858F0063EF97 /* CloudsRGBDCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CloudsRGBDCamera.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -560,6 +556,10 @@
E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = "<absolute>"; };
E7E077E715D3B6510020DFD4 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
E7F985F515E0DE99003869B5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = "<absolute>"; };
EFF565671962DD990051BE34 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = "<group>"; };
EFF565681962DD990051BE34 /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml.h; sourceTree = "<group>"; };
EFF565691962DD990051BE34 /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlerror.cpp; sourceTree = "<group>"; };
EFF5656A1962DD990051BE34 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlparser.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -1241,24 +1241,13 @@
E7211BA918A2843F0063EF97 /* ofxXmlSettings */ = {
isa = PBXGroup;
children = (
E7211BAA18A2843F0063EF97 /* libs */,
EFF565641962DD990051BE34 /* libs */,
E7211BAF18A2843F0063EF97 /* src */,
);
name = ofxXmlSettings;
path = ../../../addons/ofxXmlSettings;
sourceTree = "<group>";
};
E7211BAA18A2843F0063EF97 /* libs */ = {
isa = PBXGroup;
children = (
E7211BAB18A2843F0063EF97 /* tinyxml.cpp */,
E7211BAC18A2843F0063EF97 /* tinyxml.h */,
E7211BAD18A2843F0063EF97 /* tinyxmlerror.cpp */,
E7211BAE18A2843F0063EF97 /* tinyxmlparser.cpp */,
);
path = libs;
sourceTree = "<group>";
};
E7211BAF18A2843F0063EF97 /* src */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1408,6 +1397,33 @@
path = src;
sourceTree = "<group>";
};
EFF565641962DD990051BE34 /* libs */ = {
isa = PBXGroup;
children = (
EFF565651962DD990051BE34 /* tinyxml */,
);
path = libs;
sourceTree = "<group>";
};
EFF565651962DD990051BE34 /* tinyxml */ = {
isa = PBXGroup;
children = (
EFF565661962DD990051BE34 /* src */,
);
path = tinyxml;
sourceTree = "<group>";
};
EFF565661962DD990051BE34 /* src */ = {
isa = PBXGroup;
children = (
EFF565671962DD990051BE34 /* tinyxml.cpp */,
EFF565681962DD990051BE34 /* tinyxml.h */,
EFF565691962DD990051BE34 /* tinyxmlerror.cpp */,
EFF5656A1962DD990051BE34 /* tinyxmlparser.cpp */,
);
path = src;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -1505,15 +1521,13 @@
E7211BCD18A2843F0063EF97 /* ofxVerletSolver.cpp in Sources */,
E7211BFA18A284400063EF97 /* ofxHotKeys_impl_linux.cpp in Sources */,
E7211CE118A285970063EF97 /* CloudsInputMouse.cpp in Sources */,
E7211C5818A284400063EF97 /* tinyxml.cpp in Sources */,
03D590EB1946509B00FCFF7B /* CloudsCalibrationNode.cpp in Sources */,
E755D9781944230C00AA81C1 /* ofxUIEventArgs.cpp in Sources */,
E755D9971944230C00AA81C1 /* ofxUIValuePlotter.cpp in Sources */,
E755D99A1944230C00AA81C1 /* ofxUIWidgetWithLabel.cpp in Sources */,
E7211BF318A284400063EF97 /* kiss_fftr.c in Sources */,
E755D9881944230C00AA81C1 /* ofxUIRadio.cpp in Sources */,
E7211BBE18A2843F0063EF97 /* ofxBufferEffectorBehavior.cpp in Sources */,
E7211C5918A284400063EF97 /* tinyxmlerror.cpp in Sources */,
E755D97D1944230C00AA81C1 /* ofxUIImageSampler.cpp in Sources */,
E7211C0E18A284400063EF97 /* ofxTLPage.cpp in Sources */,
E755D9901944230C00AA81C1 /* ofxUISpectrum.cpp in Sources */,
Expand Down Expand Up @@ -1543,7 +1557,6 @@
E755D9811944230C00AA81C1 /* ofxUILabelButton.cpp in Sources */,
03D590FD1946509B00FCFF7B /* CloudsPortal.cpp in Sources */,
E7211C0118A284400063EF97 /* ofxTLCameraTrack.cpp in Sources */,
E7211C5A18A284400063EF97 /* tinyxmlparser.cpp in Sources */,
03D591F81946704100FCFF7B /* CloudsAudioEvents.cpp in Sources */,
03D5920D1946711300FCFF7B /* CloudsDichotomy.cpp in Sources */,
E755D9801944230C00AA81C1 /* ofxUILabel.cpp in Sources */,
Expand Down Expand Up @@ -1579,17 +1592,20 @@
E755D9761944230C00AA81C1 /* ofxUIDragableLabelButton.cpp in Sources */,
E7211C0618A284400063EF97 /* ofxTLEmptyTrack.cpp in Sources */,
E7211CDF18A285970063EF97 /* CloudsInput.cpp in Sources */,
EFF5656B1962DD990051BE34 /* tinyxml.cpp in Sources */,
E7211C1418A284400063EF97 /* ofxTLVideoThumb.cpp in Sources */,
E7211CD218A2858F0063EF97 /* CloudsRGBDVideoPlayer.cpp in Sources */,
E755D98F1944230C00AA81C1 /* ofxUISpacer.cpp in Sources */,
E7211C0C18A284400063EF97 /* ofxTLKeyframes.cpp in Sources */,
E7211C1E18A284400063EF97 /* ofxEasingBack.cpp in Sources */,
EFF5656C1962DD990051BE34 /* tinyxmlerror.cpp in Sources */,
03D591E11946702A00FCFF7B /* CloudsAct.cpp in Sources */,
E755D98C1944230C00AA81C1 /* ofxUIScrollableCanvas.cpp in Sources */,
E755D98E1944230C00AA81C1 /* ofxUISortableList.cpp in Sources */,
E755D9841944230C00AA81C1 /* ofxUIMovingGraph.cpp in Sources */,
E755D98A1944230C00AA81C1 /* ofxUIRectangle.cpp in Sources */,
E755D9701944230C00AA81C1 /* ofxUI2DPad.cpp in Sources */,
EFF5656D1962DD990051BE34 /* tinyxmlparser.cpp in Sources */,
E755D9771944230C00AA81C1 /* ofxUIDropDownList.cpp in Sources */,
E7211C0718A284400063EF97 /* ofxTLFlags.cpp in Sources */,
E7211BBF18A2843F0063EF97 /* ofxDamperBehavior.cpp in Sources */,
Expand Down Expand Up @@ -1811,6 +1827,7 @@
/Users/Winslow/Documents/of_64_clouds/openFrameworks/apps/CLOUDS/CloudsLibrary/src/Sound/RTCMix/libs/lib/osx,
/Users/Winslow/Documents/of_64_clouds/openFrameworks/apps/CLOUDS/CloudsLibrary/src/Sound/RTCMix/libs/lib/osx64,
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = StoryEngine64Debug;
WRAPPER_EXTENSION = app;
};
Expand Down Expand Up @@ -1902,6 +1919,7 @@
/Users/Winslow/Documents/of_64_clouds/openFrameworks/apps/CLOUDS/CloudsLibrary/src/Sound/RTCMix/libs/lib/osx,
/Users/Winslow/Documents/of_64_clouds/openFrameworks/apps/CLOUDS/CloudsLibrary/src/Sound/RTCMix/libs/lib/osx64,
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = StoryEngine64;
WRAPPER_EXTENSION = app;
};
Expand Down
13 changes: 9 additions & 4 deletions GPUParticleTests/GPUParticleTest.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
8B0D58241712DC6F00B06897 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B0D58101712DC6F00B06897 /* main.cpp */; };
8B0D582C1712DC6F00B06897 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B0D58201712DC6F00B06897 /* testApp.cpp */; };
BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; };
E4328149138ABC9F0047C5CB /* openFrameworks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworks.a */; };
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; };
E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; };
E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */; };
Expand Down Expand Up @@ -192,7 +192,7 @@
E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */,
E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */,
E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */,
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */,
E4328149138ABC9F0047C5CB /* openFrameworks.a in Frameworks */,
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */,
E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */,
E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */,
Expand Down Expand Up @@ -255,7 +255,7 @@
E4328144138ABC890047C5CB /* Products */ = {
isa = PBXGroup;
children = (
E4328148138ABC890047C5CB /* openFrameworksDebug.a */,
E4328148138ABC890047C5CB /* openFrameworks.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -545,6 +545,8 @@
/* Begin PBXProject section */
E4B69B4C0A3A1720003C02F2 /* Project object */ = {
isa = PBXProject;
attributes = {
};
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "GPUParticleTest" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
Expand Down Expand Up @@ -572,9 +574,10 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
E4328148138ABC890047C5CB /* openFrameworksDebug.a */ = {
E4328148138ABC890047C5CB /* openFrameworks.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
name = openFrameworks.a;
path = openFrameworksDebug.a;
remoteRef = E4328147138ABC890047C5CB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
Expand Down Expand Up @@ -821,6 +824,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GPUParticleTestDebug;
SDKROOT = macosx10.8;
WRAPPER_EXTENSION = app;
};
name = Debug;
Expand Down Expand Up @@ -907,6 +911,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = GPUParticleTest;
SDKROOT = macosx10.8;
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
Loading

0 comments on commit fa264ea

Please sign in to comment.