Commit graph

950 commits

Author SHA1 Message Date
Anthony Thibault
fd3eed3d41 NeruonPlugin: translation support
Warn if translations are not present.
2015-12-26 11:50:54 -08:00
Anthony Thibault
878fe80040 Merge branch 'master' into tony/neuron-plugin 2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb Set up controller poses to match hifi standard skeleton
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
2015-12-25 09:57:50 -08:00
Anthony Thibault
8b979b67ee neruonAvatar.js: now sets rotations in correct frame.
The rotations from the neuron are effectively in world space and are deltas
from the default pose.

There still is an issue with the thumb, due to the missing joint from the Neuron.
The Neuron only has 3 thumb joints, not 4.
2015-12-24 17:16:49 -08:00
Anthony J. Thibault
c44f69b370 WIP checkpoint
Changed euler angle compisition based on experiments in maya.
Also, the neuronAvatar.js attempts to transform the neuron input quaternions into
a pose relative to the avatar's default pose, but doesn't it doesn't work.
2015-12-23 17:13:52 -08:00
Anthony J. Thibault
6afe3bae5e Copy Neuron joints into controller poses
This makes the accessible for controller mapping and to JavaScript.

Added 'neuronAvatar.js' as an example of reading joints from the neuron and setting them
on the avatar.  NOTE: the rotations are currently in the wrong coordinate frame.
2015-12-22 17:21:33 -08:00
Brad Hefta-Gaub
68c6cae4f3 fix warning 2015-12-22 17:21:25 -08:00
Brad Hefta-Gaub
298e4d0f83 Merge pull request #6726 from jherico/legacy_oculus
Legacy oculus work
2015-12-22 11:02:37 -08:00
Bradley Austin Davis
79d8b20637 Simulating Oculus interaction on legacy platforms 2015-12-22 10:09:45 -08:00
Bradley Austin Davis
e0e1ae43f5 Fixing legacy oculus plugin 2015-12-22 09:28:38 -08:00
Brad Hefta-Gaub
eff830ad4b fix crash on mac when sixense DLL can't be loaded 2015-12-22 01:03:23 -08:00
Anthony J. Thibault
0459479c2b NeuronPlugin: Added external project for Neuron SDK
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
2015-12-21 18:30:15 -08:00
Anthony J. Thibault
dcde640acd Stub Perception Neuron input plugin 2015-12-21 10:06:36 -08:00
samcake
41525a7c4d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 16:20:41 -08:00
Andrew Meadows
4e76e9e50b prevent nan values in measure of angularVelocity 2015-12-18 13:51:14 -08:00
samcake
dff4327f7d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 13:18:30 -08:00
Andrew Meadows
d6541e9ee7 angular velocity is a vector, not a quaternion 2015-12-18 11:06:58 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
Brad Davis
98263f0c0d Moving sdl2 to external plugin 2015-12-10 14:56:41 -08:00
Brad Hefta-Gaub
e133bd867a Merge pull request #6600 from jherico/aeryn-sixense
Moving Sixense to external plugin
2015-12-10 13:33:17 -08:00
Brad Davis
645695d5d5 Moving sixense to external plugin 2015-12-10 10:44:23 -08:00
Howard Stearns
83078b9d8c Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-10 08:44:08 -08:00
Bradley Austin Davis
1644bda908 Migrate to latest Oculus SDK (0.8) 2015-12-09 17:32:11 -08:00
Bradley Austin Davis
fd5fb3096f Disabling OpenVR plugin 2015-12-09 17:31:53 -08:00
Brad Davis
978d39b7f4 Moving OpenVR to external plugin and updating to latest version 2015-12-09 16:20:24 -08:00
Howard Stearns
acb43e18d0 coding standards 2015-12-09 15:54:49 -08:00
Howard Stearns
dd2d040253 Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-09 15:43:43 -08:00
howard-stearns
1d65cbce88 Remove unneeded getTargetFramePeriod and isVSynchronized. 2015-12-08 18:08:57 -08:00
Bradley Austin Davis
e77f2e8ac4 Pass correct frame index into Oculus SDK 2015-12-08 16:49:50 -08:00
Howard Stearns
fa0ad1fe4d Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-04 16:12:22 -08:00
Brad Davis
90ef7c6bf7 Disabling 0.5 Oculus plugin (Mac / Linux) for now 2015-12-04 10:28:20 -08:00
Brad Davis
60aa93c38c Fixing menu items in display plugins 2015-12-04 10:28:19 -08:00
Brad Davis
7262a10e62 Refactoring present thread / GL base plugin for saner context management 2015-12-04 10:28:18 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents
Parents
2015-12-04 10:26:57 -08:00
Atlante45
07387ab8c0 Fix most OpenGL warnings 2015-12-04 10:01:43 -08:00
Howard Stearns
d51785a259 Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-03 17:28:32 -08:00
Howard Stearns
a989b926b0 isVSynchronized, and proper override declarations. 2015-12-03 11:28:26 -08:00
Howard Stearns
8ae05d8490 Plugins target frame rate and period. 2015-12-02 16:40:41 -08:00
Brad Davis
0023c034c4 Fixing naming of GL classes 2015-11-30 18:27:03 -08:00
Seth Alves
a9669531ae quiet a warning 2015-11-21 11:53:16 -08:00
Seth Alves
4646c0c103 unmangle merge 2015-11-21 10:49:31 -08:00
U-GAPOS\andrew
28e349f421 remeasure sensor after recentering 2015-11-19 10:43:40 -08:00
Stephen Birarda
46c8d7b3f8 fix for release build undeclared identifier 2015-11-17 12:32:45 -08:00
Brad Davis
4dec31d524 Fix crash in Oculus simulator 2015-11-04 13:20:47 -08:00
Seth Alves
c381da24a7 get interface building on my linux box 2015-11-02 10:42:06 -08:00
Brad Hefta-Gaub
92bcd9ca9e make oculus plugin use static glew 2015-11-01 15:48:01 -08:00
Brad Hefta-Gaub
b9d60e803b fix mac warning 2015-11-01 15:13:28 -08:00
Brad Davis
1e47a53603 Fixing mac oculus crash 2015-11-01 14:34:03 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00