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
3848 commits 71 branches 56 tags 1.2 GiB
Commit graph

3848 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
01ae437343 Merge pull request #546 from ZappoMan/master 
Fix crash in voxel-server
 2013-06-18 12:26:18 -07:00
ZappoMan
9466e81590 fixed crash 2013-06-18 12:25:16 -07:00
ZappoMan
43b6683007 Merge pull request #545 from ZappoMan/master 
build buster
 2013-06-18 12:11:53 -07:00
ZappoMan
8c44ad19a1 fixed build buster 2013-06-18 12:10:59 -07:00
Philip Rosedale
726872d955 Merge pull request #543 from ZappoMan/occlusion_culling 
Occlusion culling
 2013-06-18 12:07:33 -07:00
ZappoMan
1fc3ad8011 CR feedback 2013-06-18 12:03:58 -07:00
ZappoMan
7922c3b625 fixed typo 2013-06-18 12:02:17 -07:00
ZappoMan
8b18ee6844 renamed VoxelProjectedShadow class 2013-06-18 12:01:01 -07:00
ZappoMan
1c8767268b Merge pull request #544 from birarda/twopole 
correct audio mixer frame time stat
 2013-06-18 11:07:10 -07:00
Stephen Birarda
b51d3e88d3 impossible for percentageOfMaxElapsed to be zero 2013-06-18 10:49:15 -07:00
Stephen Birarda
5918c492cc correct stat collection for mixer frame time usage 2013-06-18 10:46:45 -07:00
ZappoMan
87bbbbc7d8 Merge pull request #542 from birarda/twopole 
smarten up the TwoPole tick call
 2013-06-18 10:39:57 -07:00
ZappoMan
9a22db28a3 code cleanup 2013-06-18 10:35:32 -07:00
ZappoMan
00438f9d99 code cleanup 2013-06-18 10:28:14 -07:00
ZappoMan
a6b4bdba53 code cleanup 2013-06-18 10:25:58 -07:00
ZappoMan
46d7ada753 code cleanup 2013-06-18 10:21:47 -07:00
ZappoMan
8331fc1acb removed some old debug code 2013-06-18 10:19:49 -07:00
Stephen Birarda
667fa566d5 Merge remote-tracking branch 'upstream/master' into twopole 2013-06-18 09:55:56 -07:00
Stephen Birarda
2ba7fe0031 remove the unused timevals 2013-06-18 09:55:04 -07:00
Stephen Birarda
8cef77bbda remove the timing for twopole testing 2013-06-18 09:53:30 -07:00
ZappoMan
58c4010185 added CoverageMap and occlusion culling to server 2013-06-18 09:36:43 -07:00
ZappoMan
c8d4b2ebed added erase() and some other tweaks to CoverageMap 2013-06-18 09:35:13 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
Stephen Birarda
5acb0bd1a3 add timing for two pole effect 2013-06-18 09:22:43 -07:00
Stephen Birarda
edc1377692 perform the two-pole effect across 256 samples, not one per call 2013-06-18 09:19:35 -07:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
Andrzej Kapolka
dc3029b5a9 Merge pull request #540 from ZappoMan/encode_params 
Change encodeTreeBitstream() to use params class
 2013-06-14 17:25:57 -07:00
Andrzej Kapolka
d80e55a995 Merge pull request #541 from ey6es/master 
Fix for irises on OS X: compute and pass in the model space eye position as a uniform.
 2013-06-14 17:24:01 -07:00
Andrzej Kapolka
c11ab45474 It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing 
in the camera's position as transformed into model space.
 2013-06-14 17:21:35 -07:00
ZappoMan
17ea2d0d0d Merge pull request #539 from ey6es/master 
Better iris texture, fixed iris rotations.
 2013-06-14 16:53:47 -07:00
ZappoMan
e083c0c561 spacing 2013-06-14 16:48:36 -07:00
Andrzej Kapolka
790cdfb0bd Added refraction to irises. 2013-06-14 16:46:34 -07:00
ZappoMan
08e8455c95 migrate encodeTreeBitstream() to use params class 2013-06-14 16:45:27 -07:00
Andrzej Kapolka
7d1679dab7 Ryan's new iris texture. 2013-06-14 14:35:56 -07:00
Andrzej Kapolka
5241c41ddd Shed some light on what these shaders are doing, so to speak. 2013-06-14 11:29:32 -07:00
Andrzej Kapolka
ec0b1a99fb Fix iris orientations: start with the head orientation, then rotate onto the 
lookat vector.  This way, the irises don't rotate around as we yaw.
 2013-06-14 11:23:08 -07:00
Stephen Birarda
892167510a time TwoPole call for 256 samples 2013-06-14 12:15:12 -06:00
Stephen Birarda
593730682d add timing for TwoPole calls 2013-06-14 12:04:25 -06:00
Andrzej Kapolka
b4d4cfd994 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-14 10:31:10 -07:00
Andrzej Kapolka
4f9f2fa4ca Better iris texture. 2013-06-14 10:28:45 -07:00
Philip Rosedale
b637408b54 Merge pull request #538 from ZappoMan/localmode 
added local mode to audio-mixer
 2013-06-14 10:08:47 -07:00
Philip Rosedale
0cd3dd57e6 Merge pull request #525 from birarda/master 
add a low-pass filter and send audio-mixer stats to logstash
 2013-06-14 09:41:14 -07:00
ZappoMan
5d6a5a7377 Removed accidentally merged code 2013-06-14 09:22:14 -07:00
ZappoMan
985b8d66d2 Merge branch 'master' of https://github.com/worklist/hifi into localmode 2013-06-14 09:21:02 -07:00
ZappoMan
471c9a3dad added local mode 2013-06-14 09:18:01 -07:00
Stephen Birarda
90500a8990 send a packet with the exact number of bytes to logstash 2013-06-13 19:17:42 -06:00
Stephen Birarda
a267d5fe9f Merge branch 'master' of github.com:worklist/hifi 2013-06-13 18:31:37 -06:00
Andrzej Kapolka
ce9236e659 Merge pull request #537 from ey6es/master 
Ryan's new iris texture.
 2013-06-13 16:59:53 -07:00
Andrzej Kapolka
0f897340ee New iris texture from Ryan. 2013-06-13 16:42:31 -07:00
ZappoMan
620a4a8ad6 latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes 2013-06-13 16:37:14 -07:00