Commit graph

344 commits

Author SHA1 Message Date
Sam Gateau
edf0ca2b06 Forbifd the global ambient lighting to go the simple global value and instead fallback to the first Spherical harmonics preset 2015-03-31 10:29:03 -07:00
Seth Alves
a47ae9212b quiet compiler 2015-03-28 17:13:31 -07:00
Sam Gateau
69667fb5ca making the state work 2015-03-23 10:21:35 -07:00
Sam Gateau
07bcd115c2 trying to remove useless glsl code for Legacy path 2015-03-20 13:28:42 -07:00
Sam Gateau
0bd78be7f4 Transition model shaders to gpu:Shader 2015-03-18 15:57:01 -07:00
Sam Gateau
5a40fcee17 set the defines for GPU profile correctly AGAIN 2015-03-17 16:51:59 -07:00
Sam Gateau
03da3aeab4 Clean up on the GPU Profile defines in order to control features 2015-03-17 16:15:10 -07:00
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -07:00
Ryan Huffman
dc2b670fa8 Remove extraneous comments 2015-02-26 14:46:05 -08:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Sam Gateau
23a54b17ce Clean up comments 2015-02-09 15:33:55 -08:00
Sam Gateau
48fca4c11d introducing PBR shading 2015-02-08 23:22:14 -08:00
Sam Gateau
1b22a3ef36 connecting the globalLight info to the DeferredLightingEffect 2015-02-05 17:30:57 -08:00
Sam Gateau
9b0036d010 adding Light and replace glLights also for the first deferred pass 2015-02-05 14:10:06 -08:00
Sam Gateau
00a9f55bc3 lightings seems to work correctly now 2015-02-05 10:20:19 -08:00
Sam Gateau
8e1eebbbd4 FInally getting the angular attenuation 2015-02-04 17:24:23 -08:00
Sam Gateau
c3e1311ed1 avoid recreating lights every frame, just have a pool of lights edited each frames 2015-01-30 17:03:28 -08:00
Sam Gateau
38129c2988 Merging with latest build 2015-01-30 12:58:50 -08:00
Sam Gateau
228e629856 working on the spot light now 2015-01-30 11:40:44 -08:00
Sam Gateau
b6836af071 improving on the poin light attenuatiion formula 2015-01-28 00:09:15 -08:00
Sam Gateau
ae3233b119 in the middle of something 2015-01-27 15:44:10 -08:00
ZappoMan
41c039f283 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-19 13:34:28 -08:00
Sam Gateau
6b55b4ff82 No more Magic numbers and fixing the code path for linux 2015-01-16 10:26:51 -08:00
Sam Gateau
8634d86167 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:43:21 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
Sam Gateau
7ae9635ce7 Refactoring the code from directional into DeferredLighting.slh 2015-01-15 15:27:18 -08:00
Sam Gateau
d759f4c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-15 11:54:55 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2015-01-14 17:55:03 -08:00
Sam Gateau
614e1aa6ae Cleaning the Model rendering path from any use of glMaterial 2015-01-14 16:44:44 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
Sam Gateau
4fb9e9c775 cleaning the code 2014-12-30 17:55:49 -08:00
Sam Gateau
37017d0c16 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
2014-12-22 13:34:18 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
ZappoMan
11b4400099 move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
ZappoMan
ef42203481 add wire cube implementation to GeometryCache and DeferredLightingEffect 2014-12-17 15:58:52 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-17 13:16:11 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
2014-12-16 15:02:37 -08:00
ZappoMan
1ed2c62bbf try this 2014-12-16 12:15:57 -08:00
ZappoMan
ec5c33fecc try this 2014-12-16 11:57:06 -08:00
ZappoMan
a9b3fdd3eb try this 2014-12-16 11:44:15 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -08:00
Renamed from interface/src/renderer/DeferredLightingEffect.cpp (Browse further)