Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 01:08:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53569 commits 25 branches 0 tags 1.1 GiB
Commit graph

964 commits

Author SHA1 Message Date
Eric Johnston
d5885acd75 Cleanup and simplification per feedback 2013-10-14 10:09:08 -07:00
Eric Johnston
7bc2cf6fa9 Leap interface and Avatar: left-hand IK works for Leap interface. 
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
 2013-10-14 09:01:50 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
Andrzej Kapolka
4c073426c8 Ball and cone color from average geometry colors. 2013-10-10 13:41:50 -07:00
Andrzej Kapolka
604d6399eb Fix for grow/shrink rates. 2013-10-09 11:58:27 -07:00
Andrzej Kapolka
5511c02449 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:53:08 -07:00
Andrzej Kapolka
0a54c2f1e9 Tweaking the growing heads. 2013-10-09 11:52:56 -07:00
Andrzej Kapolka
1b4daa8eb9 No glow on own avatar, only on others when farther than five units away. 2013-10-09 10:17:41 -07:00
Stephen Birarda
233c1599bd leverage existing URL update rate for interim face model update solution 2013-10-08 14:25:53 -07:00
Stephen Birarda
10f29dfe90 ask the data-server for a face mesh on UUID change 2013-10-08 14:02:57 -07:00
Stephen Birarda
15ddd9989b ovverride UUID setter in Avatar for DataServerClient get request 2013-10-08 13:59:28 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
98f435ccc2 link mesh URL and UUID in prefs to data server client 2013-10-07 12:03:04 -07:00
Stephen Birarda
ca68846c1b some deletions and cleanup based on Xcode analysis 2013-09-30 15:36:23 -07:00
Freddy
f88a3633a5 Slow down when near other avatars for easier positioning 2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba Faceshift drives body rotation, remove gyro-driven rotation 2013-09-26 23:52:44 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
Andrzej Kapolka
4dec183262 Enlarge heads when they're moused over. 2013-09-26 12:07:13 -07:00
Andrzej Kapolka
24bf1e2036 Don't render neck/neck base when blend face is active. 2013-09-20 17:55:31 -07:00
Stephen Birarda
f8f0e3db1b remove the sphere from the ground plane 2013-09-20 14:04:18 -07:00
Andrzej Kapolka
df0b2f4eec Fix for face model sending. 2013-09-20 13:28:50 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
6be03ac3df Working on downloading the faces. 2013-09-18 10:10:24 -07:00
Andrzej Kapolka
262365f15f Only render the Perlin face for the local user. 2013-09-17 10:51:33 -07:00
Andrzej Kapolka
0a9db6a5ee Moved device-related files to "devices" folder. 2013-09-04 12:15:36 -07:00
Andrzej Kapolka
799d2b487f Initialization order fix. 2013-08-26 16:53:12 -07:00
Andrzej Kapolka
8d8ba532e1 These initializers are in the wrong order. 2013-08-26 14:52:21 -07:00
Andrzej Kapolka
28ffd8eca7 Render the ball heads with the voxeltar bodies. 2013-08-23 14:22:00 -07:00
Andrzej Kapolka
2cff4b6b3a "Laser pointer" for transmitter. 2013-08-22 17:09:23 -07:00
Andrzej Kapolka
3dfefefeae Make the surrounding spheres glow when moving, too. 2013-08-22 14:00:50 -07:00
Andrzej Kapolka
2eaaee673f Argh, forgot to return the result of the superclass implementation. 2013-08-22 13:52:10 -07:00
Andrzej Kapolka
7da9556815 Glow when moving. 2013-08-22 11:23:28 -07:00
Andrzej Kapolka
ff245427fd Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/avatar/Avatar.cpp
 2013-08-22 10:40:15 -07:00
Andrzej Kapolka
165342bcc3 Have the local avatar glow when moving. 2013-08-22 10:35:21 -07:00
LionTurtle
e252d3b2ac Style and spacing changes in MyAvatar/Avatar classes. 2013-08-21 16:32:06 -07:00
LionTurtle
a6109d411b Remove unnecessary comments and spaces. 2013-08-21 13:47:19 -07:00
LionTurtle
1300bf7de2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
 2013-08-21 13:36:28 -07:00
LionTurtle
f4109b3fb4 Add MyAvatar subclass. For functions such as render() and simulate(), 
they have been edited so that there are MyAvatar and Avatar specific
versions in their respective classes. isMyAvatar() has been removed.
 2013-08-21 13:24:54 -07:00
