Commit graph

4318 commits

Author SHA1 Message Date
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
78611e30e7 make occlusion culling default 2013-07-10 17:21:40 -07:00
ZappoMan
2bb2fc736c remove dead code 2013-07-10 17:14:34 -07:00
ZappoMan
a48f353f2f whitespace cleaned up 2013-07-10 17:07:55 -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
ZappoMan
6694ef3869 fixed some compiler warnings 2013-07-10 16:33:27 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
ZappoMan
78c62f29c3 lazy load stars file only if stars render enabled 2013-07-10 16:12:34 -07:00
ZappoMan
3c150c3ec6 only get boundary distance once, since its the same for all grandchildren 2013-07-10 16:12:13 -07:00
Stephen Birarda
790a48b9f8 Merge pull request #630 from Atlante45/19373
Code Review for Job #19373
2013-07-10 14:25:18 -07:00
Atlante45
425ea0aa29 merge conflict 2013-07-10 14:22:03 -07:00
Philip Rosedale
5a550d7974 Merge pull request #638 from ZappoMan/bug_fixes
fix random big average voxels slightly in view bug
2013-07-10 14:07:20 -07:00
ZappoMan
09f77279e2 add shortcut key to enable wants occlusion culling 2013-07-10 13:42:43 -07:00
ZappoMan
02437c6f39 fix random big average voxels slightly in view bug 2013-07-10 13:29:12 -07:00
ZappoMan
8bccfff5b5 fix random big average voxels slightly in view bug 2013-07-10 13:14:23 -07:00
Atlante45
7d94f65448 Linked ZLIB to voxels library 2013-07-10 13:00:16 -07:00
Atlante45
d79acea6a7 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-10 12:46:50 -07:00
Stephen Birarda
26b6712e4d Merge pull request #637 from birarda/master
remove read and write avatar data methods that aren't implemented
2013-07-10 12:37:52 -07:00
Stephen Birarda
70ccef0733 remove avatar data read and write to file 2013-07-10 12:37:23 -07:00
Philip Rosedale
0f011e07e5 Merge pull request #633 from birarda/inf-stats
fix for inf stat values
2013-07-10 11:51:27 -07:00
ZappoMan
de7cb9227a removed some dead code 2013-07-10 11:31:45 -07:00
Stephen Birarda
c5df53ed52 fix cast to 0 for long long in SimpleMovingAverage 2013-07-10 11:26:39 -07:00
ZappoMan
845b8924a5 removed some dead code 2013-07-10 11:21:38 -07:00
ZappoMan
ed8c33ef4b removed some comments 2013-07-10 11:19:49 -07:00
ZappoMan
d8b72cb126 removed some comments 2013-07-10 11:17:23 -07:00
ZappoMan
a9b1aa727f added back stars file loading 2013-07-10 11:11:21 -07:00
ZappoMan
abd7dfde8b added vector math timing test 2013-07-10 11:10:03 -07:00
ZappoMan
d89c3c8042 add version of recurse tree that uses pointer stack and allows timing breaks 2013-07-10 11:09:48 -07:00
Stephen Birarda
9ba3bfc8b8 Merge pull request #632 from birarda/master
remove warnings for wrong order member variable initialization
2013-07-10 09:59:53 -07:00
Stephen Birarda
488a4affd3 fix member variable initialization order to remove warnings 2013-07-10 09:59:14 -07:00
Stephen Birarda
e910680fa4 Merge pull request #631 from Atlante45/19368
Fixed broken shortcut (Turn on/off voxels is now Shift + V)
2013-07-09 17:11:04 -07:00
Stephen Birarda
4b0bff409c Merge pull request #606 from Atlante45/19368
Code Review for Job #19368
2013-07-09 15:50:34 -07:00
Stephen Birarda
329e59f04e Merge pull request #629 from ZappoMan/bug_fixes
make keyhole radius larger
2013-07-09 13:53:48 -07:00
ZappoMan
f076eed9d2 more hacking on occlusion culling 2013-07-09 13:17:38 -07:00
ZappoMan
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
ZappoMan
e85d5f3b14 make keyhole radius larger 2013-07-09 13:04:20 -07:00
atlante45
2e036a0e46 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 17:56:18 +02:00
atlante45
dbdbd7a8c4 Incorporating comments for code review (minecraft import) 2013-07-09 17:55:55 +02:00
atlante45
3433cf5a98 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 16:34:12 +02:00
atlante45
2c438e8af3 Fixed broken shortcut (Turn on/off voxels is now Shift + V) 2013-07-09 16:20:55 +02:00
atlante45
b3c0f3fedb More code review for UI job 2013-07-09 15:29:12 +02:00
atlante45
c3b0be5c63 More consts for UI job 2013-07-09 14:49:01 +02:00
atlante45
c9d707796e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 14:29:19 +02:00
atlante45
f0cf96353d Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 14:28:52 +02:00
atlante45
3c4f8f5120 put hard coded numbers into variables for UI job 2013-07-09 14:17:42 +02:00
atlante45
5d4d0ba43e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 12:56:27 +02:00
atlante45
4dda71e830 Final code for minecraft import to review 2013-07-09 12:41:44 +02:00
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00