Skip to content

Commit

Permalink
saved changes from doing screen captures
Browse files Browse the repository at this point in the history
  • Loading branch information
@obviousjim
obviousjim committed Apr 21, 2015
1 parent 0fb1326 commit 7a5a2ab
Show file tree
Hide file tree
Showing 6 changed files with 2,074 additions and 146 deletions.
209 changes: 103 additions & 106 deletions CloudsPointcloudViewer/CloudsPointcloudViewer64.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions CloudsSecondaryDisplay/CloudsSecondaryDisplay64.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
03C5C1F01A9EB50D00DCA587 /* IpEndpointName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1CA1A9EB50D00DCA587 /* IpEndpointName.cpp */; };
03C5C1F11A9EB50D00DCA587 /* NetworkingUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1CF1A9EB50D00DCA587 /* NetworkingUtils.cpp */; };
03C5C1F21A9EB50D00DCA587 /* UdpSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1D01A9EB50D00DCA587 /* UdpSocket.cpp */; };
03C5C1F31A9EB50D00DCA587 /* NetworkingUtilsWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1D41A9EB50D00DCA587 /* NetworkingUtilsWin.cpp */; };
03C5C1F41A9EB50D00DCA587 /* UdpSocketWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1D51A9EB50D00DCA587 /* UdpSocketWin.cpp */; };
03C5C1F51A9EB50D00DCA587 /* OscOutboundPacketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1DA1A9EB50D00DCA587 /* OscOutboundPacketStream.cpp */; };
03C5C1F61A9EB50D00DCA587 /* OscPrintReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1DD1A9EB50D00DCA587 /* OscPrintReceivedElements.cpp */; };
03C5C1F71A9EB50D00DCA587 /* OscReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03C5C1DF1A9EB50D00DCA587 /* OscReceivedElements.cpp */; };
Expand Down Expand Up @@ -255,8 +253,6 @@
03C5C1D01A9EB50D00DCA587 /* UdpSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UdpSocket.cpp; sourceTree = "<group>"; };
03C5C1D11A9EB50D00DCA587 /* TimerListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimerListener.h; sourceTree = "<group>"; };
03C5C1D21A9EB50D00DCA587 /* UdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UdpSocket.h; sourceTree = "<group>"; };
03C5C1D41A9EB50D00DCA587 /* NetworkingUtilsWin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkingUtilsWin.cpp; sourceTree = "<group>"; };
03C5C1D51A9EB50D00DCA587 /* UdpSocketWin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UdpSocketWin.cpp; sourceTree = "<group>"; };
03C5C1D71A9EB50D00DCA587 /* MessageMappingOscPacketListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageMappingOscPacketListener.h; sourceTree = "<group>"; };
03C5C1D81A9EB50D00DCA587 /* OscException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OscException.h; sourceTree = "<group>"; };
03C5C1D91A9EB50D00DCA587 /* OscHostEndianness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OscHostEndianness.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -815,7 +811,6 @@
03C5C1CE1A9EB50D00DCA587 /* posix */,
03C5C1D11A9EB50D00DCA587 /* TimerListener.h */,
03C5C1D21A9EB50D00DCA587 /* UdpSocket.h */,
03C5C1D31A9EB50D00DCA587 /* win32 */,
);
path = ip;
sourceTree = "<group>";
Expand All @@ -829,15 +824,6 @@
path = posix;
sourceTree = "<group>";
};
03C5C1D31A9EB50D00DCA587 /* win32 */ = {
isa = PBXGroup;
children = (
03C5C1D41A9EB50D00DCA587 /* NetworkingUtilsWin.cpp */,
03C5C1D51A9EB50D00DCA587 /* UdpSocketWin.cpp */,
);
path = win32;
sourceTree = "<group>";
};
03C5C1D61A9EB50D00DCA587 /* osc */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1949,7 +1935,6 @@
E755D98A1944230C00AA81C1 /* ofxUIRectangle.cpp in Sources */,
E755D9701944230C00AA81C1 /* ofxUI2DPad.cpp in Sources */,
03C5C1F51A9EB50D00DCA587 /* OscOutboundPacketStream.cpp in Sources */,
03C5C1F41A9EB50D00DCA587 /* UdpSocketWin.cpp in Sources */,
E755D9771944230C00AA81C1 /* ofxUIDropDownList.cpp in Sources */,
03C5C1F61A9EB50D00DCA587 /* OscPrintReceivedElements.cpp in Sources */,
E7211C0718A284400063EF97 /* ofxTLFlags.cpp in Sources */,
Expand All @@ -1970,7 +1955,6 @@
E7211C0D18A284400063EF97 /* ofxTLLFO.cpp in Sources */,
E7211C0918A284400063EF97 /* ofxTLImageSequenceFrame.cpp in Sources */,
03C5C1F21A9EB50D00DCA587 /* UdpSocket.cpp in Sources */,
03C5C1F31A9EB50D00DCA587 /* NetworkingUtilsWin.cpp in Sources */,
E755D97C1944230C00AA81C1 /* ofxUIImageButton.cpp in Sources */,
03C5C23E1A9EB60300DCA587 /* CloudsHUDLabel.cpp in Sources */,
E755D9861944230C00AA81C1 /* ofxUIMultiImageToggle.cpp in Sources */,
Expand Down
7 changes: 6 additions & 1 deletion VSIntro/src/testApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@ void testApp::draw(){

//--------------------------------------------------------------
void testApp::keyPressed(int key){

if(key == 'H'){
ofHideCursor();
}
else if(key == 'S'){
ofShowCursor();
}
}

//--------------------------------------------------------------
Expand Down
44 changes: 22 additions & 22 deletions ...video/RGBDvideo.xcodeproj/project.pbxproj → ...deo/RGBDVideo32.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@
E45BE9770E8CC7DD009D7055 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
E45BE9790E8CC7DD009D7055 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
E4B69B5B0A3A1756003C02F2 /* RGBDvideoDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RGBDvideoDebug.app; sourceTree = BUILT_PRODUCTS_DIR; };
E4B69B5B0A3A1756003C02F2 /* RGBDVideo32Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RGBDVideo32Debug.app; sourceTree = BUILT_PRODUCTS_DIR; };
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; };
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; };
Expand All @@ -542,7 +542,7 @@
E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = "<group>"; };
E7380142183C871A0018AB96 /* ofxOculusRift.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxOculusRift.cpp; sourceTree = "<group>"; };
E7380143183C871A0018AB96 /* ofxOculusRift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxOculusRift.h; sourceTree = "<group>"; };
E738FFE1183C86F50018AB96 /* RGBDvideoOculus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RGBDvideoOculus.app; sourceTree = BUILT_PRODUCTS_DIR; };
E738FFE1183C86F50018AB96 /* RGBDVideo32Oculus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RGBDVideo32Oculus.app; sourceTree = BUILT_PRODUCTS_DIR; };
E738FFE2183C86F60018AB96 /* Empty copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Empty copy-Info.plist"; path = "/Users/focus/Documents/Xcode/oF/of_gitRelease_obviousjim/openFrameworks/apps/CLOUDS/VSEmpty/Empty copy-Info.plist"; sourceTree = "<absolute>"; };
E761F4D71622CA3D00029E43 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = "<absolute>"; };
E7846FB61714899C00705E7A /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1294,8 +1294,8 @@
E4EEC9E9138DF44700A80321 /* openFrameworks */,
BB4B014C10F69532006C3DED /* addons */,
E45BE5980E8CC70C009D7055 /* frameworks */,
E4B69B5B0A3A1756003C02F2 /* RGBDvideoDebug.app */,
E738FFE1183C86F50018AB96 /* RGBDvideoOculus.app */,
E4B69B5B0A3A1756003C02F2 /* RGBDVideo32Debug.app */,
E738FFE1183C86F50018AB96 /* RGBDVideo32Oculus.app */,
E738FFE2183C86F60018AB96 /* Empty copy-Info.plist */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -1414,9 +1414,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
E4B69B5A0A3A1756003C02F2 /* RGBDvideo */ = {
E4B69B5A0A3A1756003C02F2 /* RGBDVideo32 */ = {
isa = PBXNativeTarget;
buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "RGBDvideo" */;
buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "RGBDVideo32" */;
buildPhases = (
E4B69B580A3A1756003C02F2 /* Sources */,
E4B69B590A3A1756003C02F2 /* Frameworks */,
Expand All @@ -1428,14 +1428,14 @@
dependencies = (
E4EEB9AC138B136A00A80321 /* PBXTargetDependency */,
);
name = RGBDvideo;
name = RGBDVideo32;
productName = myOFApp;
productReference = E4B69B5B0A3A1756003C02F2 /* RGBDvideoDebug.app */;
productReference = E4B69B5B0A3A1756003C02F2 /* RGBDVideo32Debug.app */;
productType = "com.apple.product-type.application";
};
E738FF76183C86F50018AB96 /* RGBDvideoOculus */ = {
E738FF76183C86F50018AB96 /* RGBDVideo32Oculus */ = {
isa = PBXNativeTarget;
buildConfigurationList = E738FFDE183C86F50018AB96 /* Build configuration list for PBXNativeTarget "RGBDvideoOculus" */;
buildConfigurationList = E738FFDE183C86F50018AB96 /* Build configuration list for PBXNativeTarget "RGBDVideo32Oculus" */;
buildPhases = (
E738FF79183C86F50018AB96 /* Sources */,
E738FFC4183C86F50018AB96 /* Frameworks */,
Expand All @@ -1447,9 +1447,9 @@
dependencies = (
E738FF77183C86F50018AB96 /* PBXTargetDependency */,
);
name = RGBDvideoOculus;
name = RGBDVideo32Oculus;
productName = myOFApp;
productReference = E738FFE1183C86F50018AB96 /* RGBDvideoOculus.app */;
productReference = E738FFE1183C86F50018AB96 /* RGBDVideo32Oculus.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -1459,7 +1459,7 @@
isa = PBXProject;
attributes = {
};
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "RGBDvideo" */;
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "RGBDVideo32" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -1480,8 +1480,8 @@
);
projectRoot = "";
targets = (
E4B69B5A0A3A1756003C02F2 /* RGBDvideo */,
E738FF76183C86F50018AB96 /* RGBDvideoOculus */,
E4B69B5A0A3A1756003C02F2 /* RGBDVideo32 */,
E738FF76183C86F50018AB96 /* RGBDVideo32Oculus */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -1889,7 +1889,7 @@
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9 = "\"$(SYSTEM_APPS_DIR)/openFrameworks-develop/addons/ofxTimeline/libs/sndfile/lib/osx\"";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
PRODUCT_NAME = RGBDvideoDebug;
PRODUCT_NAME = RGBDVideo32Debug;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
Expand Down Expand Up @@ -1999,7 +1999,7 @@
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9 = "\"$(SYSTEM_APPS_DIR)/openFrameworks-develop/addons/ofxTimeline/libs/sndfile/lib/osx\"";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
PRODUCT_NAME = RGBDvideo;
PRODUCT_NAME = RGBDVideo32;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
Expand Down Expand Up @@ -2128,7 +2128,7 @@
"$(OF_PATH)/addons/ofxOculusRift/libs/LibOVR/Lib/MacOS/Debug/libovr.a",
);
PREBINDING = NO;
PRODUCT_NAME = RGBDvideoOculus;
PRODUCT_NAME = RGBDVideo32Oculus;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
Expand Down Expand Up @@ -2256,7 +2256,7 @@
"$(OF_PATH)/addons/ofxOculusRift/libs/LibOVR/Lib/MacOS/Release/libovr.a",
);
PREBINDING = NO;
PRODUCT_NAME = RGBDvideoOculus;
PRODUCT_NAME = RGBDVideo32Oculus;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
Expand All @@ -2265,7 +2265,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "RGBDvideo" */ = {
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "RGBDVideo32" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E4B69B4E0A3A1720003C02F2 /* Debug */,
Expand All @@ -2274,7 +2274,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "RGBDvideo" */ = {
E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "RGBDVideo32" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E4B69B600A3A1757003C02F2 /* Debug */,
Expand All @@ -2283,7 +2283,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E738FFDE183C86F50018AB96 /* Build configuration list for PBXNativeTarget "RGBDvideoOculus" */ = {
E738FFDE183C86F50018AB96 /* Build configuration list for PBXNativeTarget "RGBDVideo32Oculus" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E738FFDF183C86F50018AB96 /* Debug */,
Expand Down
Loading

0 comments on commit 7a5a2ab

Please sign in to comment.