Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Controller integration #125

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Controller integration #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1ced330
Refactored to pull common code into OSVRTrackedDevice base class.
godbyk Jul 5, 2016
a4fc526
Removed obsolete code.
godbyk Jul 5, 2016
5a4a62f
Initial import of controller support.
godbyk Jul 6, 2016
6ed2bfa
Merged controller with master in preperation for integration work.
Conzar Jul 5, 2017
61332c8
Initial Commit - merged and updated so that it compiles.
Conzar Jul 7, 2017
1e110c1
Ignoring cmake
Conzar Jul 7, 2017
5dfd217
Working on integration.
Conzar Jul 7, 2017
814097f
Working on developing.
Conzar Jul 10, 2017
0565ef5
Added print statement on deactivate.
Conzar Jul 17, 2017
f72ba13
Working with Kevin on fixing problems with constructor
Conzar Aug 3, 2017
9b1e0b6
Added back openvr submodule and cleaned up for latest version.
Conzar Aug 3, 2017
124fd8e
Still lots of comments and needs to be cleaned up.
Conzar Aug 7, 2017
16564da
Added touch press and unpress for trackpad!
Conzar Aug 9, 2017
80fca11
Fixed trigger!
Conzar Aug 9, 2017
ad059b4
Added battery interaction.
Conzar Aug 9, 2017
c1be95c
Fixed the battery status.
Conzar Aug 9, 2017
c78f592
Cleaned up, readying for PR.
Conzar Aug 9, 2017
da14a85
Removed comments.
Conzar Aug 9, 2017
bd45e00
changed openvr path back.
Conzar Aug 11, 2017
0e1eb86
Using enum to differentiate between left and right controller.
Conzar Aug 11, 2017
4f46a40
Removed unnecessary log entry.
Conzar Aug 11, 2017
61c5bba
Added back in commented out (due to version mismatch).
Conzar Aug 11, 2017
62fd7b7
Removed unused function.
Conzar Aug 11, 2017
2cd70f4
String optimization
Conzar Aug 11, 2017
3e3b4b4
Added error checking for array bounds.
Conzar Aug 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@
# Build directory
build

nbproject
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These folders should only exist in the build tree and the build tree should be outside of the source tree or contained within a subdirectory (e.g., build) so as not to interfere with the source tree.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are present in my repository. I use netbeans and netbeans automatically creates nbproject. I also create the build directory within the project directory. This is why I added them to .gitignore.

