Jeffrey Ventrella
c0f319f077
merge
2013-07-15 14:36:11 -07:00
Jeffrey Ventrella
f75ce72aca
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 14:30:19 -07:00
Eric Johnston
0239341127
updated per feedback
2013-07-15 14:27:58 -07:00
Eric Johnston
c61966ebcd
made Leap unit-conversion method public
2013-07-15 14:12:52 -07:00
Jeffrey Ventrella
83c779ad76
merge
2013-07-15 14:08:04 -07:00
atlante45
bf3c4fa1f8
Avatar resizing final commit
2013-07-15 12:04:24 -07:00
atlante45
078a47b006
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
2013-07-15 12:03:04 -07:00
ZappoMan
8d4f7f8a2a
CR feedback
2013-07-15 09:26:19 -07:00
ZappoMan
64681fa1e4
CR feedback
2013-07-15 09:21:47 -07:00
ZappoMan
133bbd81fe
small spacing change
2013-07-15 01:42:21 -07:00
ZappoMan
f078d646d7
small spacing change
2013-07-15 01:41:28 -07:00
ZappoMan
f415f4081a
Fixed a bug in LOD boundaries
...
- changed the way we calculate whether or not to render a parent "average" voxel so
that if any of it's most distant child would not be visible, then it's used instead
of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
center of the voxel, but the distance from the camera to the furthest corner relative
to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
tell you which vertex of the box is furthest from the camera
2013-07-15 01:32:14 -07:00
atlante45
34cbe317fa
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Webcam.cpp
2013-07-12 17:57:20 -07:00
atlante45
280afed7f0
added scale in avatar packets eand slots to change it from the menu
2013-07-12 17:51:47 -07:00
Stephen Birarda
0235993366
reset default packet version to 0
2013-07-12 16:00:44 -07:00
Stephen Birarda
3147ac3ac4
print packet version mismatch to Log
2013-07-12 15:54:12 -07:00
ZappoMan
85b1ce3051
tweaks to low res moving, made monochrome off by default
2013-07-12 14:11:35 -07:00
Stephen Birarda
7c60fd4327
Merge pull request #657 from machinelevel/dev4
...
Some Leap finger fixes, but also temporarily disable Leap data sending, ...
2013-07-11 17:11:38 -07:00
ZappoMan
323644d877
CR feedback
2013-07-11 16:09:08 -07:00
Eric Johnston
58b50067ad
Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash.
...
Will resolve the crash before re-enabling.
2013-07-11 16:06:31 -07:00
ZappoMan
8774cb7ca0
fix hungergames circle bug, and improve performance of isLeafOrLOD logic
2013-07-11 15:48:17 -07:00
ZappoMan
c26e39764a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-11 13:50:33 -07:00
Stephen Birarda
4cf0b7ea66
switch back to statics for domain server check in, fix environment packets
2013-07-11 13:40:29 -07:00
ZappoMan
241bd7ce37
added support for lower LOD when moving with low res moving
2013-07-11 13:16:52 -07:00
Stephen Birarda
66a998e752
correct use of member variables for DS check in
2013-07-11 13:05:15 -07:00
Stephen Birarda
a0226b2548
avoid static variable thread issue by switching to member variables
2013-07-11 13:02:25 -07:00
ZappoMan
57ce20d3ce
add support for Low Res sending while moving
2013-07-11 12:43:43 -07:00
Stephen Birarda
a1747725d3
sensible default for checkInPacketSize
2013-07-11 12:28:29 -07:00
Stephen Birarda
769205253f
remove extra plus in AvatarData parseData
2013-07-11 12:27:48 -07:00
Stephen Birarda
544f9c2e7a
type squish and magic number removal
2013-07-11 11:15:02 -07:00
Stephen Birarda
6804ab8a33
type squish in NodeList
2013-07-11 11:12:14 -07:00
Stephen Birarda
38a33e0283
couple more type squishes
2013-07-11 11:11:39 -07:00
Stephen Birarda
fcb8865d2e
resolve conflicts on merge with upstream master
2013-07-11 10:58:45 -07:00
ZappoMan
9aed3d3cc6
enable delta sending by default
2013-07-11 10:37:28 -07:00
ZappoMan
d4ce00de77
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-11 10:24:53 -07:00
Stephen Birarda
4ed231670f
put back the missing voxels
2013-07-11 10:04:27 -07:00
ZappoMan
5427b263f6
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-11 09:46:10 -07:00
Stephen Birarda
ca0f6a4d10
header re-arranging and changing
2013-07-11 09:30:45 -07:00
Stephen Birarda
211204e878
Merge remote-tracking branch 'upstream/master' into timestamps
2013-07-11 09:23:16 -07:00
Stephen Birarda
cbf18160cb
include stdint for uint64_t in SimpleMovingAverage
2013-07-11 09:22:08 -07:00
ZappoMan
34cebc36c7
short circuit node recursion for delta sending
2013-07-11 09:11:09 -07:00
ZappoMan
ab8e2916d3
improvements to delta sending
2013-07-10 19:49:50 -07:00
ZappoMan
dc70675c22
removed obsolete ResIn mode
2013-07-10 19:04:28 -07:00
ZappoMan
3d3eca9afa
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-10 17:45:04 -07:00
ZappoMan
371bf7d181
removed dead code, fixed compiler warning
2013-07-10 17:22:30 -07:00
ZappoMan
17e70271ff
make occlusion culling default
2013-07-10 17:21:51 -07:00
ZappoMan
2bb2fc736c
remove dead code
2013-07-10 17:14:34 -07:00
ZappoMan
1831cc0de3
removed level param from recursion
2013-07-10 17:06:22 -07:00
ZappoMan
62c933140d
implement max number of polygons in the coverage regions to keep them from getting slow
2013-07-10 16:57:42 -07:00
Andrzej Kapolka
100f7c19c3
Merge pull request #636 from PhilipRosedale/master
...
Touchlook tuned and always on!
2013-07-10 16:36:10 -07:00
