Clément Brisset
|
5192796851
|
Merge pull request #5168 from samcake/daft
Improving the rendering job architecture
|
2015-06-19 18:00:39 +02:00 |
|
Atlante45
|
9c7f24eeb6
|
Add culled option for simple programs
|
2015-06-19 16:50:38 +02:00 |
|
Sam Gateau
|
9be87758fd
|
Improving the design of the Jobs and varying
|
2015-06-16 15:00:47 +02:00 |
|
samcake
|
5e351c0328
|
FIxing the transparent rendering on Mac
|
2015-06-08 18:36:12 +02:00 |
|
Sam Gateau
|
8d3a3221b0
|
shuffling the rendering steps to get to render transparent and light it correctly
|
2015-06-06 09:50:56 -07:00 |
|
Atlante45
|
51570aac68
|
Add simple textured pipeline
|
2015-05-29 16:49:31 +02:00 |
|
Clément Brisset
|
e980859059
|
Simple Program uses gpu API
|
2015-05-22 16:14:32 +01:00 |
|
Atlante45
|
5d2187cedf
|
Remove non batch call to bind/releaseSimpleProgram
|
2015-05-22 16:37:02 +02:00 |
|
Atlante45
|
ee264368c0
|
Add renderQuad to DeferredLighting
|
2015-05-20 16:45:21 +02:00 |
|
Atlante45
|
a7ee10001a
|
Remove used deprecated methods
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
|
2015-05-18 16:37:28 +02:00 |
|
Atlante45
|
b8fffdb2ef
|
bind/releaseSimpleProgram takes Batch
|
2015-05-16 04:26:57 +02:00 |
|
Ryan Huffman
|
5abd4bb08e
|
Update GeometryCache to accept gpu::Batch
|
2015-05-15 15:20:50 -07:00 |
|
Seth Alves
|
38caed00ca
|
Attempt to draw line entity item
|
2015-05-12 10:25:50 -07:00 |
|
Sam Gateau
|
5a11143a5d
|
Using the skybox cubemap for ambient lighting
|
2015-05-09 11:40:46 -07:00 |
|
Stephen Birarda
|
94739cf8d3
|
move number constants out of SharedUtil to NumericalConstants
|
2015-05-01 10:26:53 -07:00 |
|
Sam Gateau
|
b5b146b81b
|
Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution
Expose these to javascript
|
2015-04-16 17:35:37 -07:00 |
|
Sam Gateau
|
69667fb5ca
|
making the state work
|
2015-03-23 10:21:35 -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 |
|
ZappoMan
|
5c3c94a618
|
remove metavoxels
|
2015-03-02 17:21:43 -08:00 |
|
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 |
|