3433 commits

Author	SHA1	Message	Date
Freddy	462d0b90c1	Merge branch 'master' of https://github.com/worklist/hifi	2013-09-26 17:26:59 -07:00
Philip Rosedale	0fbabe9891	Merge pull request #984 from ZappoMan/voxel_geo_shader ... Voxel Geometry Shader Experiment	2013-09-26 17:22:55 -07:00
Freddy	e74950db24	Merge branch 'master' of https://github.com/worklist/hifi	2013-09-26 17:07:41 -07:00
ZappoMan	3ab92a592a	fix comments in shaders	2013-09-26 17:05:04 -07:00
ZappoMan	07515d1c5f	fix projection between shaders	2013-09-26 17:03:50 -07:00
ZappoMan	c0bfdfbc4f	fix comment	2013-09-26 16:54:20 -07:00
ZappoMan	3f8e55da28	style cleanup	2013-09-26 16:46:34 -07:00
ZappoMan	57b30c13d8	style cleanup	2013-09-26 16:45:09 -07:00
ZappoMan	864c00c6e0	removed some dead code	2013-09-26 16:38:29 -07:00
ZappoMan	5695429a78	style fixes	2013-09-26 16:36:59 -07:00
ZappoMan	fd0cc3b417	style fixes	2013-09-26 16:33:37 -07:00
ZappoMan	7845340279	menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader	2013-09-26 16:26:49 -07:00
Freddy	ddcec39f04	Merge branch 'master' of https://github.com/worklist/hifi	2013-09-26 15:58:06 -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	4dec183262	Enlarge heads when they're moused over.	2013-09-26 12:07:13 -07:00
Andrzej Kapolka	3ccf276137	Merge branch 'master' of https://github.com/worklist/hifi into grower	2013-09-25 18:06:27 -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	63efeccb13	Renaming for clarity.	2013-09-25 17:38:37 -07:00
Freddy	b4fa1dc7c2	Merge remote-tracking branch 'upstream/master'	2013-09-25 16:49:04 -07:00
Freddy	1dbc8459f8	adding measured angular velocity to faceshift	2013-09-25 16:46:26 -07:00
Andrzej Kapolka	736dae0c81	Use shaders for eyes (like the ones for the iris).	2013-09-25 15:26:29 -07:00
Andrzej Kapolka	7d14aaeea4	Merge branch 'master' of https://github.com/worklist/hifi into blendface	2013-09-25 14:39:43 -07:00
Andrzej Kapolka	6e8df9584e	Faceshift starts reporting failure to track under load, so determine active ... state based on the amount of time elapsed since last successful tracking data received.	2013-09-25 14:37:53 -07:00
Andrzej Kapolka	402f65fc00	Use the blend face eye locations for the eye vectors, when possible.	2013-09-25 14:12:50 -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	b44e962ac7	Merge branch 'master' of https://github.com/worklist/hifi into blendface	2013-09-24 14:30:57 -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
Freddy	6bbe34a8c4	missing space	2013-09-23 23:06:32 -07:00
Freddy	36104d0b06	remove unused older voxel grab thrust	2013-09-23 23:04:27 -07:00
Freddy	027811e37c	Increase thrust while holding keys down to allow very fast speeds	2013-09-23 22:53:35 -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	255e5179ae	Let's actually use the variable we initialized.	2013-09-23 13:02:00 -07:00
Andrzej Kapolka	1a55c64299	Scale the normal contributions down. For some reason, their magnitudes are ... higher than one would expect.	2013-09-23 12:42:58 -07:00
Andrzej Kapolka	807f6aaf14	Temporarily render the normals for debugging.	2013-09-23 12:20:19 -07:00
Andrzej Kapolka	c7bb523fc5	Apply the skin color to the blend face.	2013-09-23 12:15:02 -07:00
Andrzej Kapolka	1893fdba29	Revert "Trying a different method of updating the normals." ... This reverts commit 8e2be380f6.	2013-09-23 11:47:59 -07:00
Andrzej Kapolka	8e2be380f6	Trying a different method of updating the normals.	2013-09-23 11:17:12 -07:00
Andrzej Kapolka	0fa2eca02d	Remove option to use Faceshift rig (using the "macaw" model has much the same ... result, and it lets other people see it).	2013-09-23 10:43:20 -07:00