SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -08:00
Anthony J. Thibault
f5fcaae283
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
2018-02-26 10:55:44 -08:00
Anthony J. Thibault
86351f19a9
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
2018-02-22 08:44:21 -08:00
Nissim Hadar
b2a06cdb98
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
Nissim Hadar
6a9bbaf0a5
WIP - clean-up.
2018-02-19 12:00:30 -08:00
Nissim Hadar
81c9e449e6
Models casting shadows (again). (Something stupid happened...)
2018-02-18 10:19:17 -08:00
Nissim Hadar
dc3b03c9bc
Added shadows to shapes - still sucks...
2018-02-16 18:37:47 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
samcake
6357f36a97
Fixing names
2018-02-14 10:39:14 -08:00
samcake
1d3ae1b187
Work in progress to get the render items beeing tagged correctly for groupCulled
2018-02-13 17:50:01 -08:00
Anthony J. Thibault
d2c199104e
Avatars use Dual Quaternion Skinning and Model Entities do not.
2018-02-13 17:47:49 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
samcake
a98f55298b
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2018-02-13 13:06:58 -08:00
samcake
f64e5f2444
Introducing the cull group
2018-02-13 13:06:26 -08:00
Clément Brisset
593113c102
Merge pull request #12387 from Atlante45/new-master
...
Merge stable back into master
2018-02-13 12:59:59 -08:00
Andrew Meadows
f1495d27f6
try task link dependency rather than include
2018-02-13 08:58:24 -08:00
Andrew Meadows
cfb64ad693
add LoggingCategory data member to JobContext
2018-02-13 08:57:20 -08:00
Andrew Meadows
8231a56b22
pull task out of render and into its own lib
2018-02-13 08:56:11 -08:00
Atlante45
94973fa1d0
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-02-12 15:21:01 -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
samcake
bc51f3643d
Adding a check for item existence before calling the update on the render::Item
2018-02-12 10:21:50 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
Olivier Prat
179aca2bf9
Shadow task now uses LOD culling from main view task
2018-02-06 11:47:39 +01:00
Olivier Prat
92279b5939
Merged with master
2018-02-05 18:24:05 +01:00
Olivier Prat
2940a67b3e
Merged with master
2018-02-03 16:55:25 +01:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08: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
Olivier Prat
8a011036ef
Removed warnings on mac and ubuntu
2018-02-02 18:07:35 +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
3804917cf4
Orthographic octree selection seems to be working
2018-02-02 09:40:57 +01:00
Seth Alves
96b6e85745
formatting
2018-01-31 12:24: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
samcake
062bfbd7b6
Merging with master
2018-01-30 18:33:34 -08:00
samcake
f044cf76d6
add the count of compilations of shaders to avoid recompiling them if ot needed
2018-01-30 18:31:30 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
samcake
2dcedf9f39
cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation
2018-01-30 12:52:05 -08:00
Anthony Thibault
1e8a5485c1
8x shader compilation optimization and watchdog disable
...
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary. This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.
Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the watchdog thread during
rendering pipeline setup.
2018-01-30 10:27:06 -08:00
Olivier Prat
5e6300ce46
Merged with master
2018-01-30 09:52:30 +01: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
samcake
8dfa3aace3
cleaning en route
2018-01-26 17:34:37 -08:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-25 18:33:37 -08:00
samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
Brad Davis
bde5282541
Fix loading of the render config JSON
2018-01-25 12:43:49 -08:00
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08:00
