From 78bc5dba1202a0383fd355505c2257d120953e58 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 16 Aug 2013 23:21:37 -0700 Subject: Additional official SDK files from the linux distribution --- ConfigurePermissionsAndPackages.sh | 4 ++-- LibOVR/Makefile | 4 ++-- OculusConfigurationUtility.sh | 2 +- Samples/CommonSrc/Platform/OSX_Gamepad.cpp | 1 - Samples/OculusWorldDemo/Makefile | 14 +++++++++++--- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ConfigurePermissionsAndPackages.sh b/ConfigurePermissionsAndPackages.sh index 37f7587..e19a913 100755 --- a/ConfigurePermissionsAndPackages.sh +++ b/ConfigurePermissionsAndPackages.sh @@ -21,8 +21,8 @@ echo "Installing OculusVR Rift udev rules file..." sudo cp ./LibOVR/90-oculus.rules /lib/udev/rules.d echo "Installing libudev..." sudo apt-get install libudev-dev -echo "Installing libext..." -sudo apt-get install libext-dev +echo "Installing libxext..." +sudo apt-get install libxext-dev echo "Installing mesa-common..." sudo apt-get install mesa-common-dev echo "Installing freeglut3..." diff --git a/LibOVR/Makefile b/LibOVR/Makefile index 7525b0b..174e8a5 100644 --- a/LibOVR/Makefile +++ b/LibOVR/Makefile @@ -46,10 +46,10 @@ DELETEFILE = rm -f DEBUG = 0 ifeq ($(DEBUG), 1) - CXXFLAGS = -pipe -DDEBUG -g + CXXFLAGS = -pipe -fPIC -DDEBUG -g RELEASETYPE = Debug else - CXXFLAGS = -pipe -O2 + CXXFLAGS = -pipe -fPIC -O2 RELEASETYPE = Release endif diff --git a/OculusConfigurationUtility.sh b/OculusConfigurationUtility.sh index 788cba9..aeafec3 100755 --- a/OculusConfigurationUtility.sh +++ b/OculusConfigurationUtility.sh @@ -19,7 +19,7 @@ MACHINE_TYPE=`uname -m` if [ ${MACHINE_TYPE} == 'x86_64' ]; then - ./Tools/OculusConfigUtil/RiftConfigUtil_x86_64 + ./Tools/OculusConfigUtil/OculusConfigUtil_x86_64 else echo "The Oculus Configuration Utility is currently only supported on 64-bit Linux." fi diff --git a/Samples/CommonSrc/Platform/OSX_Gamepad.cpp b/Samples/CommonSrc/Platform/OSX_Gamepad.cpp index 934319b..96219e4 100644 --- a/Samples/CommonSrc/Platform/OSX_Gamepad.cpp +++ b/Samples/CommonSrc/Platform/OSX_Gamepad.cpp @@ -204,7 +204,6 @@ void GamepadManager::onDeviceValueChanged(IOHIDValueRef value) int vendorID = getIntDeviceProperty(device, CFSTR(kIOHIDVendorIDKey)); int productID = getIntDeviceProperty(device, CFSTR(kIOHIDProductIDKey)); - OVR_UNUSED(productID); uint32_t usagePage = IOHIDElementGetUsagePage(element); uint32_t usage = IOHIDElementGetUsage(element); diff --git a/Samples/OculusWorldDemo/Makefile b/Samples/OculusWorldDemo/Makefile index c5588bc..6015560 100644 --- a/Samples/OculusWorldDemo/Makefile +++ b/Samples/OculusWorldDemo/Makefile @@ -49,25 +49,33 @@ DEFINES = -DQT_WEBKIT -DGL_GLEXT_PROTOTYPES DEBUG = 0 ifeq ($(DEBUG), 1) CXXFLAGS = -pipe -DDEBUG -g $(DEFINES) + LFLAGS = RELEASETYPE = Debug else CXXFLAGS = -pipe -O2 $(DEFINES) + LFLAGS = -O1 RELEASETYPE = Release endif -####### Compiler, tools and options +####### Paths LIBOVRPATH = ../../LibOVR COMMONSRCPATH = ../CommonSrc 3RDPARTYPATH = ../../3rdParty INCPATH = -I. -I.. -I$(COMMONSRCPATH) -I$(LIBOVRPATH)/Include -I$(LIBOVRPATH)/Src OBJPATH = ./Obj/Linux/$(RELEASETYPE)/$(SYSARCH) -LFLAGS = -Wl -O1 -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH) -LIBS = $(SUBLIBS) -lovr -ludev -lpthread -lGL -lX11 -lXinerama CXX_BUILD = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJPATH)/ ####### Files +LIBS = -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH) \ + -lovr \ + -ludev \ + -lpthread \ + -lGL \ + -lX11 \ + -lXinerama + OBJECTS = $(OBJPATH)/OculusWorldDemo.o \ $(OBJPATH)/Player.o \ $(OBJPATH)/Platform.o \ -- cgit v1.2.3 From ae38fe673d543ddd00cbceacd097412c22fb545d Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sat, 17 Aug 2013 20:18:08 -0700 Subject: Adding the mac 0.2.4 changes --- .../LibOVR_With_Samples.xcodeproj/project.pbxproj | 49 ++++++++++-- .../project.xcworkspace/contents.xcworkspacedata | 7 ++ .../UserInterfaceState.xcuserstate | Bin 0 -> 15669 bytes .../Nate.xcuserdatad/WorkspaceSettings.xcsettings | 20 +++++ .../xcshareddata/xcschemes/OculusRoomTiny.xcscheme | 86 +++++++++++++++++++++ .../xcschemes/OculusWorldDemo.xcscheme | 86 +++++++++++++++++++++ .../xcshareddata/xcschemes/SensorBoxTest.xcscheme | 86 +++++++++++++++++++++ .../xcshareddata/xcschemes/ovr.xcscheme | 59 ++++++++++++++ .../xcschemes/xcschememanagement.plist | 29 +++++++ 9 files changed, 417 insertions(+), 5 deletions(-) create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/WorkspaceSettings.xcsettings create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusRoomTiny.xcscheme create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusWorldDemo.xcscheme create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/SensorBoxTest.xcscheme create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/ovr.xcscheme create mode 100644 Samples/LibOVR_With_Samples.xcodeproj/xcuserdata/Nate.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/Samples/LibOVR_With_Samples.xcodeproj/project.pbxproj b/Samples/LibOVR_With_Samples.xcodeproj/project.pbxproj index 2dd6f71..a2bc2f1 100644 --- a/Samples/LibOVR_With_Samples.xcodeproj/project.pbxproj +++ b/Samples/LibOVR_With_Samples.xcodeproj/project.pbxproj @@ -17,6 +17,7 @@ 37973B5E1739FAB60093BBB8 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4945071616E546F700B9FF78 /* OpenGL.framework */; }; 37973B5F1739FAC80093BBB8 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DB65F01718B1E10097A8DD /* ApplicationServices.framework */; }; 37973B601739FAD50093BBB8 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 499ED4C716E6A187008EA2ED /* CoreFoundation.framework */; }; + 439FE6E217BE2E21007EFD34 /* OSX_Gamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB10AEF173C4918009ED618 /* OSX_Gamepad.cpp */; }; 494506DD16E5461F00B9FF78 /* OVR_Alg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A5337116E544E30039CB59 /* OVR_Alg.cpp */; }; 494506DF16E5461F00B9FF78 /* OVR_Allocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A5337316E544E30039CB59 /* OVR_Allocator.cpp */; }; 494506E216E5461F00B9FF78 /* OVR_Atomic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A5337616E544E30039CB59 /* OVR_Atomic.cpp */; }; @@ -71,7 +72,6 @@ 9BA4DDB91727083500CF7715 /* Oculus.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9BA4DDB71727061100CF7715 /* Oculus.icns */; }; 9BAB70F6170E69530006FE98 /* libovr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49A5336D16E544BE0039CB59 /* libovr.a */; }; 9BB10AF1173C4918009ED618 /* OSX_Gamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB10AEF173C4918009ED618 /* OSX_Gamepad.cpp */; }; - 9BB86B6D1747178B0071C537 /* OSX_Gamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB10AEF173C4918009ED618 /* OSX_Gamepad.cpp */; }; 9BCE53F916F0293A007A23FF /* OVR_HIDDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCE53F416F0293A007A23FF /* OVR_HIDDevice.h */; }; 9BCE53FA16F0293A007A23FF /* OVR_HIDDeviceBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCE53F516F0293A007A23FF /* OVR_HIDDeviceBase.h */; }; 9BCE53FB16F0293A007A23FF /* OVR_HIDDeviceImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCE53F616F0293A007A23FF /* OVR_HIDDeviceImpl.h */; }; @@ -103,6 +103,10 @@ 9BEAD56217187B8A00A8AA1D /* Util_Render_Stereo.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BEAD55E17187B8A00A8AA1D /* Util_Render_Stereo.h */; }; 9BEAD56517187CFF00A8AA1D /* OSX_WavPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BEAD56317187CFF00A8AA1D /* OSX_WavPlayer.cpp */; }; 9BEAD56717187E7500A8AA1D /* Render_XmlSceneLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BEAD56617187E7500A8AA1D /* Render_XmlSceneLoader.cpp */; }; + C50FA3D0177BB88E00730BB7 /* OVR_JSON.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50FA3CC177BB88E00730BB7 /* OVR_JSON.cpp */; }; + C50FA3D1177BB88E00730BB7 /* OVR_JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = C50FA3CD177BB88E00730BB7 /* OVR_JSON.h */; }; + C50FA3D2177BB88E00730BB7 /* OVR_Profile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50FA3CE177BB88E00730BB7 /* OVR_Profile.cpp */; }; + C50FA3D3177BB88E00730BB7 /* OVR_Profile.h in Headers */ = {isa = PBXBuildFile; fileRef = C50FA3CF177BB88E00730BB7 /* OVR_Profile.h */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -255,6 +259,10 @@ 9BEAD56417187CFF00A8AA1D /* OSX_WavPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSX_WavPlayer.h; sourceTree = ""; }; 9BEAD56617187E7500A8AA1D /* Render_XmlSceneLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Render_XmlSceneLoader.cpp; sourceTree = ""; }; 9BEAD56817187E8300A8AA1D /* Render_XmlSceneLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Render_XmlSceneLoader.h; sourceTree = ""; }; + C50FA3CC177BB88E00730BB7 /* OVR_JSON.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OVR_JSON.cpp; sourceTree = ""; }; + C50FA3CD177BB88E00730BB7 /* OVR_JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OVR_JSON.h; sourceTree = ""; }; + C50FA3CE177BB88E00730BB7 /* OVR_Profile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OVR_Profile.cpp; sourceTree = ""; }; + C50FA3CF177BB88E00730BB7 /* OVR_Profile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OVR_Profile.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -464,6 +472,10 @@ 49A533A816E544E30039CB59 /* Src */ = { isa = PBXGroup; children = ( + C50FA3CC177BB88E00730BB7 /* OVR_JSON.cpp */, + C50FA3CD177BB88E00730BB7 /* OVR_JSON.h */, + C50FA3CE177BB88E00730BB7 /* OVR_Profile.cpp */, + C50FA3CF177BB88E00730BB7 /* OVR_Profile.h */, 9BD2A644172069BF00C3C389 /* OVR_SensorFilter.cpp */, 9BD2A645172069BF00C3C389 /* OVR_SensorFilter.h */, 9BEAD55A17187B5500A8AA1D /* Util */, @@ -564,6 +576,8 @@ 9BEAD56217187B8A00A8AA1D /* Util_Render_Stereo.h in Headers */, 9BD2A643172069B300C3C389 /* Util_MagCalibration.h in Headers */, 9BD2A647172069BF00C3C389 /* OVR_SensorFilter.h in Headers */, + C50FA3D1177BB88E00730BB7 /* OVR_JSON.h in Headers */, + C50FA3D3177BB88E00730BB7 /* OVR_Profile.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -763,6 +777,8 @@ 9BEAD56117187B8A00A8AA1D /* Util_Render_Stereo.cpp in Sources */, 9BD2A642172069B300C3C389 /* Util_MagCalibration.cpp in Sources */, 9BD2A646172069BF00C3C389 /* OVR_SensorFilter.cpp in Sources */, + C50FA3D0177BB88E00730BB7 /* OVR_JSON.cpp in Sources */, + C50FA3D2177BB88E00730BB7 /* OVR_Profile.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -770,7 +786,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9BB86B6D1747178B0071C537 /* OSX_Gamepad.cpp in Sources */, + 439FE6E217BE2E21007EFD34 /* OSX_Gamepad.cpp in Sources */, 49DB66111726F0F80097A8DD /* Render_LoadTextureDDS.cpp in Sources */, 49DB66121726F0F80097A8DD /* Render_Device.cpp in Sources */, 49DB66131726F0F80097A8DD /* Render_GL_Device.cpp in Sources */, @@ -807,6 +823,7 @@ buildSettings = { CLANG_CXX_LIBRARY = "libstdc++"; COMBINE_HIDPI_IMAGES = YES; + CONFIGURATION_BUILD_DIR = "$(SYMROOT)"; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -818,7 +835,7 @@ ); INFOPLIST_FILE = "LibOVR_With_Samples.xcodeproj/OculusRoomTiny-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; SYMROOT = OculusRoomTiny/MacOS/Debug; WRAPPER_EXTENSION = app; @@ -830,6 +847,7 @@ buildSettings = { CLANG_CXX_LIBRARY = "libstdc++"; COMBINE_HIDPI_IMAGES = YES; + CONFIGURATION_BUILD_DIR = "$(SYMROOT)"; GCC_PRECOMPILE_PREFIX_HEADER = NO; HEADER_SEARCH_PATHS = ( ../LibOVR/Src, @@ -837,6 +855,7 @@ ); INFOPLIST_FILE = "LibOVR_With_Samples.xcodeproj/OculusRoomTiny-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; SYMROOT = OculusRoomTiny/MacOS/Release; WRAPPER_EXTENSION = app; @@ -982,7 +1001,17 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - LIBRARY_SEARCH_PATHS = "../LIbOVR/MacOS/$(CONFIGURATION)"; + LIBRARY_SEARCH_PATHS = ( + "../LIbOVR/MacOS/$(CONFIGURATION)", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/Debug\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Debug/ovr.build/Objects-normal/i386\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Debug/ovr.build/Objects-normal/x86_64\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Release/ovr.build/Objects-normal/i386\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Release/ovr.build/Objects-normal/x86_64\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/Release\"", + "\"$(SRCROOT)/../LibOVR/Lib/Win32\"", + "\"$(SRCROOT)/../LibOVR/Lib/x64\"", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SYMROOT = ../LibOVR/Lib/MacOS; }; @@ -996,7 +1025,17 @@ EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; - LIBRARY_SEARCH_PATHS = "../LIbOVR/MacOS/$(CONFIGURATION)"; + LIBRARY_SEARCH_PATHS = ( + "../LIbOVR/MacOS/$(CONFIGURATION)", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/Debug\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Debug/ovr.build/Objects-normal/i386\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Debug/ovr.build/Objects-normal/x86_64\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Release/ovr.build/Objects-normal/i386\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/LibOVR_With_Samples.build/Release/ovr.build/Objects-normal/x86_64\"", + "\"$(SRCROOT)/../LibOVR/Lib/MacOS/Release\"", + "\"$(SRCROOT)/../LibOVR/Lib/Win32\"", + "\"$(SRCROOT)/../LibOVR/Lib/x64\"", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SYMROOT = ../LibOVR/Lib/MacOS; }; diff --git a/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1a80571 --- /dev/null +++ b/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/UserInterfaceState.xcuserstate b/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..be3c4ab Binary files /dev/null and b/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/WorkspaceSettings.xcsettings b/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..5202989 --- /dev/null +++ b/Samples/LibOVR_With_Samples.xcodeproj/project.xcworkspace/xcuserdata/Nate.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,20 @@ + + + + + BuildLocationStyle + UseTargetSettings + CustomBuildLocationType + RelativeToDerivedData + DerivedDataLocationStyle + Default + IssueFilterStyle + ShowActiveSchemeOnly + LiveSourceIssuesEnabled + + SnapshotAutomaticallyBeforeSignificantChanges + + SnapshotLocationStyle + Default + + diff --git a/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusRoomTiny.xcscheme b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusRoomTiny.xcscheme new file mode 100644 index 0000000..ca15d67 --- /dev/null +++ b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusRoomTiny.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusWorldDemo.xcscheme b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusWorldDemo.xcscheme new file mode 100644 index 0000000..df712e0 --- /dev/null +++ b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/OculusWorldDemo.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/SensorBoxTest.xcscheme b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/SensorBoxTest.xcscheme new file mode 100644 index 0000000..355208d --- /dev/null +++ b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/SensorBoxTest.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/ovr.xcscheme b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/ovr.xcscheme new file mode 100644 index 0000000..d032bda --- /dev/null +++ b/Samples/LibOVR_With_Samples.xcodeproj/xcshareddata/xcschemes/ovr.xcscheme @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/LibOVR_With_Samples.xcodeproj/xcuserdata/Nate.xcuserdatad/xcschemes/xcschememanagement.plist b/Samples/LibOVR_With_Samples.xcodeproj/xcuserdata/Nate.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..58dbb85 --- /dev/null +++ b/Samples/LibOVR_With_Samples.xcodeproj/xcuserdata/Nate.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,29 @@ + + + + + SuppressBuildableAutocreation + + 37973B371739D78B0093BBB8 + + primary + + + 4985385C16ECFE92008D0727 + + primary + + + 49A5336C16E544BE0039CB59 + + primary + + + 49DB65F51726F0C30097A8DD + + primary + + + + + -- cgit v1.2.3 From 721125e71cb600f95568e2fa841b6ec184b8901f Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sat, 17 Aug 2013 20:20:40 -0700 Subject: Adding windows 0.2.4 changes --- LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj | 2 +- LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters | 2 +- Samples/CommonSrc/Platform/OSX_Gamepad.cpp | 1 + Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj | 2 +- Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters | 2 +- Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj | 2 +- Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj.filters | 2 +- Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj | 2 +- Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj.filters | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj index 2e7fc31..6f1539f 100644 --- a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj +++ b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters index 016a15d..7192960 100644 --- a/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters +++ b/LibOVR/Projects/Win32/LibOVR_Msvc2010.vcxproj.filters @@ -1,4 +1,4 @@ - + diff --git a/Samples/CommonSrc/Platform/OSX_Gamepad.cpp b/Samples/CommonSrc/Platform/OSX_Gamepad.cpp index 96219e4..934319b 100644 --- a/Samples/CommonSrc/Platform/OSX_Gamepad.cpp +++ b/Samples/CommonSrc/Platform/OSX_Gamepad.cpp @@ -204,6 +204,7 @@ void GamepadManager::onDeviceValueChanged(IOHIDValueRef value) int vendorID = getIntDeviceProperty(device, CFSTR(kIOHIDVendorIDKey)); int productID = getIntDeviceProperty(device, CFSTR(kIOHIDProductIDKey)); + OVR_UNUSED(productID); uint32_t usagePage = IOHIDElementGetUsagePage(element); uint32_t usage = IOHIDElementGetUsage(element); diff --git a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj index 5ed8886..4bc37a8 100644 --- a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj +++ b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters index 5643d9f..3c09bd5 100644 --- a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters +++ b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters @@ -1,4 +1,4 @@ - + diff --git a/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj b/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj index fb72d47..a881ab8 100644 --- a/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj +++ b/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj.filters b/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj.filters index 8199eb7..e96dc9e 100644 --- a/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj.filters +++ b/Samples/OculusWorldDemo/OculusWorldDemo_Msvc2010.vcxproj.filters @@ -1,4 +1,4 @@ - + diff --git a/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj b/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj index 6f9e57c..a0c06af 100644 --- a/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj +++ b/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj.filters b/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj.filters index 07a8312..5c2ee68 100644 --- a/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj.filters +++ b/Samples/SensorBox/SensorBoxTest_Msvc2010.vcxproj.filters @@ -1,4 +1,4 @@ - + -- cgit v1.2.3 From 274f2303f99cbc8148d55c07aba390b4f7798776 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sat, 17 Aug 2013 22:03:08 -0700 Subject: Adding Mac example app to ignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f1315ab..03be30e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Mac_OculusWorldDemo.app/Contents/Resources Doc Tools .* +OculusWorldDemo.app -- cgit v1.2.3 From 1ddf933c5dbbdbea41649d39f44e75651b15cef8 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 13 Sep 2013 11:56:57 -0700 Subject: Updating the README --- README.md | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b79d26b..e317d65 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,49 @@ OculusSDK ========= -Oculus SDK with modifications for Linux development and Java development. The -'master' branch will attempt to track the publicly released SDK version, while -additional branches will be used for my custom modifications. +Oculus SDK with additional community supported features and bug-fixes. + +Goals +----- + +* Providing new features + * C bindings + * Python bindings + * Java bindings +* Providing new tools + * Command line diagnostics for people having trouble with Rift detection +* Providing new sample code + * Alternative mechanisms for rendering the Rift distortion + * Sample code for the non-C++ language bindings +* Helping developers write better or easier Oculus Rift compatible software + +Licensing +--------- All code not explicitly marked with another license is made available under the terms of the Oculus SDK license, included in this kit as LICENSE.TXT and available online at https://developer.oculusvr.com/license and is Copyright 2013 Oculus VR, Inc. -Currently the 'linux' branch contains modifications to the SDK that allow the -SensorBox sample to function with my local Ubuntu 13.04 distribution. It is -currently a work in progress and no guarantee is made that you will be able to -compile or run the application without significant effort installing dependencies -and or fiddling with Makefiles. Good luck! +Branches +-------- + +### official +This branch will track the SDK releases from Oculus VR. It should contain only files that are included in the official +SDK, as well as the minimal additional files to get it to play well with GitHub. Specifically this README file for the +uninitiated and a .gitignore file to exclude artifacts from the official SDK that we do not wish to track in GitHub. +The latter mostly consists of the binary files distributed with the SDK and documentation or any other artifacts +with unknown or suspect licensing that would prohibit reproduction on GitHub. + +### stable +Contains features that are considered complete and safe to use. + +### unstable +The tip of shared development. Contains features that may not have been merged into stable. Not guaranteed to work +at any given time. + +### feature-XXX +Feature branches for changes that will require significant time and codebase changes to function, but +which may be being developed in a team or made available for testing to the general public. + -June 2013 -Brad Davis \ No newline at end of file -- cgit v1.2.3 From cacc151aea8236163af7fbb477e3be07873a4d37 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 13 Sep 2013 11:57:09 -0700 Subject: Attempting to reduce gitignore churn --- .gitignore | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 03be30e..b3cfa0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,34 @@ +# The project gitignore file is primarily for specifying artifacts in +# the Official SDK which we do not wish to track in Git, but which we +# Should expect to exist in any directory where the official SDK has +# been placed along with the Git repository + +# Please do not submit pull requests with .gitignore modifications +# without fist opening an issue or some other dialogue to +# ensure that a change to the .gitignore is the right thing to do. + +# Also, do not submit pull requests with .gitignore modifications +# mixed in with other unrelated changes. + + +Doc LibOVR/Lib LibOVR/Obj +Mac_OculusWorldDemo.app/Contents/Resources +OculusWorldDemo.app Samples/**/Obj Samples/**/Release Samples/**/Debug -Samples/OculusWorldDemo/Assets -Mac_OculusWorldDemo.app/Contents/Resources -Doc Tools -.* -OculusWorldDemo.app + +# Do not include items like these that are not specific to this project. +# .* +# *~ + +# If you need to exclude temp or backup files or files created your build +# system, you should place those in a global gitignore file in your root +# directory. +# See: https://help.github.com/articles/ignoring-files + + + -- cgit v1.2.3