Commit graph

3830 commits

Author SHA1 Message Date
ZappoMan
8b18ee6844 renamed VoxelProjectedShadow class 2013-06-18 12:01:01 -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
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
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
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
Stephen Birarda
1ebd007f36 wrap things in brackets to correct percentage 2013-06-13 17:28:58 -06:00
Stephen Birarda
51b431aa81 Merge branch 'master' of github.com:worklist/hifi 2013-06-13 17:27:37 -06:00
Andrzej Kapolka
4b3ab2d8d5 Merge pull request #535 from PhilipRosedale/master
Everyone is now looking where they are mousing!  (myeyesareuphere.com)
2013-06-13 16:21:14 -07:00
Philip Rosedale
dd1df47c71 fixes per review 2013-06-13 16:20:28 -07:00
Stephen Birarda
be4c7fc085 fix audio-mixer sleep time calculation 2013-06-13 17:15:22 -06:00
Philip Rosedale
e6e147d86a Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 16:09:28 -07:00
Philip Rosedale
c72e3c930e Merge pull request #536 from ey6es/master
Use a bound texture for iris, added per-pixel specular highlight on it.
2013-06-13 16:08:30 -07:00
Stephen Birarda
fab53113e4 fix a divide by zero for audio-mixer stat sending 2013-06-13 17:07:25 -06:00
Andrzej Kapolka
e401663459 Added per-pixel specular highlight to irises. 2013-06-13 15:58:49 -07:00
Stephen Birarda
a141e3dc5d resolve conflicts on merge with upstream master 2013-06-13 16:31:40 -06:00
Philip Rosedale
04736fefb5 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 15:04:41 -07:00
Philip Rosedale
f6e6ceddfe Head camera scaling always one if gyros off so that mouse look works. 2013-06-13 14:53:10 -07:00
Andrzej Kapolka
466c062bc1 Use a bound texture for the iris, load it with Qt rather than lodepng (we can
probably just remove the lodepng dependency).
2013-06-13 14:41:06 -07:00
Philip Rosedale
1556886a64 fixing reversed lookat, rendering for all avatars 2013-06-13 14:33:09 -07:00
Philip Rosedale
8af0da754f we are always looking at something 2013-06-13 14:21:14 -07:00
ZappoMan
7fb4ed276f removed some debugging code 2013-06-13 14:10:53 -07:00
Philip Rosedale
687966c486 Other people's avatar's look where they are mousing 2013-06-13 14:04:51 -07:00
Philip Rosedale
e32f9f387a Basic random eye movements added, and fixation on camera in mirror mode. 2013-06-13 13:50:56 -07:00