overte-HifiExperiments/interface/src/renderer
Andrew Meadows 47e340dafe Merge upstream/master
Conflicts:
	interface/src/avatar/MyAvatar.cpp
2014-03-07 09:16:33 -08:00
..
AmbientOcclusionEffect.cpp make headers coding standard compliant 2014-03-06 16:24:58 -08:00
AmbientOcclusionEffect.h make sure InterfaceConfig is included before Qt headers 2014-03-06 16:14:18 -08:00
FBXReader.cpp Further joint bits. 2014-03-06 19:30:24 -08:00
FBXReader.h Further joint bits. 2014-03-06 19:30:24 -08:00
GeometryCache.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
GeometryCache.h Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
GlowEffect.cpp cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
GlowEffect.h This should fix the erroneous persistence on startup. 2013-12-09 11:21:32 -08:00
Model.cpp Merge upstream/master 2014-03-07 09:16:33 -08:00
Model.h Merge upstream/master 2014-03-07 09:16:33 -08:00
PointShader.cpp cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
PointShader.h fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel 2013-11-03 11:10:00 -08:00
ProgramObject.cpp Now that we have a Qt context, we can use their shader classes. However, we 2013-05-15 13:27:37 -07:00
ProgramObject.h Now that we have a Qt context, we can use their shader classes. However, we 2013-05-15 13:27:37 -07:00
RenderUtil.cpp Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
RenderUtil.h Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
TextureCache.cpp resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
TextureCache.h Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
VoxelShader.cpp cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
VoxelShader.h rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00