CMakeFiles
2 changes: 1 addition & 1 deletion openvr
Open in desktop
Submodule openvr updated 85 files
+10 −0 CMakeLists.txt
+ − bin/linux32/libopenvr_api.so
+ − bin/linux32/libopenvr_api.so.dbg
+ − bin/linux64/libopenvr_api.so
+ − bin/linux64/libopenvr_api.so.dbg
+ − bin/osx32/libopenvr_api.dylib
+ − bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib
+1 −0 bin/osx64/OpenVR.framework/Headers
+1 −0 bin/osx64/OpenVR.framework/OpenVR
+1 −0 bin/osx64/OpenVR.framework/Resources
+3,721 −0 bin/osx64/OpenVR.framework/Versions/A/Headers/openvr.h
+4,997 −0 bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_api.cs
+3,887 −0 bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_api.json
+1,918 −0 bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_capi.h
+2,677 −0 bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_driver.h
+ − bin/osx64/OpenVR.framework/Versions/A/OpenVR
+18 −0 bin/osx64/OpenVR.framework/Versions/A/Resources/Info.plist
+1 −0 bin/osx64/OpenVR.framework/Versions/Current
+ − bin/win32/openvr_api.dll
+ − bin/win32/openvr_api.pdb
+ − bin/win64/openvr_api.dll
+ − bin/win64/openvr_api.pdb
+80 −13 headers/openvr.h
+76 −3 headers/openvr_api.cs
+52 −5 headers/openvr_api.json
+29 −3 headers/openvr_capi.h
+111 −18 headers/openvr_driver.h
+ − lib/linux32/libopenvr_api.so
+ − lib/linux64/libopenvr_api.so
+ − lib/win32/openvr_api.lib
+ − lib/win64/openvr_api.lib
+24 −1 samples/CMakeLists.txt
+ − samples/bin/linux64/libopenvr_api.so
+ − samples/bin/osx32/libopenvr_api.dylib
+34 −0 samples/bin/shaders/axes.hlsl
+ − samples/bin/shaders/axes_ps.spv
+ − samples/bin/shaders/axes_vs.spv
+5 −0 samples/bin/shaders/build_vulkan_shaders.bat
+40 −0 samples/bin/shaders/companion.hlsl
+ − samples/bin/shaders/companion_ps.spv
+ − samples/bin/shaders/companion_vs.spv
+40 −0 samples/bin/shaders/rendermodel.hlsl
+ − samples/bin/shaders/rendermodel_ps.spv
+ − samples/bin/shaders/rendermodel_vs.spv
+39 −0 samples/bin/shaders/scene.hlsl
+ − samples/bin/shaders/scene_ps.spv
+ − samples/bin/shaders/scene_vs.spv
+ − samples/bin/win32/openvr_api.dll
+ − samples/bin/win64/openvr_api.dll
+2 −2 samples/driver_sample/driver_sample.cpp
+2,540 −0 samples/hellovr_dx12/d3dx12.h
+124 −0 samples/hellovr_dx12/hellovr_dx12.vcxproj
+77 −0 samples/hellovr_dx12/hellovr_dx12.vcxproj.filters
+2,287 −0 samples/hellovr_dx12/hellovr_dx12_main.cpp
+16 −0 samples/hellovr_vulkan/CMakeLists.txt
+3,776 −0 samples/hellovr_vulkan/hellovr_vulkan_main.cpp
+5 −4 samples/shared/pathtools.cpp
+9 −7 samples/shared/strtools.h
+470 −0 samples/thirdparty/vulkan-1.0.49.0/include/shaderc/shaderc.h
+501 −0 samples/thirdparty/vulkan-1.0.49.0/include/shaderc/shaderc.hpp
+131 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/GLSL.std.450.h
+971 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/spirv.h
+980 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/spirv.hpp
+980 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/spirv.hpp11
+996 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/spirv.json
+927 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/spirv.lua
+927 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/spirv.py
+146 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/vk_icd.h
+143 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/vk_layer.h
+410 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/vk_layer_dispatch_table.h
+120 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/vk_platform.h
+46 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/vk_sdk_platform.h
+5,926 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/vulkan.h
+30,540 −0 samples/thirdparty/vulkan-1.0.49.0/include/vulkan/vulkan.hpp
+ − samples/thirdparty/vulkan-1.0.49.0/lib/linux64/libvulkan.so
+ − samples/thirdparty/vulkan-1.0.49.0/lib/win32/vulkan-1.lib
+ − samples/thirdparty/vulkan-1.0.49.0/lib/win64/vulkan-1.lib
+25 −3 src/CMakeLists.txt
+18 −0 src/Info.plist
+8 −4 src/README
+1 −1 src/vrcommon/envvartools_public.cpp
+18 −0 src/vrcommon/hmderrors_public.cpp
+5 −4 src/vrcommon/pathtools_public.cpp
+2 −2 src/vrcommon/sharedlibtools_public.cpp
+4 −2 src/vrcommon/vrpathregistry_public.cpp
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ add_library(driver_osvr
OSVRDisplay.cpp
OSVRTrackedDevice.cpp
OSVRTrackedDevice.h
OSVRTrackedController.cpp
OSVRTrackedController.h
OSVRTrackedHMD.cpp
OSVRTrackedHMD.h
OSVRTrackingReference.cpp
Expand Down
Loading