14 commits

Author	SHA1	Message	Date
Andrzej Kapolka	d09700adde	Merge branch 'master' of https://github.com/worklist/hifi into voxeltars ... Conflicts: interface/src/Avatar.cpp interface/src/Avatar.h interface/src/Skeleton.h interface/src/VoxelSystem.h	2013-06-04 11:00:59 -07:00
Andrzej Kapolka	26b7976489	Merge branch 'master' of https://github.com/worklist/hifi into voxeltars	2013-06-03 09:49:50 -07:00
Jeffrey Ventrella	cf67f28b57	merge	2013-06-03 08:10:41 -07:00
Andrzej Kapolka	6c975f9c6f	More work on avatar voxels.	2013-06-01 15:06:29 -07:00
Geenz	de76851207	Remove unnecessary normalize.	2013-05-31 20:35:26 -04:00
Geenz	d98b28d4ab	So apparently, this was a scale problem the entire time.	2013-05-31 20:30:42 -04:00
Geenz	1eac57dd0c	#19351 - Atmosphere shaders should be handled per-pixel instead of per-vertex.	2013-05-30 15:02:11 -04:00
Andrzej Kapolka	86ddcea87f	Better names for the shaders.	2013-05-16 13:08:21 -07:00
Andrzej Kapolka	0a6b4702c6	Experimenting with simple Perlin noise shader for voxels.	2013-05-15 22:18:56 -07:00
Andrzej Kapolka	f0055bd419	Fixes for OS X: GLSL version must be first line in source, don't init glut ... (Qt apparently uses it?)	2013-05-15 16:19:42 -07:00
Andrzej Kapolka	5138f62aef	Use the "proper" alpha value (i.e., the one from the original shader). This ... makes the sky somewhat darker, but that probably just means we need more scattering or a brighter sun.	2013-05-08 11:50:59 -07:00
Andrzej Kapolka	82f16e7f34	Include the "sky from space" shaders, too, and use them when the camera is ... outside the atmosphere's outer radius.	2013-05-08 11:42:31 -07:00
Andrzej Kapolka	4567c31a26	Added licensing information from the GPU Gems site, fixed spacing.	2013-05-08 09:55:46 -07:00
Andrzej Kapolka	7faa9e4318	More work on atmosphere rendering; rendering now working.	2013-05-07 12:40:15 -07:00