Commit graph

870 commits

Author SHA1 Message Date
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
sam gateau
85b3b883f9 REmove cruft 2018-09-27 11:11:14 -07:00
sam gateau
b5a47b2e76 Finalizing the renaming from Skinned to Deformed 2018-09-26 14:11:22 -07:00
sam gateau
e41b8f06e1 Cleaning up the pipeline and checking that it is working for all cases 2018-09-25 13:57:50 -07:00
Sam Gateau
69734ce21b Getting better' 2018-09-24 22:34:43 -07:00
Bradley Austin Davis
fade3a8de0 Fixing shader implicit type conversions 2018-09-06 09:08:36 -07:00
Brad Davis
9a28e04e37 Remove all tabs from shaders 2018-09-06 08:59:07 -07:00
Brad Davis
87b9594bd0 Fix warnings 2018-09-06 08:59:06 -07:00
Brad Davis
07fba89f0f Remove uniforms from item status 2018-09-06 08:59:06 -07:00
Brad Davis
719ae25adb Remove uniforms from drawCellBounds 2018-09-06 08:59:05 -07:00
Brad Davis
c8eb4da6b6 Remove simple draw task uniforms 2018-09-06 08:59:05 -07:00
sam gateau
194903692e clening up the code in LODmanager and the associated js/qml 2018-08-30 18:09:11 -07:00
Sam Gateau
63eb57c741 Exploring PID again 2018-08-28 08:58:25 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom
Enable bloom in zone properties
2018-08-24 14:46:31 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow
Fixing PR13731 shader error on Mac
2018-08-10 14:10:47 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
SamGondelman
bba806f78c merge with master, fix uniform slots, use varyings for sigma 2018-08-08 22:27:22 -07:00
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
SamGondelman
6ff0b9d417 fix debug tools 2018-08-07 15:25:56 -07:00
SamGondelman
a7dec8fb75 parabola and particle shader fixes 2018-08-06 15:49:52 -07:00
Olivier Prat
c56bb9a855 Small optimization by using squared distance and not distance in depth sort 2018-08-06 08:20:21 +02:00
Olivier Prat
92e64510ec Fixed draw frustum and draw aabb code 2018-08-04 15:58:24 +02:00
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
Olivier Prat
30600dff93 Non shadow casters now increase shadow scene bounds only in light direction 2018-07-31 15:23:27 +02: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