samcake
|
1d3ae1b187
|
Work in progress to get the render items beeing tagged correctly for groupCulled
|
2018-02-13 17:50:01 -08:00 |
|
Andrew Meadows
|
20c2a4470e
|
merge 'findByID' into 'workload-001'
|
2018-02-13 11:47:02 -08:00 |
|
Sam Gateau
|
040710807d
|
Merge pull request #12346 from Zvork/scripts
Fix transition (ex-fade) debugging scripts
|
2018-02-13 09:08:35 -08:00 |
|
Andrew Meadows
|
8231a56b22
|
pull task out of render and into its own lib
|
2018-02-13 08:56:11 -08:00 |
|
John Conklin II
|
51bf3c1466
|
Merge pull request #12323 from Zvork/shadow
Shadow performance / acnee improvements
|
2018-02-12 14:41:13 -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 |
|
samcake
|
e64c029424
|
fixing the scattering bad ambient lighting
|
2018-02-09 11:32:29 -08:00 |
|
Bradley Austin Davis
|
ae092f6c0b
|
Merge remote-tracking branch 'upstream/master' into fix/shader_length
|
2018-02-07 09:48:23 -08:00 |
|
NissimHadar
|
d01f9cd1fb
|
Fixing git crap.
|
2018-02-06 23:51:08 -08:00 |
|
Bradley Austin Davis
|
0455fb37b6
|
Merge remote-tracking branch 'upstream/master' into fix/shader_length
|
2018-02-06 15:55:01 -08:00 |
|
Olivier Prat
|
d248e1ed79
|
Merge branch 'master' of http://github.com/highfidelity/hifi into scripts
|
2018-02-06 18:00:38 +01:00 |
|
Olivier Prat
|
733d36df47
|
Fixed save / load of fade effect configurations
|
2018-02-06 17:57:04 +01:00 |
|
Olivier Prat
|
179aca2bf9
|
Shadow task now uses LOD culling from main view task
|
2018-02-06 11:47:39 +01:00 |
|
Andrew Meadows
|
96c97547f9
|
Merge pull request #12205 from jherico/no_widgets
Remove some unneeded Qt dependencies
|
2018-02-05 15:32:54 -08:00 |
|
Olivier Prat
|
92279b5939
|
Merged with master
|
2018-02-05 18:24:05 +01:00 |
|
Olivier Prat
|
445ffbd82f
|
Added tag bits to shadow octree query
|
2018-02-05 16:35:55 +01:00 |
|
Olivier Prat
|
2940a67b3e
|
Merged with master
|
2018-02-03 16:55:25 +01:00 |
|
John Conklin II
|
c8bb26ae74
|
Merge pull request #12294 from samcake/pastel
Improve startup time by optimizing shader bookkeeping
|
2018-02-02 16:37:44 -08:00 |
|
John Conklin II
|
9f4820df3b
|
Merge pull request #12255 from Zvork/trnormalmap
Normal map support on translucent objects
|
2018-02-02 14:19:50 -08:00 |
|
Atlante45
|
8ebb3e52d8
|
Misc bug fixes
|
2018-02-02 13:10:49 -08:00 |
|
Olivier Prat
|
03daba9bac
|
Removed duplicate shader include
|
2018-02-02 18:18:24 +01:00 |
|
Olivier Prat
|
8a011036ef
|
Removed warnings on mac and ubuntu
|
2018-02-02 18:07:35 +01:00 |
|
Seth Alves
|
861497e907
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-02 08:56:18 -08:00 |
|
Seth Alves
|
14d5029f4d
|
only update cauterization of child entities when something relevant changes
|
2018-02-02 08:56:11 -08:00 |
|
Olivier Prat
|
e9747e9d85
|
Small optimisations in shadow shader
|
2018-02-02 15:06:22 +01:00 |
|
Olivier Prat
|
ac92b3c130
|
Merge branch 'master' of http://github.com/highfidelity/hifi into scribe
|
2018-02-02 14:01:59 +01:00 |
|
Olivier Prat
|
234cb1e3e6
|
Added anti frustum test to remove lower cascade objects from higher shadow cascades
|
2018-02-02 12:15:43 +01:00 |
|
Olivier Prat
|
1f4671ba17
|
Cleaned up orthographic shadow culling functor
|
2018-02-02 11:09:28 +01:00 |
|
Olivier Prat
|
3804917cf4
|
Orthographic octree selection seems to be working
|
2018-02-02 09:40:57 +01:00 |
|
Olivier Prat
|
a44c5c9814
|
Merge branch 'master' of http://github.com/highfidelity/hifi into trnormalmap
|
2018-02-02 08:46:38 +01:00 |
|
Anthony J. Thibault
|
a1b67afabf
|
Fix for rigidly bound mesh not being properly cauterized.
For example, sometimes in first person view, you can see the back of your avatar's eyes or the brim of your avatar's hat.
|
2018-02-01 11:57:50 -08:00 |
|
Seth Alves
|
482be7ba4e
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-01 06:36:04 -08:00 |
|
Sam Gateau
|
351f619555
|
Fixing a shader error on android
|
2018-01-31 23:35:16 -08:00 |
|
samcake
|
582ef2a8a2
|
MErging with master
|
2018-01-31 11:00:23 -08:00 |
|
Seth Alves
|
64a46bf5df
|
merge from upstream
|
2018-01-31 10:43:41 -08:00 |
|
Olivier Prat
|
d422545c78
|
Changed shadow task to do a single octree query as well as pipeline/depth sort for all cascades. Still issue with disapearing objects from shadow map with viewpoint
|
2018-01-31 17:13:06 +01:00 |
|
Olivier Prat
|
3fa2babec2
|
Moved cascade frustum pre-computation to single ShadowSetup job
|
2018-01-31 11:55:46 +01:00 |
|
Olivier Prat
|
f344e44d26
|
Switched to a simpler manual fixed/slope based shadow bias system. Automatic stuff fail most of the time
|
2018-01-31 10:19:17 +01:00 |
|
Atlante45
|
bc819c698e
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
|
2018-01-30 16:09:30 -08:00 |
|
Olivier Prat
|
5e6300ce46
|
Merged with master
|
2018-01-30 09:52:30 +01:00 |
|
MiladNazeri
|
3585bead96
|
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
Leopoly_Phase1_004_RayPick-Changes
|
2018-01-29 14:02:38 -08:00 |
|
samcake
|
1fd4c5c1a4
|
Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information
|
2018-01-29 12:20:51 -08:00 |
|
John Conklin II
|
92b9290294
|
Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization
RC63: Bug fix for avatar neck cauterization
|
2018-01-29 10:52:10 -08:00 |
|
Olivier Prat
|
0324f41565
|
Trying to improve adaptive shadow bias
|
2018-01-29 17:23:35 +01:00 |
|
Olivier Prat
|
70a7ecc5f0
|
Fixed merge with remote trnormalmap
|
2018-01-29 10:50:17 +01:00 |
|
Olivier Prat
|
4cbfef55ef
|
Merged with master. Had to add back shaders and code
|
2018-01-29 10:33:16 +01:00 |
|
Brad Davis
|
0781d8eaf0
|
Remove some unneeded Qt dependencies
|
2018-01-28 22:18:24 -08:00 |
|
Sam Gateau
|
221475d7d9
|
FIxing the dark ambient lighting on scattering surface
|
2018-01-27 10:37:32 -08:00 |
|
Sam Gateau
|
3d9985fa67
|
FIx the scattering ambient lighting diffuse which was too dark (got divided by PI) comparedd to non scattering
|
2018-01-27 08:48:19 -08:00 |
|
samcake
|
8dfa3aace3
|
cleaning en route
|
2018-01-26 17:34:37 -08:00 |
|