Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 12:48:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 25 branches 0 tags 1.1 GiB
Commit graph

834 commits

Author SHA1 Message Date
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
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01: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
samcake
b66da1897d improving the forward rendering pass, removing the specular variation and making it defautl 2018-02-08 17:59:07 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -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
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
Seth Alves
1cbc2e31cf merge from upstream 2018-01-23 15:21:03 -08:00
Seth Alves
bce9b5f459 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0 trying to now show overlays in mirrors 2018-01-19 09:53:41 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Seth Alves
31c007d167 more backwards logic, added withViewVisibilityMask call in ItemKey 2018-01-18 14:15:30 -08:00
Olivier Prat
902bfac380 Merged with master 2018-01-18 18:31:04 +01:00
Seth Alves
97a4f141eb fix link trouble 2018-01-18 08:12:14 -08:00
Sam Gateau
7a9740d258 visible-perview 2018-01-18 02:18:46 -08:00
SamGondelman
a44c965f56 fix black flashing on transparent objects 2018-01-17 15:59:07 -08:00
samcake
51ed878683 Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview 2018-01-17 09:32:03 -08:00
Olivier Prat
e6caa83d73 Merged with master 2018-01-17 16:35:31 +01:00
Olivier Prat
efa6a8c0b5 Merged with master 2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17 Fixed compilation with new shader system 2018-01-17 10:52:58 +01:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Olivier Prat
3911ce59cc Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code 2018-01-16 19:02:12 +01:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Olivier Prat
54eab1c878 First working local lights on transparent objects 2018-01-15 17:49:55 +01:00
Sam Gateau
d6e771f01d Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid 2018-01-13 10:02:53 -08:00
samcake
836b69ab1b exposing several visibility flags 2018-01-12 17:42:18 -08:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
SamGondelman
a9d5dda976 always push default haze to current frame 2018-01-04 17:54:23 -08:00
Nissim Hadar
409eade006 Merge branch 'master' into hazeOnTransparent 2017-12-14 11:41:53 -08:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm 
Cascaded Shadow Maps and bug fix
 2017-12-14 00:32:43 +07:00
samcake
63fb9b5503 fix float literal syntax 2017-12-11 09:30:31 -08:00
Olivier Prat
a679dc6705 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-11 08:48:48 +01:00
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Olivier Prat
92e1fe8e5c Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug 2017-12-08 18:02:27 +01:00
samcake
6148458aeb Workable state, need final clean up and testing 2017-12-07 16:04:08 -08:00
samcake
5f85e8e2cb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 08:48:12 -08:00
Bradley Austin Davis
2a91e98813 Fix iterator names 2017-12-06 14:26:07 -08:00
Brad Davis
e626ca3ccd Working on scene threading optimizations 2017-12-06 14:26:07 -08:00
Olivier Prat
0b6dcb2717 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-05 09:18:26 +01:00
samcake
1514cdfb2f extend the set of interface for multi highlight 2017-11-21 17:59:45 -08:00
samcake
a74372b233 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-20 09:26:29 -08:00
Brad Hefta-Gaub
33d35bbe14
Merge pull request #11770 from AndrewMeadows/sort-and-throttle 
sort and throttle UpdateRenderables work... when necessary
 2017-11-19 11:09:08 -08:00
samcake
e0740b323d keep debuging the seelction highlight 2017-11-17 18:11:18 -08:00
Olivier Prat
d98dfff0a8 Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage) 2017-11-17 19:25:21 +01:00
Olivier Prat
f8c241c429 Merged disappearing shadow bug fix from pcf branch 2017-11-16 12:19:19 +01:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom 
Bloom
 2017-11-15 15:11:31 -08:00
Olivier Prat
e4818f1b4f Merged request changes from shadow 2017-11-15 17:51:06 +01:00
Olivier Prat
f47a3e7d2c Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake 2017-11-15 09:42:57 +01:00
Andrew Meadows
5050a554a2 remove warning about signed/unsigned comparison 2017-11-14 15:57:17 -08:00
Olivier Prat
5102c8e1b1 Merged with master 2017-11-14 21:56:00 +01:00
Olivier Prat
7515c341ad Merged with PCF fix with dithered filtering 2017-11-13 14:47:35 +01:00
Olivier Prat
dd6b7b04c2 Merged with master 2017-11-13 14:33:59 +01:00
Olivier Prat
fa58cf2e60 Merged with master 2017-11-13 14:07:48 +01:00
Olivier Prat
103e036b70 Shadow maps rendered in cascades 2017-11-10 18:30:37 +01:00
Olivier Prat
4f7ed38e98 Fixed potential link errors on Mac 2017-11-09 11:26:08 +01:00