Commit graph

71 commits

Author SHA1 Message Date
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader
Voxel Geometry Shader Experiment
2013-09-26 17:22:55 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
ZappoMan
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00
Andrzej Kapolka
0ae614fa7b Fix to load Ryan's alien model (handle per-vertex normals). 2013-09-25 17:55:22 -07:00
Andrzej Kapolka
9a16d44a47 Render the eye textures. 2013-09-25 13:47:03 -07:00
Andrzej Kapolka
4567b8afdf Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 11:40:16 -07:00
Andrzej Kapolka
2c7bb1a3d9 Slight fix: make sure we set isEye on each mesh. 2013-09-25 11:38:00 -07:00
Andrzej Kapolka
85ab9b7576 Use the texture coordinates when rendering the eyes. 2013-09-25 11:35:02 -07:00
Andrzej Kapolka
7ff5167bb7 Read in the texture coordinates, too. 2013-09-25 11:02:56 -07:00
Andrzej Kapolka
71ec6f75e5 Move the eyeball meshes according to the lookat direction (not really visible
yet since the eyeballs have no textures).
2013-09-24 18:57:37 -07:00
Andrzej Kapolka
452eb9be47 Extract the pivot points from the limb nodes, make sure we extract the vector
elements in the right order.
2013-09-24 16:50:38 -07:00
Andrzej Kapolka
4666c736d8 Remove unused variable. 2013-09-24 14:24:57 -07:00
Andrzej Kapolka
1b9444cb39 As a temporary hack, render the mesh with the most blendshapes with the head
color (other meshes white).
2013-09-24 14:22:01 -07:00
Andrzej Kapolka
fd41a075ed Added support for multiple blended meshes. 2013-09-24 13:53:19 -07:00
Andrzej Kapolka
ad69a9547f Remove the pose bits, at least for now. 2013-09-24 11:12:59 -07:00
Andrzej Kapolka
aa6eb7b3d8 Render the "other" meshes as separate, static, white. 2013-09-23 16:34:28 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
Andrzej Kapolka
9034eb1e72 Experimenting with the simplest method of including the other meshes. 2013-09-23 14:37:48 -07:00
Andrzej Kapolka
133ba3a00a Set normals based on indices, cache face models. 2013-09-20 17:40:15 -07:00
Andrzej Kapolka
9c2d851650 Fixed bug in decoding: newer versions of Qt streaming use whatever precision
the stream is set at for both floats and doubles.
2013-09-20 16:38:44 -07:00
Andrzej Kapolka
120f8f729c Find the mesh that corresponds to the blendshapes. 2013-09-20 15:28:08 -07:00
Andrzej Kapolka
77d9e21162 Meant to include this in the last commit. 2013-09-20 10:06:34 -07:00
Andrzej Kapolka
c049665090 Removed temporary comment. 2013-09-19 16:42:25 -07:00
Andrzej Kapolka
fff10375a9 Map the blendshapes by name. 2013-09-19 15:48:33 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Andrzej Kapolka
dfea69ab8f Basic FBX parser. 2013-09-18 16:26:35 -07:00
Andrzej Kapolka
ddf92b39c7 Fix for off-axis ambient occlusion. 2013-09-08 17:52:35 -07:00
atlante45
06119990e8 Fixed ui related files memory wastes 2013-09-03 14:47:50 -07:00
atlante45
7688dc4779 Fixed renderer related files memory wastes 2013-09-03 13:50:01 -07:00
Andrzej Kapolka
7da9556815 Glow when moving. 2013-08-22 11:23:28 -07:00
Andrzej Kapolka
165342bcc3 Have the local avatar glow when moving. 2013-08-22 10:35:21 -07:00
Andrzej Kapolka
d63bb3afaa Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
Andrzej Kapolka
571131d42e No glow effect on the avatar, fixed OS X warning. 2013-08-20 17:25:54 -07:00
Andrzej Kapolka
590672d035 Fewer texture lookups when diffusing. 2013-08-20 17:02:35 -07:00
Andrzej Kapolka
49da612a4e Turns out we do have to initialize the "odd frame" field. 2013-08-20 16:37:23 -07:00
Andrzej Kapolka
ecc6d41523 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-20 16:07:54 -07:00
Andrzej Kapolka
d5c66f6b67 Default to diffuse/add mode, fix for interacting with ambient occlusion.
Unfortunately, I managed to break the diffusion somehow.
2013-08-20 16:07:12 -07:00
Andrzej Kapolka
11be8c752b Cleanup. 2013-08-20 13:40:45 -07:00
Andrzej Kapolka
22598ceb4f Optimizations for occlusion blur (the main one being that we only need to
sample the texture four, not sixteen, times if we turn on linear filtering
and sample between the texels).
2013-08-20 11:52:43 -07:00
Andrzej Kapolka
7f4557fe1a Add blur scale uniform. 2013-08-20 10:50:25 -07:00
Andrzej Kapolka
e7dab88d69 Square vector lengths to bunch them up towards the center, add a minimum
length, include the URL of the SSAO tutorial.
2013-08-19 10:32:56 -07:00
Andrzej Kapolka
b41fa1e03c Basic ambient occlusion effect up and running; needs tweaking and
optimization.
2013-08-16 17:26:47 -07:00
Andrzej Kapolka
3ddab484e0 Beginnings of ambient occlusion. Looks like an architectural drawing. 2013-08-15 17:52:31 -07:00
Andrzej Kapolka
cceeb1c6ff Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-15 13:11:12 -07:00
Andrzej Kapolka
28d306a228 Remove the code here; will be replacing it based on glow effect work. 2013-08-15 13:10:48 -07:00
Andrzej Kapolka
3ad0b8b99d Merge branch 'master' of https://github.com/worklist/hifi into ssao
Conflicts:
	interface/src/Application.h
2013-08-15 10:06:22 -07:00
Andrzej Kapolka
ab9d414340 Doxygen comment fix. 2013-08-14 17:22:43 -07:00
Andrzej Kapolka
690e2c1965 Blur/add should be the default. 2013-08-14 16:58:04 -07:00
Andrzej Kapolka
7cd1360ba7 Doxygen-style comments. 2013-08-14 16:48:00 -07:00
Andrzej Kapolka
a9ccca3f72 Diffuse/add glow mode. 2013-08-14 16:13:30 -07:00