Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 05:33:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4885 commits 71 branches 56 tags 1.2 GiB
Commit graph

4885 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
2c5b8d3121 cmake source is root, make specific target 2013-07-31 12:21:49 -07:00
Stephen Birarda
43fad3037f fix link to QtWebKit lib to be fervor specific 2013-07-31 12:04:47 -07:00
Stephen Birarda
0086dfdb26 redundant setting of CMAKE_PREFIX_PATH in interface CMakeLists 2013-07-31 11:53:48 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Philip Rosedale
61515879de Merge pull request #731 from ey6es/pointy 
Various tweaks to depth streaming: send depth in separate stream from video (rather than one on top of the other); better computation of mean face depth; use mean face depth to calculate forward/backward lean; send valid mask in V channel.
 2013-07-30 16:41:26 -07:00
Andrzej Kapolka
353d674ad9 Masking tweak. 2013-07-30 15:56:47 -07:00
Andrzej Kapolka
96bd7dbe25 Removed the magic from a number. 2013-07-30 15:30:34 -07:00
Andrzej Kapolka
c787781efb Send color and depth as separate streams (rather than one on top of the other) 
so that we can control their bitrates separately.
 2013-07-30 15:11:32 -07:00
Andrzej Kapolka
f8ba1c4be1 Use the V channel to provide masking information, indicating invalid depths. 2013-07-30 13:42:29 -07:00
Andrzej Kapolka
3c437076a7 When we have a mean face depth, use that rather than the face size to 
estimate the z coordinate.
 2013-07-30 11:07:33 -07:00
Andrzej Kapolka
3b4a4daec3 Ignore maximum values when computing the depth. 2013-07-29 18:26:51 -07:00
Andrzej Kapolka
9c0e29b5e6 Use only valid values to compute mean, and use the post-warp data to avoid 
breaking on head tilt (because we were using the bounds of the rotated rect,
which included too much background).
 2013-07-29 18:16:10 -07:00
Andrzej Kapolka
f6d1055f00 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 16:24:22 -07:00
Andrzej Kapolka
934b152f3e Merge pull request #730 from ey6es/master 
These casts should fix the warnings on OS X.
 2013-07-29 16:13:09 -07:00
Andrzej Kapolka
4ae4623315 These casts should fix the warnings on OS X. 2013-07-29 16:12:11 -07:00
Andrzej Kapolka
de52342a14 Working on depth data processing. 2013-07-29 16:04:15 -07:00
Andrzej Kapolka
3b3801915b Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 15:44:41 -07:00
Andrzej Kapolka
6bc3e9b808 Merge pull request #726 from ZappoMan/bug_fixes 
fix bug with dragonfly leaving trailing bits
 2013-07-29 15:44:31 -07:00
ZappoMan
1a73485e36 Improved VoxelNode delete callback based on CR feedback 
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
 2013-07-29 15:30:30 -07:00
Andrzej Kapolka
c678b79373 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 15:17:55 -07:00
Leonardo Murillo
83e90cba49 Merge pull request #729 from murillodigital/master 
Fixing cmake path on seed's groovy
 2013-07-29 15:02:38 -07:00
Leonardo Murillo
9662b956c7 Fixing cmake path on seed's groovy 2013-07-29 16:00:55 -06:00
Andrzej Kapolka
fac3ff1089 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 14:35:31 -07:00
Andrzej Kapolka
855d388424 Merge pull request #727 from LionTurtle/master 
Fix first person camera positioning to correspond to eyelevel.
 2013-07-29 14:35:14 -07:00
ZappoMan
e20f163e0a changed some defines to consts 2013-07-29 13:34:58 -07:00
ZappoMan
03a75ab295 fixed spacing 2013-07-29 13:08:05 -07:00
ZappoMan
97aaa738c3 fixed typo 2013-07-29 13:07:12 -07:00
ZappoMan
d6428a8145 removed unneeded cast 2013-07-29 13:03:42 -07:00
ZappoMan
6a2bab2a2c Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-29 13:02:14 -07:00
Mark Peng
bfd7f3a6c9 Remove rendering of your own avatar's lookatVectors. This fixes the 
behavior where if you are moving and jumping, you will occasionally see
your own lookatVectors on your screen.
 2013-07-29 12:25:01 -07:00
Mark Peng
bd663a8c22 Merge remote-tracking branch 'upstream/master' 2013-07-29 12:09:27 -07:00
Mark Peng
d01f694d49 Remove extra semicolon in avatar.cpp 2013-07-29 11:52:29 -07:00
Andrzej Kapolka
1f076cc268 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 10:50:55 -07:00
Andrzej Kapolka
cbc0b59c24 Merge pull request #728 from ey6es/master 
The particle system is killing the frame rate, so let's make it toggleable.  Also fixed GCC warnings.
 2013-07-29 10:47:15 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
Andrzej Kapolka
b02c5f103d Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-29 10:14:39 -07:00
Andrzej Kapolka
5812747ef8 Double the bitrate to see if we can reduce the blockiness. 2013-07-29 10:06:03 -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
ZappoMan
4cca7e2572 Fixed issue with freeing up abandoned VBO slots when not moving with animation 2013-07-26 11:44:19 -07:00
ZappoMan
0c95dc4adf Fixed voxel trails from animations 
- removed stageForDeletion behavior of VoxelNode
- replaced with VoxelNodeDeletionHook strategy
- VoxelSystem now cleans up previously used VBO index slots via hook
 2013-07-26 11:12:48 -07:00
ZappoMan
79648ce656 fix bug with dragonfly leaving trailing bits 2013-07-25 15:22:23 -07:00
Stephen Birarda
718fa291cf Merge pull request #724 from ZappoMan/bug_fixes 
fix voxel-server crash
 2013-07-25 13:15:47 -07:00
Stephen Birarda
d444e4860b Merge pull request #722 from ZappoMan/unlimited_avatars 
split multiple avatars into multiple packets if needed
 2013-07-25 13:15:29 -07:00
ZappoMan
919f2a4a93 fix voxel-server crash 2013-07-25 12:56:00 -07:00
ZappoMan
212fddbd34 CR feedback 2013-07-25 12:29:17 -07:00
Stephen Birarda
08b94d731f merge branch qt5 with upstream/master 2013-07-25 10:23:22 -07:00
ZappoMan
c8bde7146e Merge branch 'master' of https://github.com/worklist/hifi into unlimited_avatars 2013-07-24 13:42:03 -07:00
Stephen Birarda
5f26bbdc0a remove debug of QT_CMAKE_PREFIX_PATH 2013-07-24 12:22:57 -07:00
Stephen Birarda
5708188180 fixes for new message handler for qt5 2013-07-24 12:22:02 -07:00
Stephen Birarda
4abb80b4f9 remove no longer required qt cpp wrap 2013-07-24 12:14:52 -07:00