Andrzej Kapolka
1fdfca727d
More work on Kinect-driven joints.
2013-07-02 16:49:07 -07:00
Andrzej Kapolka
52e7ff9a68
Working on filling in missing joint data.
2013-07-02 14:51:27 -07:00
Andrzej Kapolka
095782af45
Smooth the joints, get the head position/orientation from there.
2013-07-01 17:46:05 -07:00
Philip Rosedale
138b8d7f64
Merge pull request #585 from birarda/owning-agent
...
boolean helper for Avatar isMyAvatar check
2013-06-30 23:26:32 -07:00
Eric Johnston
6c42922288
Minor bug fixes for networked Leap hands
2013-06-28 15:22:56 -07:00
Eric Johnston
1c797405da
Hand rework in preparation for adding send/receive hand data
...
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
2013-06-28 07:57:02 -07:00
Stephen Birarda
392728fbe5
Merge remote-tracking branch 'upstream/master' into owning-agent
2013-06-27 15:19:47 -07:00
Eric Johnston
b4f5df17ab
(re-commit) Added support for Leap finger-sensing device.
...
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
2013-06-27 10:54:36 -07:00
Stephen Birarda
fd30725222
add a missing set of parenthesis
2013-06-26 15:53:35 -07:00
Stephen Birarda
2c7d720e88
add a boolean helper for _owningAvatar NULL comparison
2013-06-26 15:52:01 -07:00
Andrzej Kapolka
0c184b9912
Merge pull request #571 from ey6es/opencv
...
Quick fix for something I broke in mouse/touch took.
2013-06-21 14:30:59 -07:00
birarda
bd0d820fc7
Merge pull request #556 from PhilipRosedale/master
...
Dynamic jitter buffer for less stuttering, fixes to stereo
2013-06-21 14:29:45 -07:00
Andrzej Kapolka
686fc3607e
Fix for mouse/touch look: don't apply rotations if the gyros/webcam aren't
...
connected.
2013-06-21 14:25:25 -07:00
Eric Johnston
6825274b65
Re-issue of change which adds two-finger touch look to avatar.
...
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
2013-06-21 13:43:23 -07:00
Philip Rosedale
13b729d9b4
Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar.
2013-06-20 18:49:05 -07:00
Andrzej Kapolka
b0dd5223e1
Avatar head roll/lean based on webcam data.
2013-06-20 14:20:03 -07:00
Andrzej Kapolka
ec495e14d3
Missed these guys.
2013-06-17 13:29:24 -07:00
Philip Rosedale
e6e147d86a
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-13 16:09:28 -07:00
Andrzej Kapolka
466c062bc1
Use a bound texture for the iris, load it with Qt rather than lodepng (we can
...
probably just remove the lodepng dependency).
2013-06-13 14:41:06 -07:00
Philip Rosedale
687966c486
Other people's avatar's look where they are mousing
2013-06-13 14:04:51 -07:00
Philip Rosedale
e32f9f387a
Basic random eye movements added, and fixation on camera in mirror mode.
2013-06-13 13:50:56 -07:00
Philip Rosedale
b85f91a7d4
fixes per code review
2013-06-13 12:05:06 -07:00
Philip Rosedale
d517487d1b
OK I wanted us to jump just a bit higher.
2013-06-13 11:35:36 -07:00
Philip Rosedale
61b1a2f995
First person to third person transition driven by velocity, changes to make moving and flying physics more fun.
2013-06-13 11:31:41 -07:00
Philip Rosedale
c0ba2aeebe
Added jumping, tuned friction model, tuned thrust
2013-06-12 23:45:59 -07:00
Philip Rosedale
6cffb16279
merge fixes
2013-06-12 13:29:17 -07:00
Andrzej Kapolka
52c616b688
Added configurable lean scale, fixed loadSetting.
2013-06-12 13:06:28 -07:00
Philip Rosedale
6164e6cd7e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 11:37:24 -07:00
Andrzej Kapolka
59c8d9d26a
Function cleanup, fixed misspelling, tweaked transparency distances to
...
accomodate lean.
2013-06-12 10:25:28 -07:00
Philip Rosedale
750d210f0a
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 21:20:39 -07:00
Philip Rosedale
ad58d0aa23
Adding voxel thrust on grabbing/dragging to move avatar
2013-06-11 21:19:58 -07:00
Andrzej Kapolka
7ef2a2c5d9
Set/get lean to/from network data.
2013-06-11 18:06:05 -07:00
Andrzej Kapolka
82f03ffd8e
Don't render the voxels when we're too close (i.e., in first person mode).
2013-06-11 17:53:49 -07:00
Andrzej Kapolka
648aacb53d
Let's use a fixed vector for the camera position so that the target doesn't
...
move with lean.
2013-06-11 17:26:41 -07:00
Andrzej Kapolka
70c5a941d7
Now let's try using the estimated position to calculate lean.
2013-06-11 17:01:06 -07:00
Andrzej Kapolka
c1c2439d2c
Let's try changing the torso rotation based on the gyros!
2013-06-11 16:44:21 -07:00
Andrzej Kapolka
35e18abcbd
Let's try using estimated velocity to control "lean."
2013-06-11 16:27:39 -07:00
Philip Rosedale
57fcaceec2
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b
Improved mouse look behavior to be smoother, removed transmitter debug.
2013-06-11 11:10:09 -07:00
ZappoMan
fc3fb7d3f0
fixed bug with loading of corrupt settings file where NaN returned for avatar position details
2013-06-10 11:46:06 -07:00
Andrzej Kapolka
dc8a6c2725
Store the avatar voxel URL along with the rest of the avatar settings.
2013-06-07 11:30:41 -07:00
Philip Rosedale
f0c9bd45bb
Fixed merge
2013-06-07 09:19:49 -07:00
Philip Rosedale
b5e63fb446
Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp
2013-06-06 17:52:19 -07:00
Stephen Birarda
bd553ef061
repair indentation and NULL comparisons in Avatar class
2013-06-06 16:01:36 -07:00
Andrzej Kapolka
650981abfa
Remove the bounce term; it causes fluctuations in velocity.
2013-06-06 13:41:22 -07:00
Andrzej Kapolka
56b4c04a18
Adjusted head base/top transforms.
2013-06-06 11:09:09 -07:00
Andrzej Kapolka
d9d6891cc8
Use the head rotation to adjust the position, too.
2013-06-06 10:54:28 -07:00
Andrzej Kapolka
27717bfcd4
Removed unused variables.
2013-06-06 10:48:35 -07:00
Andrzej Kapolka
2cc640b6f6
Set head bone rotation from head orientation.
2013-06-06 10:26:26 -07:00
Andrzej Kapolka
e0189c9834
Build fix, render body as balls if we don't have an avatar.
2013-06-06 10:17:57 -07:00
