-
Notifications
You must be signed in to change notification settings - Fork 58
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.
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
Controller integration #125
Open
Conzar
wants to merge
25
commits into
OSVR:master
Choose a base branch
from
Conzar:controller-integration
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 a4fc526
Removed obsolete code.
godbyk 5a4a62f
Initial import of controller support.
godbyk 6ed2bfa
Merged controller with master in preperation for integration work.
Conzar 61332c8
Initial Commit - merged and updated so that it compiles.
Conzar 1e110c1
Ignoring cmake
Conzar 5dfd217
Working on integration.
Conzar 814097f
Working on developing.
Conzar 0565ef5
Added print statement on deactivate.
Conzar f72ba13
Working with Kevin on fixing problems with constructor
Conzar 9b1e0b6
Added back openvr submodule and cleaned up for latest version.
Conzar 124fd8e
Still lots of comments and needs to be cleaned up.
Conzar 16564da
Added touch press and unpress for trackpad!
Conzar 80fca11
Fixed trigger!
Conzar ad059b4
Added battery interaction.
Conzar c1be95c
Fixed the battery status.
Conzar c78f592
Cleaned up, readying for PR.
Conzar da14a85
Removed comments.
Conzar bd45e00
changed openvr path back.
Conzar 0e1eb86
Using enum to differentiate between left and right controller.
Conzar 4f46a40
Removed unnecessary log entry.
Conzar 61c5bba
Added back in commented out (due to version mismatch).
Conzar 62fd7b7
Removed unused function.
Conzar 2cd70f4
String optimization
Conzar 3e3b4b4
Added error checking for array bounds.
Conzar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,3 +30,5 @@ | |
# Build directory | ||
build | ||
|
||
nbproject | ||
CMakeFiles |
Submodule openvr
updated
85 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.There was a problem hiding this comment.
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.