SamGondelman
d985d0293a
correcting comments, removing dead code + back slash
2015-07-20 16:48:53 -07:00
Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
Brad Davis
359abd6474
Merge branch 'master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/GLCanvas.cpp
interface/src/GLCanvas.h
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
libraries/render-utils/src/OffscreenGlCanvas.cpp
libraries/render-utils/src/OffscreenGlCanvas.h
libraries/render-utils/src/text/EffectType.h
2015-07-20 13:33:24 -07:00
Bradley Austin Davis
14b0f7d159
Working on mac oculus rendering
2015-07-17 11:03:23 -07:00
Anthony J. Thibault
65b76869fa
Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers
2015-07-16 18:47:55 -07:00
Anthony J. Thibault
060f6c19a6
almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly
2015-07-16 18:16:59 -07:00
Anthony J. Thibault
ef0a157111
Fixes for oculus rift support
...
* should work in standing and 'seated' mode
* OculusBaseDisplayPlugin getModelView now only applies eye offset to match behavior from the OpenVRPlugin
2015-07-16 16:04:08 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Brad Davis
14a300b4cf
Fix oculus rendering
2015-07-13 19:07:59 -07:00
Brad Davis
86a51806a5
Fix issue with overlay stuck to face
2015-07-10 10:48:54 -07:00
Anthony J. Thibault
15cf008f13
hand controllers and arrow keys now work
2015-07-07 17:29:45 -07:00
Anthony J. Thibault
5293effc2e
more work in progress vive room tracking
...
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
2015-07-07 00:12:48 -07:00
Anthony J. Thibault
834b75f4c4
work in progress room scale tracking work.
...
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
2015-07-06 18:25:42 -07:00
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -07:00
Brad Davis
e459d0cb83
Fixing the 0.6 Oculus plugin
2015-07-03 07:08:48 -07:00
Brad Davis
ed5835ff05
Trying to get mac display plugins working:
2015-07-02 22:29:22 -07:00
Bradley Austin Davis
6b85db268c
Working on mac oculus support
2015-07-02 18:14:38 -07:00
Bradley Austin Davis
0034a14fc1
Working on mac functionality
2015-07-02 18:14:12 -07:00
Sam Gondelman
3f6fbd058c
merge with standing-mode, hands relative to neck
2015-07-02 17:44:19 -07:00
Sam Gondelman
a6cbc09eac
reverted to openvr 0.9.1
2015-07-02 12:32:35 -07:00
Sam Gondelman
81efd99ae4
merge with hifi/plugins
2015-07-02 10:13:28 -07:00
Anthony J. Thibault
f0d8916d8a
First crack at room scale tracking from vive HMD.
...
* modifed openvr plugin to return different eye pose matrices.
* avatar position and physics body now follow the head.
* orientation also follows head direction
2015-07-02 09:47:08 -07:00
Brad Davis
5abf08817e
Trying to fixup the plugins compilation
2015-07-02 00:00:00 -07:00
Bradley Austin Davis
54bbc841e2
Working on mac compilability
2015-07-01 23:03:33 -07:00
Sam Gondelman
0333adb95b
moved controllers to input-plugins, they work now
2015-07-01 18:46:57 -07:00
Brad Davis
5eca45353c
Merge pull request #5238 from hyperlogic/ajt/vive-sensor-reset
...
OpenVR sensor reset fix
2015-07-01 16:03:16 -07:00
Sam Gondelman
e54060d6bb
more working on poses, LEFT_ and RIGHT_HAND input actions
2015-07-01 14:36:12 -07:00
Brad Davis
c024c4ba0e
Fixing cmake case problem on ubuntu
2015-07-01 10:42:35 -07:00
Sam Gondelman
ab50e58cac
more working on integrating hand poses
2015-07-01 10:32:18 -07:00
Brad Davis
ab1ae4aad5
Working on Oculus 0.5 support
2015-07-01 09:04:51 -07:00
Brad Davis
163918e615
Working on Oculus 0.5 support
2015-07-01 08:27:18 -07:00
Sam Gondelman
a154c809c0
working on using UserInputMapper::Pose, merging
2015-06-30 17:34:34 -07:00
Sam Gondelman
85f4d1bfa7
removed tab
2015-06-30 10:48:59 -07:00
Sam Gondelman
aaf84b47f3
Merge remote-tracking branch 'upstream/plugins' into sam/vive-hand-controllers
2015-06-30 10:37:06 -07:00
Sam Gondelman
6c40b48204
reset works if you're looking straight down
2015-06-30 10:13:02 -07:00
Sam Gondelman
be7053d208
workaround for resetSensors in OpenVRDisplayPlugin
...
For some reason ResetSeatedZeroPose doesn't work.
So we do it the hardway.
2015-06-29 20:27:32 -07:00
Sam Gondelman
1dd62b2726
general improvements, need to resolve dependency issues
2015-06-29 18:22:31 -07:00
Sam Gondelman
a27196dfee
initial testing of hand controller tracking
2015-06-29 17:13:33 -07:00
Brad Davis
196a92c1b4
A little bit of display plugin API cleanup
2015-06-29 10:55:13 -07:00
Brad Davis
a8f8c45755
Use correct size for the offscreen framebuffer for vive
2015-06-27 00:30:33 -07:00
Brad Davis
dac4a242c1
Removing cruft
2015-06-12 19:47:05 -07:00
Brad Davis
15d214f335
Initial pass at OpenVR
2015-06-12 17:29:05 -07:00
Brad Davis
1b7efe9a02
Working on display plugins
2015-06-05 00:00:57 -07:00
Brad Davis
17ebcdd1be
Working on display plugins
2015-06-03 17:15:00 -07:00
Brad Davis
3d5c9151fd
Working on oculus overlay
2015-06-03 00:17:45 -07:00
Brad Davis
9d5a462a63
Working on UI in oculus
2015-06-02 12:18:00 -07:00
Brad Davis
5fdf032a65
Working on oculus
2015-06-01 22:59:24 -07:00
Brad Davis
a483dd27ba
Trying to get widgets / windows working
2015-06-01 17:31:18 -07:00
Brad Davis
23d6725a6a
Consolidating GL display plugins
2015-05-31 00:24:19 -07:00
Brad Davis
fec214c552
Working on consistent input response
2015-05-30 02:01:11 -07:00
