Ryan Huffman
|
e42b708b56
|
Update deferredLightingEffect::add*Light methods
|
2015-02-26 11:03:47 -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
|
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
|
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
|
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 |
|
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 |
|
ZappoMan
|
e6388a65b9
|
rough pass at adding color to geometry cache
|
2015-01-13 20:53:05 -08:00 |
|
Atlante45
|
38729c5790
|
Made dependencies inherit from Dependency
|
2015-01-13 20:38:01 -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 |
|
Atlante45
|
990362b8ff
|
Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11
|
2014-12-18 14:18:21 -08:00 |
|
ZappoMan
|
11b4400099
|
move all glut-ness to geometry cache
|
2014-12-18 11:20:17 -08:00 |
|
Atlante45
|
ce7f72d2cd
|
Update macro
|
2014-12-17 15:26:47 -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
|
b2dac6f53f
|
DM users update
|
2014-12-16 15:32:11 -08:00 |
|
ZappoMan
|
fc1e1ecfc0
|
move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled
|
2014-12-16 11:27:44 -08:00 |
|