Sam Gateau
|
dc10f30d3d
|
Merged
|
2015-07-23 15:10:42 -07:00 |
|
Sam Gateau
|
a561874ce3
|
Render the rear view mirror in a separate target and then display it during overlay pass
|
2015-07-23 14:56:14 -07:00 |
|
samcake
|
805e7326e0
|
Merge pull request #5396 from ZappoMan/deadCodeRemoval
remove non-batch versions of GeometryCache renderXYZ() methods
|
2015-07-23 11:11:35 -07:00 |
|
Bradley Austin Davis
|
f19800f0de
|
Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO
|
2015-07-23 12:37:58 -04:00 |
|
ZappoMan
|
c2113ea96b
|
remove non-batch versions of GeometryCache renderXYZ() methods
|
2015-07-23 07:42:58 -07:00 |
|
Bradley Austin Davis
|
9596452c32
|
Trying to fix oculus rendering
|
2015-07-22 08:07:44 -04:00 |
|
Bradley Austin Davis
|
fda1cb6f7b
|
Merge remote-tracking branch 'upstream/master' into marge
|
2015-07-21 08:59:29 -07:00 |
|
Brad Davis
|
c3a2b72c13
|
Breaking framebuffer ops out of texture cache
|
2015-07-20 17:26:26 -07:00 |
|
Atlante45
|
59acfc9f47
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 13:51:51 -07:00 |
|
Brad Davis
|
d68618e206
|
Removing GL headers from most files, and some naked GL from application.cpp
|
2015-07-18 00:46:09 -07:00 |
|
Atlante45
|
052c3c987b
|
Fix some more smart pointer
|
2015-07-17 18:10:34 -07:00 |
|
Atlante45
|
256c786e28
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-17 17:59:19 -07:00 |
|
samcake
|
de7aed1abc
|
Merge pull request #5338 from ZappoMan/removeGlowEffect
Remove the glow effect.
|
2015-07-15 14:50:15 -07:00 |
|
ZappoMan
|
c17794849d
|
more GlowEctomy
|
2015-07-15 12:58:15 -07:00 |
|
samcake
|
9df26c8488
|
removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs
|
2015-07-15 00:24:43 -07:00 |
|
Sam Gateau
|
5555ccd225
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2015-07-13 16:19:09 -07:00 |
|
Sam Gateau
|
4743bbad80
|
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
|
2015-07-13 16:18:39 -07:00 |
|
Clément Brisset
|
24eb4c8263
|
Merge pull request #5309 from sethalves/quiet-compiler
quiet compiler
|
2015-07-13 15:55:35 -07:00 |
|
Seth Alves
|
c17c9f1818
|
quiet compiler
|
2015-07-12 10:29:43 -07:00 |
|
Atlante45
|
80fe090a94
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-10 20:20:03 -07:00 |
|
Sam Gateau
|
2c05349b06
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-10 11:10:07 -07:00 |
|
Sam Gateau
|
7fc9fd97ff
|
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
|
2015-07-10 11:03:12 -07:00 |
|
Sam Gateau
|
11f2d74030
|
Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect
|
2015-07-09 17:33:25 -07:00 |
|
samcake
|
1f13106f51
|
FIxed the issue on mac due to the abs function not correctly executing
|
2015-07-09 15:05:03 -07:00 |
|
Sam Gateau
|
110b009aa4
|
Less magic in this world
|
2015-07-09 09:55:25 -07:00 |
|
Sam Gateau
|
8f4a108441
|
Dead code and disable debug info
|
2015-07-09 09:37:35 -07:00 |
|
Sam Gateau
|
fb37af3e04
|
Removing dead code
|
2015-07-09 09:25:07 -07:00 |
|
Sam Gateau
|
e901d5cad0
|
Uncommented a block left behind...
|
2015-07-09 09:21:53 -07:00 |
|
Sam Gateau
|
8314fe8c7f
|
FInally getting a nice spot light volume working for all angles
|
2015-07-09 03:45:19 -07:00 |
|
samcake
|
5557dc4da2
|
clean and release the new deferredLIghtingEffect
|
2015-07-07 10:00:05 -07:00 |
|
samcake
|
a2f6693bd7
|
getting the deferred lighting to work
|
2015-07-06 14:40:10 -07:00 |
|
Atlante45
|
0093403bba
|
Add depth bias option to simple programs
Simple programs are now lazily generated and stored in a hash
|
2015-07-04 18:33:03 -07:00 |
|
samcake
|
84b70fbaca
|
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
|
2015-07-03 11:36:19 -07:00 |
|
Atlante45
|
7b5a5a339a
|
Use make_shared/create to make shared pointers
|
2015-07-01 19:46:06 -07:00 |
|
samcake
|
1b69b38835
|
fix shader issue on mac
|
2015-06-27 06:34:58 -07:00 |
|
Atlante45
|
efd805bea7
|
Introduce new emissive simple program
Also fixes the shading on web entities using that program
|
2015-06-26 16:17:41 -07:00 |
|
Sam Gateau
|
c41ebcae78
|
Covering all the case for rendering the light passes
|
2015-06-26 15:40:08 -07:00 |
|
Sam Gateau
|
f7ca1f608f
|
Migrating the deferred lighting effect to Batch and in doing so, introducing the StandardShaderLib to gpu and the first 2 shaders
|
2015-06-22 14:06:14 +02:00 |
|
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 |
|
ZappoMan
|
1b8572640b
|
more hacking sams tweaks
|
2015-06-01 09:07:32 -07:00 |
|
Atlante45
|
51570aac68
|
Add simple textured pipeline
|
2015-05-29 16:49:31 +02:00 |
|
Atlante45
|
c9022212e8
|
More work on the text renderer
|
2015-05-26 20:34:23 +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 |
|