Andrzej Kapolka
222e026662 Use a small default lean scale. 2013-08-19 13:18:20 -07:00
Andrzej Kapolka
8d65323345 Restore the gyro-only lean behavior based on linear accelerometer data. 2013-08-19 13:14:35 -07:00
Stephen Birarda
811fc87294 move avatar size changes to Avatar slots 2013-08-15 12:18:19 -07:00
Stephen Birarda
bbe239694e move Avatar goHome to Avatar slot 2013-08-15 11:36:12 -07:00
Stephen Birarda
46b064b7d6 initial decoupling of menu from Application 2013-08-15 10:46:51 -07:00
atlante45
521eb19625 PR comments + Changed MIN and MAX scale 2013-08-08 16:22:26 -07:00
atlante45
f5fe965093 Position based follow mode whith head movement 2013-08-08 15:49:35 -07:00
Stephen Birarda
655a27b257 Merge pull request #825 from Atlante45/master 
Fix other avatar not rendered in first person
 2013-08-07 16:44:23 -07:00
atlante45
4449b46466 Fix other avatar not rendered in first person 2013-08-07 16:38:02 -07:00
ZappoMan
9f5f7d96da Merge pull request #820 from Atlante45/master 
Display leap hand and rave glove in first person mode
 2013-08-07 16:17:37 -07:00
atlante45
20fea6b0ad Height relative collision rdius when not in first person 2013-08-07 14:50:35 -07:00
Philip Rosedale
a4d1bc5b6e Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:43:49 -07:00
Philip Rosedale
0445da3221 Stop rotating more quickly, display avatar position and yaw stats 2013-08-07 14:42:57 -07:00
atlante45
c48652c2c3 Display leap hand and rave glove in first person mode 2013-08-07 14:28:21 -07:00
atlante45
81446f13d5 Fix head not colliding with voxels and environement 2013-08-07 14:18:02 -07:00
atlante45
3bc9dd116e - Compute collisions radius only when collisions are on 2013-08-07 12:31:31 -07:00
atlante45
35557e1973 - Change collision radius according to near clip so nothing comes inside 2013-08-07 12:25:31 -07:00
ZappoMan
11b7e84a80 Merge pull request #811 from ey6es/master 
Several minor fixes for depth camera code.
 2013-08-07 12:01:01 -07:00
Andrzej Kapolka
e17149a49d Merge pull request #812 from Atlante45/master 
Rendering changes
 2013-08-07 11:46:43 -07:00
Andrzej Kapolka
377adb30ae Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:14:48 -07:00
atlante45
08309e3aac Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:11:29 -07:00
Eric Johnston
10e4174ce3 Rave tweak: keep the right arm on the right-most Leap hand. 2013-08-07 11:08:14 -07:00
atlante45
dcdae6c6a0 - Add a translucide sphere around avatars far away with radius relative to average loudness 2013-08-07 11:00:20 -07:00
Eric Johnston
1fc4f17f7a Rave tweaks: change the look of the hands, fix screen-darken 
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
 2013-08-07 10:29:31 -07:00
Andrzej Kapolka
ca939fb6b8 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 10:18:45 -07:00
Andrzej Kapolka
f20ac7f4bc Include received video data in bandwidth usage, clear webcam bits when it's 
been turned off.
 2013-08-07 10:17:04 -07:00
Eric Johnston
35465686db Rave tweaks: Use separate light settings for avatars and particles 2013-08-06 17:39:56 -07:00
Eric Johnston
378cb343ae Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want. 2013-08-06 16:45:15 -07:00
atlante45
558255ca3d - Made collision On by default 2013-08-06 16:13:31 -07:00
ZappoMan
634b69b545 Merge pull request #797 from machinelevel/dev4 
Rave demo changes per Ryan's request: Darken the world when you're in ra...
 2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa Merge pull request #796 from PhilipRosedale/touchLook 
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
 2013-08-06 14:59:28 -07:00
Eric Johnston
2e5dade413 Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened. 
Also fixed a warning in AvatarData.cpp initialization
 2013-08-06 14:29:30 -07:00
ZappoMan
fb2a1cce50 Merge pull request #795 from machinelevel/dev4 
Rave glove adjustments per Ryan's requests: hide fingers and arms when r...
 2013-08-06 13:45:42 -07:00
