Commit graph

4054 commits

Author SHA1 Message Date
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4
Case 20134: Grid Entities
2019-01-02 09:12:34 -08:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3
Case 20080: v3 + v4 procedurals and misc shader fixes
2018-12-28 15:17:50 -08:00
SamGondelman
87947a7165 try to fix grid color issue 2018-12-25 02:17:37 -05:00
SamGondelman
a25c9395b3 glsl initializer lists are 4.2 2018-12-25 00:46:42 -05:00
SamGondelman
835615fbbd separate out v3 and v4 2018-12-20 16:33:13 -08:00
SamGondelman
9fc7813e24 Merge remote-tracking branch 'upstream/master' into v3 2018-12-20 16:05:06 -08:00
SamGondelman
bb030660bd Merge remote-tracking branch 'upstream/master' into NOverlays4 2018-12-20 13:26:23 -08:00
sam gateau
7e1f75e0f3 Fixing the debug of shadow frustum for real 2018-12-20 13:16:41 -08:00
sam gateau
21577ba311 fixing warnings and the debug of shadows 2018-12-20 09:27:15 -08:00
Sam Gateau
80a55e2ae9 Compiling 2018-12-19 20:01:14 -08:00
sam gateau
253a71a20c updating some code and probably broken in this version 2018-12-19 18:22:01 -08:00
SamGondelman
bf704c2d0d remove gl_DepthRange 2018-12-19 16:21:12 -08:00
sam gateau
9c436bc28c Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-19 09:31:41 -08:00
sam gateau
b8d96d98b8 fixing warnings from the build 2018-12-18 16:25:24 -08:00
sam gateau
5b50b0332d more fixes 2018-12-18 15:30:45 -08:00
sam gateau
2f18555ee0 removing comments and dead code, rewiring the debug 2018-12-18 14:42:45 -08:00
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
Sam Gateau
318bf20ede Shadow is working correctly in both pipelines 2018-12-17 00:27:07 -08:00
Angus Antley
77fa4e7d13 took out the unnecessary hfm.jointindex code 2018-12-16 17:29:16 -08:00
sam gateau
a4b9ec50e9 one step closer 2018-12-14 17:00:58 -08:00
Sam Gateau
0b03012e5e introducing the Shadow Stage 2018-12-14 06:55:34 -08:00
Sam Gateau
e07bc208f3 introducing the Shadow Stage 2018-12-14 00:58:07 -08:00
sam gateau
8bfca612e3 Separating the state view dependant from the shadow to be able to have several versions in flight 2018-12-13 17:56:14 -08:00
Sam Gateau
7f193d0e7c WEll it sn not going to be that simple.... 2018-12-13 00:32:59 -08:00
Sam Gateau
b09d0b10e9 cleaning light clusters 2018-12-09 22:54:49 -08:00
Sam Gateau
653370e284 Assemble lighting stage works 2018-12-09 11:39:35 -08:00
Sam Gateau
79cad36c58 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-08 19:14:21 -08:00
sam gateau
28d36c81e0 there and back , trying to converge with the new Assemble Lighting Stage task 2018-12-07 16:24:51 -08:00
SamGondelman
8431b3b0c1 correct order of mixes 2018-12-07 10:39:10 -08:00
Sam Gateau
50fcd7f40a trying... 2018-12-06 22:45:44 -08:00
Sam Gateau
b24a2d33bf Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-06 19:51:05 -08:00
sam gateau
e941833676 gathering the lighting stage jobs in their own task away from the renderer specificities 2018-12-06 17:27:13 -08:00
Sam Gondelman
50efb48a58
Update GeometryCache.cpp 2018-12-06 12:26:18 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4 2018-12-06 11:25:43 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals
Case 19798: 3D projected Material Entities and materialRepeat option
2018-12-06 11:13:46 -08:00
sam gateau
a267c3115a drafting more factorisation of render tasks 2018-12-05 17:47:33 -08:00
SamGondelman
9923e76968 cleanup 2018-12-05 17:18:26 -08:00
Sam Gondelman
df6fbefc31
Merge branch 'master' into v3 2018-12-05 16:51:33 -08:00
Adam Smith
653974ca30
Merge pull request #14293 from SamGondelman/branching
Case 19473: Reduce branching in our shaders
2018-12-05 16:42:42 -08:00
sam gateau
8efdec1e51 merging with master 2018-12-04 11:03:46 -08:00
sam gateau
0343983f31 Applying changes done in deferred to forward 2018-12-03 16:58:54 -08:00
Sam Gateau
259a97c43a Exploring varying with names 2018-12-02 23:41:57 -08:00
sam gateau
2c4cd68a00 iterating on a simpler engine graph 2018-11-30 17:43:27 -08:00
SamGondelman
2acb6b6857 v3 procedurals and shader fixes 2018-11-28 17:58:27 -08:00
Sam Gateau
ba4aec2aff Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf 2018-11-28 01:01:18 -08:00
Sam Gondelman
5ee803bf1d
Update parabola.slv 2018-11-27 10:54:56 -08:00
Sam Gondelman
3a4ec2cc27
Update glowLine.slv 2018-11-27 10:53:25 -08:00
sam gateau
f348cc35c4 separting debug in its own task 2018-11-26 15:20:45 -08:00
Sam Gateau
b7b8e8e6bf Trying to group together the debug jobs in a separate task 2018-11-26 00:38:04 -08:00
Sam Gateau
6b1c7bf96e restoring the engine render views and cleaning up the task / config section of the pr 2018-11-20 23:15:09 -08:00