Commit graph

371 commits

Author SHA1 Message Date
Sam Gateau
bff372a118 Merge with master 2018-07-13 13:00:00 +02:00
Olivier Prat
703fc20856 Separate scale between 3D rendering and HUD 2018-07-11 12:17:36 +02:00
Sam Gateau
c231463fca Merge with master 2018-07-03 12:55:19 +02:00
Sam Gateau
0f3cb0fb84 INtroducing th eGraphics Engine to group al the graphics related (render and gpu) elements 2018-07-03 12:50:52 +02:00
Olivier Prat
de831ffea9 Switched shadow maps to sampler2DArrayShadow to try to fix on Mac 2018-06-29 16:55:33 +02:00
SamGondelman
97ee02811c disable shadows in secondary camera 2018-06-26 12:27:59 -07:00
Brad Davis
9c26b2c1d3 Use pooled gpu batches 2018-05-21 13:53:44 -07:00
samcake
179801dab6 FIxing the transparent ambient lighting bug 2018-05-15 17:22:28 -07:00
Sam Gateau
167db14bdb restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off 2018-04-11 00:00:11 -07:00
Olivier Prat
2d71d7da9f Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-27 09:11:43 +01:00
Nissim Hadar
6f84e4c977 Moved shadows and ambient occlusion to menu checkboxes. 2018-02-20 23:45:07 -08:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01:00
Nissim Hadar
a679b6f828 Fixed possible crash. 2018-02-14 18:55:04 -08:00
Nissim Hadar
34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
#	libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
2018-02-12 17:50:39 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
Misc bug fixes
2018-02-12 14:31:38 -08:00
NissimHadar
950a62f3f8 Global graphics flag default to on.
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
2018-02-08 15:52:20 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
Olivier Prat
5e6300ce46 Merged with master 2018-01-30 09:52:30 +01:00
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
Olivier Prat
e6caa83d73 Merged with master 2018-01-17 16:35:31 +01:00
Olivier Prat
efa6a8c0b5 Merged with master 2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17 Fixed compilation with new shader system 2018-01-17 10:52:58 +01:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Olivier Prat
3911ce59cc Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code 2018-01-16 19:02:12 +01:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
Olivier Prat
54eab1c878 First working local lights on transparent objects 2018-01-15 17:49:55 +01:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Nissim Hadar
c3f6faed00 Deal correctly with inheritance at top-most level. 2018-01-09 13:27:57 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
SamGondelman
a9d5dda976 always push default haze to current frame 2018-01-04 17:54:23 -08:00
Olivier Prat
92e1fe8e5c Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug 2017-12-08 18:02:27 +01:00
Olivier Prat
dc55a16834 Fixed warnings on Mac and Ubuntu 2017-12-06 18:37:27 +01:00
Olivier Prat
f8c241c429 Merged disappearing shadow bug fix from pcf branch 2017-11-16 12:19:19 +01:00
Olivier Prat
14275b1cf3 Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded 2017-11-15 15:42:04 +01:00
Olivier Prat
8f84e5fbed Added sampler array in shader to support future cascades 2017-11-10 15:39:26 +01:00
Olivier Prat
e0b36b800f Added Cascade subclass in LightStage Shadow 2017-11-10 14:55:49 +01:00
Olivier Prat
dc8c75f403 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-10-27 15:56:40 +02:00
Olivier Prat
9eed69d7ef Trying to pin point a zone bug 2017-10-26 15:11:42 +02:00
Nissim Hadar
bfab466827 Bug 8610. 2017-10-25 14:13:53 -07:00
Nissim Hadar
8d11ace1a6 Bug 8610. 2017-10-25 13:46:59 -07:00
Olivier Prat
a34db5f26d Shadows are now cast by the current zone key light (sun) 2017-10-24 11:09:36 +02:00
Nissim
fe286aff83 Andrew's corrections (per coding standard). 2017-10-18 08:42:07 -07:00
Nissim Hadar
cdbf067a24 Rename (haze)getParametersBuffer to getHazeParametersBuffer.
Add corrections from Sam
2017-10-02 16:54:02 -07:00
Nissim Hadar
29d5e772d4 Removed "..Is.." from various methods. 2017-10-02 12:42:46 -07:00
Nissim Hadar
5a7fed022c Merging haze branch. 2017-09-30 00:04:28 -07:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Nissim Hadar
eaab056d66 Adding HazeStage 2017-09-27 09:12:57 -07:00