Eric Johnston
9a4a0e2819 Rave glove adjustments per Ryan's requests: hide fingers and arms when raving, center hands in front of face. 2013-08-06 12:44:29 -07:00
Philip Rosedale
ebd5c4832a Merge branch 'master' of https://github.com/worklist/hifi into touchLook 2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506 Tuned gyro look, added better preferences 2013-08-06 12:34:45 -07:00
ZappoMan
c93ed450a2 Merge pull request #791 from Atlante45/stalking_indicator 
Stalking indicator
 2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f Merge pull request #792 from Atlante45/turn_off_collisions 
Add option to turn collisions on and off
 2013-08-06 12:27:27 -07:00
atlante45
ddf1b06bf9 Add option to turn collisions on and off 2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator 2013-08-06 11:07:58 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
Philip Rosedale
58cb852597 Touch-driven pitch happens immediately even when wearing gyros 2013-08-06 10:06:40 -07:00
Philip Rosedale
d7dc07502c Merge pull request #787 from machinelevel/dev4 
Rave glove demo: network-glove fixes
 2013-08-05 18:58:04 -07:00
Eric Johnston
d85ce81313 Rave glove demo: network-glove fixes 
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
 2013-08-05 17:27:42 -07:00
atlante45
29062c51b2 - changed according to review comments 
- added reset scale option
 2013-08-05 15:23:40 -07:00
atlante45
3d853f5b90 - Smooth rescaling 
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
 2013-08-05 14:05:58 -07:00
ZappoMan
ce937247d1 added back getUprightEyeLevelPosition() 2013-08-02 18:47:21 -07:00
ZappoMan
fd81053e33 fixed compiler warnings 2013-08-02 18:33:41 -07:00
Mark Peng
71a919f226 Switch back to avatar.getEyePosition() rather than 
avatar.getHead().getEyePosition() because of mysterious lag.
 2013-08-02 18:02:37 -07:00
Mark Peng
d7cd88a9a7 Fix camera positioning so that it is in between avatar's eyes. Plus 
some code clean up.
 2013-08-02 17:30:26 -07:00
atlante45
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
ZappoMan
55f7028726 Merge pull request #744 from PhilipRosedale/master 
Smoother movement, rotation, less distracting collision noises.  Play sound on click voxel
 2013-08-02 14:03:51 -07:00
Andrzej Kapolka
0052221c33 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 15:52:58 -07:00
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -07:00
atlante45
1b2f236d42 Follow mode operationnal 2013-07-30 12:30:15 -07:00
Jeffrey Ventrella
f8392c0843 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:07:56 -07:00
Mark Peng
d01f694d49 Remove extra semicolon in avatar.cpp 2013-07-29 11:52:29 -07:00
Jeffrey Ventrella
f83ee1e0b5 cleanup 2013-07-29 09:48:28 -07:00
Mark Peng
dd2655825a Fix first person camera positioning to correspond to eyelevel. 
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
 2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00
atlante45
f3c87b81ec Avatar can follow but don't look at the same point for the moment 2013-07-25 16:14:47 -07:00
atlante45
68194f2037 Slot calling when pie menu on avatar. 2013-07-24 13:50:00 -07:00
atlante45
177471e83b First step toward follow mode 2013-07-24 11:24:28 -07:00
Eric Johnston
9ab8fecff5 Minor tweaks to Rave Glove mode, per Ryan's testing 
1. Improve response by using unfiltered data from Leap library
2. Reduce distracting arm-flail by only attaching the arm to che glove when we're not in rave mode.
 2013-07-22 07:19:25 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Andrzej Kapolka
7ce04444fc Most of the way towards working video encoding. 2013-07-18 14:14:44 -07:00
Andrzej Kapolka
401ef45000 Removed keypoint stuff, fixed stupidity leading to fringed edges (was 
linearly interpolating the missing values).
 2013-07-16 17:56:53 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Andrzej Kapolka
905bd9b011 Track features on face, add a mode to render just key points. 2013-07-16 11:54:19 -07:00
Andrzej Kapolka
6c587af6ac Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/avatar/Head.cpp
 2013-07-15 13:13:51 -07:00
Andrzej Kapolka
a59fbfbf3e Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-14 18:21:50 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
Andrzej Kapolka
763e6a2fa1 Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
 2013-07-12 15:34:55 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
Renamed from interface/src/Avatar.cpp (Browse further)