Commit graph

842 commits

Author SHA1 Message Date
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale
Render Scale Resolution applied only to 3D rendering not HUD
2018-07-12 10:56:03 -07:00
Olivier Prat
703fc20856 Separate scale between 3D rendering and HUD 2018-07-11 12:17:36 +02:00
Olivier Prat
6814c487ec Fixed slot collision between fade map and material texture table 2018-07-10 16:16:51 +02:00
Olivier Prat
50d16eca80 Added object fade parameters to shape pipeline locations 2018-07-10 12:26:51 +02:00
Olivier Prat
dfe51b57e8 Fade object params are now passed through uniform buffer 2018-07-10 10:53:38 +02:00
Sam
c1856a5e36 Make shadows work with one cascade 2018-07-02 10:46:53 +02:00
SamGondelman
8af1beca8d add isGroupCulled for model overlays 2018-06-04 12:07:57 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
samcake
457b77ca09 fixing static definition maybe 2018-05-30 13:37:32 -07:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
samcake
44a8d880fa Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 14:31:53 -07:00
Sam Gateau
13d02011f3 There and back again... 2018-05-24 00:53:29 -07:00
samcake
cf58f31f3e Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine' 2018-05-23 15:08:48 -07:00
samcake
b06356b0fd Remove deprecated and commented code 2018-05-23 11:58:25 -07:00
samcake
072d0f262c FIxing the problem of shadows not repecting the cull group 2018-05-21 18:07:04 -07:00
Sam Gateau
e1690a28e1 Merging with master 2018-05-20 23:04:11 -07:00
samcake
36a08fdd84 Friday night end of the day, last compilation.... almost 2018-05-18 17:41:28 -07:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00
samcake
179801dab6 FIxing the transparent ambient lighting bug 2018-05-15 17:22:28 -07:00
Olivier Prat
bed7752a1a Fixed bug with highlighting and TAA 2018-05-15 12:27:04 +02:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
2018-05-14 13:00:15 -07:00
samcake
02be965271 more stuff fixed 2018-05-10 18:10:01 -07:00
Sam Gateau
9b65e0771b Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-05 12:17:20 -07:00
samcake
6424b91e86 Templatizing the timeProfiler for the task 2018-05-04 17:58:21 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
samcake
6d251c4cd3 Bringing the work and refinment done in workload branch to master branch 2018-05-03 17:46:50 -07:00
Olivier Prat
440e2b8452 Merged with master 2018-04-20 08:13:25 +02:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Olivier Prat
89669b326b Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-17 09:24:35 +02:00
Simon Walton
adcf991125 Improvements to profiling data capture
Use code-provided task names for profile blocks; record QML URLs for
loadInternal.
2018-04-11 17:36:32 -07:00
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
Olivier Prat
2974e05cf2 Tweaked bloom intensity mix 2018-04-10 11:13:37 +02:00
Olivier Prat
573f399023 Fixed incorrect shadow frustum far clip computation due to not taking into account shadow receivers 2018-04-06 14:45:16 +02:00
Simon Walton
93bcd1df20 Fix Linux build for std::call_once with lambda
MacOS & Ubuntu don't like the combination of std::call_once and
lambda w/ reference param, for some reason. Change to pointer
param.
2018-04-04 17:55:45 -07:00
Simon Walton
d05f0600d4 Handle one-time messages outside LogHandler class
Also change to std::call_once for the file-scope message IDs.
2018-04-04 15:44:47 -07:00
Simon Walton
ed3347a89b Repeated logging - reviewer fixes 2018-04-04 14:11:10 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
samcake
2ee0af03c8 Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet 2018-03-28 16:17:55 -07:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
samcake
b8fb97c824 Resolving conflicts 2018-03-02 10:36:55 -08:00
samcake
a7542d5b90 fixing the shadow 2018-02-28 17:46:22 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
2018-02-27 11:33:05 -08:00
Olivier Prat
2d71d7da9f Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-27 09:11:43 +01:00