Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 07:39:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 72 branches 59 tags 1.2 GiB
Commit graph

3932 commits

Author SHA1 Message Date
Olivier Prat
18af60f3eb Added RingBuffer mechanism to gpu lib 2018-02-19 18:48:58 +01:00
Olivier Prat
9cfe53be3e Merged from orgin taa 2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01:00
David Rowe
67cfe783be Entity properties JSDoc 2018-02-19 12:17:31 +13:00
Nissim Hadar
7ba8a9935a No extraneous shadows. 2018-02-16 19:23:31 -08:00
Nissim Hadar
a2cc78b200 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-16 14:01:57 -08:00
Nissim Hadar
4c1f22f84e Models and Avatar cast shadows (box doesn't, yet). 2018-02-16 14:01:33 -08:00
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Nissim Hadar
df7a8389b3 Fixed possible crash. 2018-02-15 11:51:06 -08:00
samcake
b21b98c810 Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work 2018-02-15 11:24:20 -08:00
Nissim Hadar
26e7a85a95 Fixed possible crash. 2018-02-14 21:15:29 -08:00
Nissim Hadar
a679b6f828 Fixed possible crash. 2018-02-14 18:55:04 -08:00
samcake
246ac25d0a Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight 2018-02-14 17:36:46 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
samcake
6357f36a97 Fixing names 2018-02-14 10:39:14 -08:00
Nissim Hadar
1632ab9782 Changed flag to "cast shadow" instead of "don't cast shadow". 2018-02-13 18:27:36 -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
Nissim Hadar
23a29b8d4b Added don't castr shadow flag to entity and shape classes. 2018-02-13 16:16:04 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
Andrew Meadows
20c2a4470e merge 'findByID' into 'workload-001' 2018-02-13 11:47:02 -08:00
Anthony J. Thibault
7f5f48bca9 Models can now switch between dual quats and matrix palette skinning. 
but not dynamically, because we still only compile one version of the shader.
 2018-02-13 11:37:14 -08:00
Gabriel Calero
99f6c80b2a Temporary remove ToneMappingDeferred 2018-02-13 10:00:31 -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
Anthony J. Thibault
cf5452313a WIP check in of making the use of dq or mat dynamic per model 2018-02-12 18:44:24 -08:00
Nissim Hadar
34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
 2018-02-12 17:50:39 -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
Nissim Hadar
4acd0a34f5 Seems OK. Before adding flag to entity. 2018-02-12 12:55:14 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
samcake
522c577e73 FIxing the bad ambient lighting on scattering surfaces 2018-02-09 14:08:55 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
samcake
e64c029424 fixing the scattering bad ambient lighting 2018-02-09 11:32:29 -08:00
NissimHadar
7ee5245aeb Added shadow caster flag to filter. 2018-02-09 10:45:29 -08:00
samcake
4419dfe622 Addressing review comments 2018-02-09 10:02:16 -08:00
humbletim
a08770c816 cleanup 2018-02-09 02:29:20 -05:00
Sam Gateau
0e25b7bd35 Fixing the normal map computation 2018-02-08 23:27:12 -08:00
Sam Gateau
f20e1a727e Removing the specular pipeline since we now take care of it with the base shader, remove unused shader include files adding the tone map pass 2018-02-08 23:07:39 -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
NissimHadar
950a62f3f8 Global graphics flag default to on. 
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
 2018-02-08 15:52:20 -08:00
Bradley Austin Davis
ab5355dbdd First pass at bindless textures 2018-02-08 11:11:36 -08:00
samcake
03aeb7adda Adding the ubo slot assignment for the resource texture table 2018-02-08 11:08:23 -08:00
samcake
536ada3973 Introducing the TextureTable in the gpu shader system 2018-02-08 11:00:37 -08:00
samcake
caacd3e5cf Trying to fix the forwaard rendering 2018-02-07 18:46:47 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29: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
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
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
Brad Davis
08e52e5ef3 Fix additional highp 2018-02-02 14:15:21 -08:00
Brad Davis
dca3061107 Fix material key on Android 2018-02-02 13:45:24 -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
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion 
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
 2018-02-01 16:30:29 -05: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
Brad Davis
87a41ef176 Force the forward pipelines to setup the lighting data 2018-01-28 14:56:15 -08:00
Brad Davis
07aee1ef68 Ensure the fragment normal is noramlized 2018-01-28 14:55:28 -08:00
Brad Davis
7565e08657 Make ambient light header GLES safe 2018-01-28 14:40:25 -08:00
Brad Davis
29d6813963 Fixing header ordering 2018-01-28 14:39:51 -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
Anthony J. Thibault
3be857567b updated Skinning.slh comment and constant. 
(cherry picked from commit 43eaa02ef0)
 2018-01-26 14:02:18 -08:00
Olivier Prat
6b0b17ff63 Working on better adaptive bias algorithm for shadow 2018-01-26 17:57:20 +01:00
Olivier Prat
9cb5c95fe3 Added velocity buffer to deferredLighting.qml 2018-01-26 15:05:46 +01:00
Olivier Prat
1aa41918d0 Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-01-26 15:01:30 +01:00
Sam Gateau
51dac04374 Introducing the tag in lieu of the vsisiblity mask 2018-01-26 02:59:43 -08:00
Brad Davis
f3d451c2ef Fix GLES compilation for shader 2018-01-25 19:33:42 -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
Anthony J. Thibault
1ad65b8da5 Bug fix for twisted knees on some avatars. 
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.

(cherry picked from commit 991ba7f195)
 2018-01-25 18:31:41 -08:00
Anthony J. Thibault
21c1e32490 Bug fix for avatar neck cauterization 
The basic dual-quaternion skinning algorithm does not handle non-rigid transformations like scale well.
Because we only use scaling for head cauterization, we special case this by passing in a cauterization factor,
as well as a cauterization position to the vertex shader.  If a vertex is flagged as cauterized, we slam it to equal the cauterization position.
Although, not as smooth as the previous method, it seems to work well enough on the avatar's I've tested.

(cherry picked from commit faf8350369)
 2018-01-25 17:47:39 -08:00
samcake
2f4e61888f Making it work maybe 2018-01-25 16:57:35 -08:00
Brad Davis
361b767586 Merge branch 'fix/render_config' into android 2018-01-25 14:50:41 -08:00
Olivier Prat
b7b478f640 Using proper inverse projection matrix in velocity buffer computation to reproject to world pos 2018-01-25 17:33:18 +01:00
Olivier Prat
5af4337b0e Merged with master 2018-01-25 10:11:53 +01:00
Olivier Prat
f3aac2a7b5 Merged with samcake/black 2018-01-25 09:27:48 +01: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
d0f2138e87 Merged with master 2018-01-24 10:00:41 +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
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Olivier Prat
55abaf33fb Added shaders to support normal maps on translucent objects 2018-01-23 17:35:01 +01:00
Olivier Prat
24692f13fd Added separate scribe function to evalGlobalLightingAlphaBlendedWithHaze to shorten shader C string 2018-01-23 14:19:39 +01:00
Brad Davis
8f993e5a68 Merge branch 'android' into android_new 2018-01-22 12:48:38 -08:00
Olivier Prat
43f7bb5f56 Fixed compilation error due to really long shader 2018-01-22 16:50:03 +01:00
Olivier Prat
a807e41ff4 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-22 16:05:54 +01:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Brad Davis
3e7872637d Merge branch 'android' into android_new 2018-01-19 14:40:01 -08:00
Brad Davis
d53b8b38ac Merge remote-tracking branch 'upstream/master' into android 2018-01-19 14:35:20 -08:00
Seth Alves
9be2c67f00 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 11:46:34 -08:00
Brad Davis
3dba928b72 Merge remote-tracking branch 'upstream/android' into android_new 2018-01-19 10:36:46 -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
Olivier Prat
12c48a38f7 Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials. 2018-01-19 13:58:35 +01:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Brad Davis
0a0e5ab84b Don't try to set invalid slots in the fade effect 2018-01-18 16:49:19 -08:00
Brad Davis
6fa0ef88ff Fix compile issues in forward global light 2018-01-18 16:48:48 -08:00
Brad Davis
a9b2cc3408 Fixing lighting shader and removing being of light 2018-01-18 15:25:22 -08:00
Seth Alves
31c007d167 more backwards logic, added withViewVisibilityMask call in ItemKey 2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536 flip logic back around 2018-01-18 13:49:17 -08:00
Seth Alves
0ad4cdc41b works now 2018-01-18 13:15:47 -08:00
Seth Alves
fb974b0b9c attempt to straighten out use of view-visibility masks 2018-01-18 10:09:23 -08:00
Brad Davis
9e2503893c Merge remote-tracking branch 'gcalero/android_render_forward_fixes' into android_new 2018-01-18 10:03:50 -08:00
Olivier Prat
902bfac380 Merged with master 2018-01-18 18:31:04 +01:00
Seth Alves
1c819c8422 formatting 2018-01-18 09:12:37 -08:00
Sam Gateau
dd436229c1
Merge pull request #12193 from SamGondelman/transparent 
Fix black flashing on transparent objects
 2018-01-18 09:11:46 -08:00
Sam Gateau
7a9740d258 visible-perview 2018-01-18 02:18:46 -08:00
Sam Gateau
c1b7bc3ff8 Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview 2018-01-17 18:50:56 -08:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
SamGondelman
a44c965f56 fix black flashing on transparent objects 2018-01-17 15:59:07 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Bradley Austin Davis
25b778be1d Tracking down remaining SOX crashes 2018-01-17 12:18:39 -08:00
Bradley Austin Davis
9f6c2c3cdd Merge remote-tracking branch 'upstream/master' into android 2018-01-17 11:44:00 -08:00
Gabriel Calero
1ad61b7683 Adding forward pipelines for translucent objects 2018-01-17 16:26:17 -03:00
samcake
ecb7c622be Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview 2018-01-17 10:51:37 -08:00
Sam Gateau
0e72197a37
Merge pull request #12179 from Zvork/specular 
Fixed error in Specular shader which gave low key specular highlights
 2018-01-17 10:51:25 -08:00
samcake
51ed878683 Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview 2018-01-17 09:32:03 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -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
795a3b8407 Fix merge errors 2018-01-16 19:27:35 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Anthony J. Thibault
bc587bf6d8 Removal of legacy Rig methods 2018-01-16 18:19:35 -08:00
Anthony J. Thibault
576273efe3 Remove Rig::restoreJointPosition and references to it. 2018-01-16 18:01:58 -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
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Olivier Prat
cdb94d0832 Merge branch 'master' of git://github.com/highfidelity/hifi into scribe 2018-01-16 16:43:50 +01:00
Olivier Prat
8fb863e98c Added SurfaceData mechanism to evalGlobalLight 2018-01-16 15:57:05 +01:00
Olivier Prat
705b475d0c Merged with master 2018-01-16 15:07:20 +01:00
Olivier Prat
3382a35c3f Fixed bug due to incorrect discard of fragments with no local lights 2018-01-16 12:13:45 +01:00
Olivier Prat
6686b328c7 Fixed error in Specular shader which gave low key specular highlights 2018-01-16 10:47:46 +01:00
Brad Davis
17e9c3d00c Don't try to set invalid uniforms 2018-01-15 13:43:19 -08:00
samcake
1baa2a242a Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview 2018-01-15 11:12:28 -08:00
Sam Gateau
2f5d2bef49
Merge pull request #12028 from Zvork/roughness_metal 
Lighting model update for better specular
 2018-01-15 10:51:18 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
Brad Davis
db30e9c45f Fixing PR builds 2018-01-15 09:47:31 -08:00
Olivier Prat
32445a5660 Updated pipelines 2018-01-15 18:18:13 +01:00
Olivier Prat
54eab1c878 First working local lights on transparent objects 2018-01-15 17:49:55 +01:00
Olivier Prat
a3e50689cb Modified light outline shader to use some factorized code 2018-01-15 12:18:22 +01:00
Olivier Prat
6af6b5fe41 evalLocalLighting function created in LightLocal.slh 2018-01-15 12:02:29 +01:00
Olivier Prat
ca776fb9b4 Added LightLocal.slh to centralize shading with local lights 2018-01-15 11:36:52 +01:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
24b83aa0f1 Merge remote-tracking branch 'sam/android-gles' into windows_gles 2018-01-13 11:36:31 -08:00
Brad Davis
3d69ceea71 Re-enable HUD compositing 2018-01-13 11:34:56 -08: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
Sam Gateau
57f1ba2412 Merging with master to be able connect to dev domains and it works. fixing shaders for gles compile errors and disabling material textures by default 2018-01-13 02:00:34 -08:00
Sam Gateau
df0660f823 Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles 2018-01-13 01:00:41 -08:00
Sam Gateau
331a8f3094 fixing the stencil not clearing correctly and shaders not compiled correctly in main thread 2018-01-13 01:00:10 -08:00
Sam Gateau
628731ed19 Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles 2018-01-12 19:37:07 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
samcake
836b69ab1b exposing several visibility flags 2018-01-12 17:42:18 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
Brad Davis
7579451c24 Merge remote-tracking branch 'upstream/master' into android 2018-01-11 23:31:45 -08:00
Sam Gateau
e3faec838c Adding colors to the world 2018-01-11 23:22:51 -08:00
Sam Gateau
6f6aedbf4f Merge branch 'master' of https://github.com/highfidelity/hifi into android-fixes 2018-01-11 19:56:52 -08:00
Sam Gateau
8142b207af Making the forward model normal lighted 2018-01-11 19:56:08 -08:00
samcake
f22429d098 Working on the shaders 2018-01-11 18:03:11 -08:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
samcake
4dd925f025 Fixing forward render task to draw entities and avatars shapes 2018-01-10 17:51:03 -08:00
SamGondelman
e9d751fd23 try to avoid reusing uniform buffer locations 2018-01-10 17:01:01 -08:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Sam Gateau
539ee82937
Merge pull request #12033 from Zvork/compactvb 
More compact representation of meshes on GPU
 2018-01-10 09:11:33 -08:00
Olivier Prat
2960ad845c Fixed weird rendering bug. 2018-01-10 10:55:45 +01:00
Olivier Prat
cc8a717a81 Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal 2018-01-10 10:07:32 +01:00
Brad Davis
105dffebaf Fixing UI 2018-01-09 18:36:42 -08:00
Nissim Hadar
5b1f8e83d4 Removed gcc warning. 2018-01-09 15:46:15 -08:00
Nissim Hadar
b53e411184 Corrected pushing of default lights. 2018-01-09 15:24:46 -08:00
Nissim Hadar
c3f6faed00 Deal correctly with inheritance at top-most level. 2018-01-09 13:27:57 -08:00
Brad Davis
d6dd29b952 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Olivier Prat
db9e5fdae8 Merged from master but rendering seems broken 2018-01-09 11:05:34 +01:00
Sam Gateau
3fd319abec Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-08 21:11:17 -08:00
Anthony J. Thibault
fbea22e0f0 Renamed imag component to dual, using the correct nomenclature 
Also removed incomplete test from unit tests.
 2018-01-08 18:21:23 -08:00
Nissim Hadar
7811ddb904 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 15:39:09 -08:00
Nissim Hadar
b2b1807490 Changes per code review. 2018-01-08 15:37:06 -08:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix 
Fix avatar texture loading
 2018-01-08 14:01:15 -08:00
Anthony J. Thibault
59b843781e Merge branch 'master' into feature/dual-quat 2018-01-08 13:18:42 -08:00
SamGondelman
97c0b33975 fix avatar texture loading 2018-01-08 12:50:05 -08:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr 2018-01-08 12:49:52 -05:00
Olivier Prat
c904302057 Added back multiplication of specular for point / directional / spot lighting by PI as Naty Hoffman recommends. Limited texture LOD of ambient map by LOD computed for filtering to prevent aliasing 2018-01-08 15:23:39 +01:00
Olivier Prat
10b39751e1 Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal 2018-01-08 14:50:05 +01:00
Sam Gateau
a9f1e4102b Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-07 22:19:38 -08:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Nissim Hadar
9e5eba4d3a Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-05 23:11:40 -08:00
Brad Hefta-Gaub
6a3609093d
Merge pull request #12051 from dback2/polyobjimportfixes 
Poly obj import fixes
 2018-01-05 13:33:29 -08:00
samcake
abc029fd41 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-05 12:28:12 -08:00
samcake
50c97ede2b Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-05 11:55:43 -08:00
SamGondelman
a9d5dda976 always push default haze to current frame 2018-01-04 17:54:23 -08:00
Anthony J. Thibault
51ab38f484 warning fix 2018-01-04 17:32:22 -08:00
David Back
6b9658f8cf merge 2018-01-04 16:41:58 -08:00
Anthony J. Thibault
fac0982c67 need to use sizeof(TransformType), not sizeof(mat4) 2018-01-04 16:37:12 -08:00
Anthony J. Thibault
b8c88fca3b Dual Quaternion skinning optimization 
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
 2018-01-04 16:17:23 -08:00
Anthony J. Thibault
aacf2d489f removed comments 2018-01-04 16:17:21 -08:00
Anthony J. Thibault
bcd813ac62 Optimizations and cleanup 2018-01-04 16:15:44 -08:00
Anthony J. Thibault
e86fd4f992 Removed SKIN_COMP define, re-enabled cauterization 2018-01-04 16:15:42 -08:00
Anthony J. Thibault
b69edceb4f Fixed rotation polarity and weights are now 16 bit. 2018-01-04 16:15:41 -08:00
Anthony J. Thibault
5bb0b06061 WIP: Dual Quaternion compensation for spinning the right way. 2018-01-04 16:15:39 -08:00
Anthony J. Thibault
8bdddf7211 Full Dual Quaternion support 2018-01-04 16:15:38 -08:00
Anthony J. Thibault
18113d824c Created Model::TransformComponents class 2018-01-04 16:13:44 -08:00
Anthony J. Thibault
515d13a4c1 WIP checkpoint 2018-01-04 16:09:08 -08:00
Anthony J. Thibault
23affb570b WIP checkpoint, root transforms for shapes and non-animated fbx files are working. 2018-01-04 16:09:06 -08:00
Anthony J. Thibault
565875e823 WIP first attempt at dual quat skinning 2018-01-04 16:09:02 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
Olivier Prat
9f04e8597f Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal 2018-01-04 08:47:15 +01:00
Gabriel Calero
597114afea Prepare forward pipeline for android 2018-01-03 16:42:19 -03:00
Gabriel Calero
468fc89c3e Use forward pipeline for android 2018-01-03 16:38:23 -03:00
Gabriel Calero
dad526d22b Make Fade.slh compatible with Open GLES SL 2018-01-03 16:36:11 -03:00
humbletim
513a69cdcd changes per CR feedback 2018-01-03 04:08:43 -05:00
Olivier Prat
dcfeed9b2c Switched to using getFresnelF0 function in overlay3D model shaders 2017-12-27 15:52:17 +01:00
Olivier Prat
93ba9ad3b1 Adjusted roughness aspect on specular reflection of sky box to more closely match Unity's PBR look especially on high roughness values 2017-12-26 15:43:23 +01:00
Olivier Prat
d6b70d459f Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal 2017-12-26 14:15:24 +01:00
Sam Gondelman
2898fa557e
typo 2017-12-23 00:53:11 -08:00
Sam Gateau
6032ce39e9 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-12-22 20:20:10 -08:00
David Back
01fcd453b8 Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes 2017-12-22 16:41:17 -08:00
Nissim Hadar
8ee5f642a9 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-12-22 15:41:59 -08:00
SamGondelman
c38ef77b26 fix model overlays visibility change 2017-12-22 15:04:06 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor 
Removed glColor reset hack in MeshPartPayload
 2017-12-22 14:25:51 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3 
Remove _model from ModelMeshPartPayload
 2017-12-22 13:50:06 -08:00
Olivier Prat
a6d5e33eca Fixed levels between specular, diffuse, ambient specular, ambiend diffuse and background sky 2017-12-22 10:39:45 +01:00
Nissim Hadar
e974cac177 Keylight inheritance mode works. 2017-12-21 19:19:55 -08:00
David Back
f800a6d6fc scale change 2017-12-21 17:00:27 -08:00
SamGondelman
69c1c65eb8 get rid of _model completely 2017-12-21 14:08:21 -08:00
David Back
fd297f1c03 convert negative relative indices to absolute indices 2017-12-21 10:36:41 -08:00
Olivier Prat
cb4d78ce5c Fixed bug in specular ambient 2017-12-21 18:47:18 +01:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
samcake
403e77b023 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-12-21 09:17:23 -08:00
Olivier Prat
053bd2ba98 Created SurfaceData structure to centralize computation of frequently used shader temporary values 2017-12-21 17:41:36 +01:00
Olivier Prat
5c476dc967 Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal 2017-12-21 14:33:00 +01:00
Olivier Prat
0d34569b1a Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-21 08:22:35 +01:00
SamGondelman
2ba3e337db cleanup 2017-12-20 14:18:01 -08:00
SamGondelman
bd06dc6443 cleaning up modelmeshpartpayload 2017-12-20 11:00:14 -08:00
Olivier Prat
e8b88cd3f8 Specular lighting comming from ambient sphere map is now multiplied by PI to be at the same level as normal light specular 2017-12-20 11:14:07 +01:00
Olivier Prat
0e666ce671 Metallic value is now continuous and materials can be linearly blended between pure dielectric and pure metal 2017-12-20 09:34:53 +01:00
Nissim Hadar
2c6868b03e Pass keylight direction as parameter to the shader. 2017-12-19 11:12:27 -08:00
Olivier Prat
6968753783 Added G factor in PBR shading and removed evalPBRShadingGloss 2017-12-19 17:40:34 +01:00
Olivier Prat
bd666406f4 Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends 2017-12-19 14:17:17 +01:00
samcake
df3b4421f4 Merging 2017-12-18 12:20:56 -08:00
Olivier Prat
0fc496d44c Fixed merge conflicts with master 2017-12-18 15:23:11 +01:00
Olivier Prat
116756c976 Parallel optimizations of setBlendedVertices 2017-12-18 11:22:43 +01:00
Nissim Hadar
d69297c02e Replace evalGlobalLightingAlphaBlended with evalGlobalLightingAlphaBlendedWithHaze in all shaders. 2017-12-16 00:22:26 -08:00
Olivier Prat
264f41472d Added tangents to blendshape for possible break of bump mapping when doing blend shape animations 2017-12-15 12:06:07 +01:00
Nissim Hadar
82b94eaacd Reduced size of parameters in (shader) function call. 2017-12-14 18:50:41 -08:00
Nissim Hadar
76af59e331 Merge branch 'master' into hazeOnTransparent 2017-12-14 16:31:13 -08:00
Nissim Hadar
c352d5fc23 Passed light direction instead of light object into computeHazeColorKeyLightAttenuation. 2017-12-14 16:23:14 -08:00
Nissim Hadar
026b19d770 Set 4th position component from 0.0 to 1.0 2017-12-14 16:17:50 -08:00
Nissim Hadar
05e47ae668 Removed unneeded 'mix'. 
Defined EPSILON.
 2017-12-14 16:14:08 -08:00
Nissim Hadar
d5d4c22a3d Removed dual calls to getViewInverse(). 2017-12-14 15:55:31 -08:00
Nissim Hadar
409eade006 Merge branch 'master' into hazeOnTransparent 2017-12-14 11:41:53 -08:00
Olivier Prat
4abc428518 Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-14 17:57:47 +01:00
Olivier Prat
f38e473218 Working packing of normals and tangents in GL_INT_10_10_10_2_REV format. Need to check this with all available 3D data input formats 2017-12-14 17:57:34 +01:00
Nissim Hadar
79f0124244 Protect against use of null HazePointer. 2017-12-13 15:02:03 -08:00
Nissim Hadar
b4df115507 Protect against use of null HazePointer. 2017-12-13 12:53:01 -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
Olivier Prat
19e240460d Slightly optimized matrix operations in LightStage as samcake's remark 2017-12-13 15:30:57 +01:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
samcake
1008175a92 Removing commented code 2017-12-11 09:28:33 -08:00
samcake
b4f7433042 removing .f for a float in shader 2017-12-11 09:26:43 -08:00
Olivier Prat
b9d49318e7 Fixed bug which culled medium sized objects in shadow maps due to perspective frustum assumed octree selection 2017-12-11 12:19:10 +01:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-11 08:48:48 +01: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
9a4f667059 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-08 08:50:33 -08:00
Sam Gateau
d07cde3ecb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 19:20:25 -08:00
samcake
1c3b4b0c9b Merging and adding Olivier's fixes to taa 2017-12-07 17:54:58 -08:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
samcake
e0110ff7e6 Merging with upstream 2017-12-07 09:23:38 -08:00
Olivier Prat
291711ee24 Fixed weird black pixel bugs in TAA due to sqrt in TAA shader with very slightly negative number when computing color variance 2017-12-07 13:41:36 +01:00
Olivier Prat
1ce1aca79f Merged with samcake's 'black' branch 2017-12-07 08:59:38 +01:00
Olivier Prat
dc55a16834 Fixed warnings on Mac and Ubuntu 2017-12-06 18:37:27 +01:00
Olivier Prat
8d710c8f73 Factorised out some computation needed for all cascades 2017-12-06 18:08:27 +01:00
Olivier Prat
014e81b2f4 Added normal based adaptive depth bias 2017-12-06 17:06:48 +01:00
Olivier Prat
c9c93370da Fixed weird bug with objects suddenly poping out of the shadow map. Was due to objects with own pipeline corrupting the render state. Don't know why though 2017-12-06 15:26:44 +01:00
Olivier Prat
89b1ef2e19 Tweaked bias once more 2017-12-06 12:07:30 +01:00
Olivier Prat
ff39558d27 Automatic shadow bias computation from cascade texel density 2017-12-06 11:22:15 +01:00
Olivier Prat
f9641afcd0 Modified cascade distance distribution to blend between a desired resolution and an automatic logarithm distribution 2017-12-06 10:48:04 +01:00
Olivier Prat
1d8d8335c5 Moved shadow cascade distances computation to shadow, not shadow task 2017-12-06 10:05:39 +01:00
Olivier Prat
e16b427ab6 Switched to 4 cascades for key light and working on a better distribution 2017-12-05 18:57:04 +01:00
Olivier Prat
c0ca7a129d Fixed issue with far distance of cascades being underestimated, especially first cascade 2017-12-05 17:33:11 +01:00
Olivier Prat
0b6dcb2717 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-05 09:18:26 +01:00
samcake
9fceaad38b Merging with master 2017-12-04 14:20:10 -08:00
Bradley Austin Davis
e4220aa44e Fixing warnings in android build 2017-11-28 14:32:30 -08:00
Bradley Austin Davis
d6072f2bf2 Add bullet and draco to precompiled libraries 2017-11-28 11:32:34 -08:00
David Rowe
91671722a5 Add Shape API types JSDoc 2017-11-25 16:09:54 +13:00
samcake
1514cdfb2f extend the set of interface for multi highlight 2017-11-21 17:59:45 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -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
b246c479e3 Much better cascade blend 2017-11-17 11:25:15 +01:00
Olivier Prat
917ce7165c Working shadow cascade debugging view in Luci app 2017-11-16 15:36:48 +01:00
Olivier Prat
f8c241c429 Merged disappearing shadow bug fix from pcf branch 2017-11-16 12:19:19 +01:00
Olivier Prat
d2c28c3c21 Fixed disappearing shadow bug each time a domain was automatically reloaded 2017-11-16 10:49:59 +01:00
Olivier Prat
e574be7855 Fixed potential mismatch between push/popViewFrustum in shadow task 2017-11-16 10:00:32 +01:00
Sam Gateau
6889c9d6d1 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 18:49:30 -08:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom 
Bloom
 2017-11-15 15:11:31 -08:00
samcake
932089115e Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 12:51:01 -08:00
Sam Gateau
2c51e516eb
Merge pull request #11744 from Zvork/shadow 
Shadow caster culling fix
 2017-11-15 09:49:39 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587 
7587 Lasers resize with avatar
 2017-11-15 09:31:45 -08:00
samcake
78ac609752 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 09:12:18 -08:00
Olivier Prat
e4818f1b4f Merged request changes from shadow 2017-11-15 17:51:06 +01:00
Olivier Prat
14275b1cf3 Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded 2017-11-15 15:42:04 +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
Olivier Prat
bf46ccefaf Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-15 08:59:36 +01:00
Olivier Prat
5102c8e1b1 Merged with master 2017-11-14 21:56:00 +01:00
Olivier Prat
c5bd86a4bf Disabled bloom by default 2017-11-14 21:54:40 +01:00
David Back
4b8021bc4a
Merge pull request #11802 from dback2/mirrorfanciness2 
prevent rendering HUD elements in secondary camera
 2017-11-14 10:49:18 -08:00
Olivier Prat
2a19247530 Switched back to 3 cascades 2017-11-14 19:09:35 +01:00
Olivier Prat
d14ebdc0e1 Adjusted cascade partitions 2017-11-14 18:53:50 +01:00
Olivier Prat
74b0b52edb Working CSM with smooth blend between cascades. Switched to 4 1024 cascades 2017-11-14 16:57:22 +01:00
Olivier Prat
010104d42a Switched off noise and switched back to screen space dither 2017-11-14 10:11:39 +01:00
samcake
fd46aa15ff adding occluded/visisble to highlight outline 2017-11-13 17:23:21 -08:00
Olivier Prat
ac0e816f8c Cascade selection working on shadow but not in Luci debug mode 2017-11-13 18:42:34 +01:00
Olivier Prat
28d46dc4a5 First alpha version of cascade selection code in shader 2017-11-13 15:56:11 +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
6611b28e2d Switched to world space dithering for more visual stability 2017-11-13 13:54:51 +01:00
Olivier Prat
dd0eaafc0d Screen space dithering for PCF with some noise added 2017-11-13 12:33:46 +01:00
Olivier Prat
70847a9513 Wrong texture map assigned to cascade slots 2017-11-13 08:49:45 +01:00
David Back
163de649bf prevent rendering HUD elements in secondary camera 2017-11-10 17:44:09 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline 
Multiple Outline Groups
 2017-11-10 15:45:03 -08:00
Olivier Prat
103e036b70 Shadow maps rendered in cascades 2017-11-10 18:30:37 +01:00
Olivier Prat
08b06281f4 Min / Max cascade distance computation 2017-11-10 16:17:09 +01:00
Olivier Prat
8f84e5fbed Added sampler array in shader to support future cascades 2017-11-10 15:39:26 +01:00
Olivier Prat
e0b36b800f Added Cascade subclass in LightStage Shadow 2017-11-10 14:55:49 +01:00
Olivier Prat
7fd03bed7e Added cascades in schema buffer but still only first used 2017-11-10 14:28:35 +01:00
Olivier Prat
cbd2877524 Optimized shadow shader evaluation by computing concatenated shadow reprojection matrix on CPU 2017-11-10 11:26:20 +01:00
Olivier Prat
6cd4da877e Fixed dithered PCF filter in shadow 2017-11-10 11:11:04 +01:00
Olivier Prat
cf5a7531df Fixed dithered PCF filter in shadow 2017-11-10 11:10:31 +01:00
Olivier Prat
8b6a2eeb24 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-10 10:19:32 +01:00
Olivier Prat
4f7ed38e98 Fixed potential link errors on Mac 2017-11-09 11:26:08 +01:00
luiscuenca
1791ed01ca add width param to vertex shader 2017-11-08 18:35:26 -07:00
samcake
aecfefe72a Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-08 15:49:05 -08:00
Nissim Hadar
3c5fd73ca8 Removed unused argument. 2017-11-08 14:56:21 -08:00
Nissim Hadar
cc58f6ac2a Merge branch 'master' into hazeOnTransparent 2017-11-08 14:11:41 -08:00
Nissim Hadar
4433e79c9c Seems to work. 2017-11-08 14:08:37 -08:00
samcake
af1180255e fixes from code review 2017-11-08 11:45:40 -08:00
samcake
75ce61c3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-08 11:30:53 -08:00
Nissim Hadar
a8a118582d WIP - passing uniform into model translucency shader. 2017-11-08 09:37:58 -08:00
Nissim Hadar
3d2c8186e7 Added Haze model as input to transparency shader. 2017-11-08 08:01:19 -08:00
Nissim Hadar
83ff20b599 Renamed getHazeParametersBuffer to getParametersBuffer 2017-11-08 08:00:31 -08:00
Olivier Prat
bbcb0b2d9b Fixed highlight in stereo mode, including HMD (testing on simulator) 2017-11-08 13:49:18 +01:00
Olivier Prat
f996435ac8 Merge branch 'master' of git://github.com/highfidelity/hifi into highlight 2017-11-08 11:41:21 +01:00
Olivier Prat
39604363ea Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes 2017-11-08 11:38:20 +01:00
Olivier Prat
91d8435a99 Merge branch 'master' of git://github.com/highfidelity/hifi into bloom 2017-11-08 08:17:55 +01:00
samcake
f5e1add694 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-07 17:41:36 -08:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix 
Haze mask fix
 2017-11-07 17:37:24 -08:00
samcake
0718763ed1 Adjust syntax 2017-11-07 17:31:15 -08:00
luiscuenca
ee3900be4f Corrections 2017-11-07 18:26:41 -07:00
Nissim Hadar
ee6a8510c6 Refactored haze computation. 2017-11-07 17:22:57 -08:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
Nissim Hadar
87aee7242a Moved linearDepthMap into Haze.slf 
Refactored computation of keylight attenuation - now function in Haze.slh
 2017-11-07 15:25:42 -08:00
samcake
6481e0f713 Address cauterized cluster matrices issue 2017-11-07 12:52:23 -08:00
Nissim Hadar
803e5d143d Moved Haze pass to be before transparency pass. 2017-11-07 11:48:46 -08:00
Olivier Prat
0bbd1edc0a Fixed fluttering highlight bug by attaching only stencil when drawing outline 2017-11-07 18:26:15 +01:00
Olivier Prat
ffa46b487a Only non empty selections are now linked to highlight passes 2017-11-07 17:07:37 +01:00
Olivier Prat
9817cb4c44 Added highlight configuration in HighlightStageSetup job 2017-11-07 15:35:43 +01:00
Olivier Prat
3cc445ff02 Renamed outline to highlight 2017-11-07 11:07:25 +01:00
Olivier Prat
9e6472b577 Added OutlineStyleStage 2017-11-06 15:55:57 +01:00
Sam Gateau
fcb3cee092 exploring how to to expose occluded/unoccluded outline styles 2017-11-05 11:48:12 -08:00
samcake
053052a95d removing warnings 2017-11-03 13:28:20 -07:00
Olivier Prat
fcf1c301b6 Merge branch 'master' of git://github.com/highfidelity/hifi into bloom 2017-11-03 18:12:15 +01:00
Olivier Prat
79c2da3dcb Removed cull functor from shadow render task as it is inadapted for the shadow's orthographic projection 2017-11-03 16:52:29 +01:00
Olivier Prat
fbcb2924e8 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-03 15:08:15 +01:00
Olivier Prat
e0fd71f246 Merged from master 2017-11-03 14:39:42 +01:00
Olivier Prat
4b598a6e24 Working stencil mask with object bounding boxes 2017-11-03 14:26:36 +01:00
Sam Gateau
390f5b53ca cleaning more code 2017-11-02 23:55:44 -07:00
Sam Gateau
c11f46a8d3 cleaning more code 2017-11-02 23:35:18 -07:00
Sam Gateau
421aacd8eb Yes 2017-11-02 22:45:19 -07:00
Sam Gateau
70134d67eb Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-02 19:49:22 -07:00
Sam Gateau
f097d66721 YEp it s working 2017-11-02 19:49:01 -07:00
samcake
d33c75865e Removing unecessary test 2017-11-02 18:11:13 -07:00
samcake
83bfa1c5f2 Progressing on the cluster updates 2017-11-02 17:57:46 -07:00
Nissim Hadar
d8191e3bd2 Fixed Mask test. 2017-11-02 12:45:18 -07:00
Andrew Meadows
db9c3cc103 make Model::scaleToFit() public not protected 2017-11-02 12:31:36 -07:00
Sam Gateau
56510abd1e Trying to set the ClusterBuffer in the render loop instead of the game loop 2017-11-02 03:45:27 -07:00
Olivier Prat
f2444f9a30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-02 09:25:07 +01:00
Nissim Hadar
2e6c849b63 Added comment. 2017-11-01 20:31:44 -07:00
Nissim Hadar
67552d2b7d Change stencil mask used with Haze. 2017-11-01 17:39:37 -07:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3 Removed haze init variables from the model namespace. 2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3 Removed _degs and _m suffixes. 2017-10-30 19:45:08 -07:00
Nissim Hadar
b00db6a68f Correction. 2017-10-30 19:20:49 -07:00
Nissim Hadar
1357877618 Replaced separate RGB components of colours with vec3's. 2017-10-30 12:41:09 -07:00
Nissim Hadar
5fc68cae0d Converted Haze initialization values to static. 2017-10-30 11:51:19 -07:00
Olivier Prat
3a977f6039 Disabled stereo in batch when using full screen outline 2017-10-27 22:59:23 +02:00
Nissim Hadar
420b0f321c Merge branch 'master' into hazeZone 2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Olivier Prat
4cbee72eae Fixed warning on Mac and Ubuntu 2017-10-27 17:50:22 +02:00
Olivier Prat
4cadcd79bf Return full viewport when scissor is disabled and items in outline group 2017-10-27 17:07:19 +02:00
Olivier Prat
dc8c75f403 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-10-27 15:56:40 +02:00
Olivier Prat
bced566510 Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo 2017-10-27 10:45:43 +02:00
Andrew Meadows
2710dca37c fix rendering of Circles and Quads 2017-10-26 22:58:50 -07:00
Sam Gateau
6051a3913f Merge pull request #11684 from NissimHadar/bugFix8610 
Bug fix 8610
 2017-10-26 10:55:29 -07:00
Olivier Prat
0044759196 Disabled broken PCF and reset back to previous bias 2017-10-26 18:29:29 +02:00
Olivier Prat
44393f12d9 Adjusted bias 2017-10-26 17:41:54 +02:00
Olivier Prat
186b531be6 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-10-26 15:12:09 +02:00
Olivier Prat
9eed69d7ef Trying to pin point a zone bug 2017-10-26 15:11:42 +02:00
Olivier Prat
6cf689a385 First draft version of tighter shadow frustum 2017-10-26 12:42:36 +02:00
Nissim Hadar
2ec62ecc9b Reduced haze background blend range to 27,000 metres. 2017-10-25 15:12:01 -07:00
Nissim Hadar
bfab466827 Bug 8610. 2017-10-25 14:13:53 -07:00
Nissim Hadar
8d11ace1a6 Bug 8610. 2017-10-25 13:46:59 -07:00
Andrew Meadows
2d0b94817c Merge pull request #11336 from 1P-Cusack/21389_PR2 
WL21389 PR2: Representation of collision shapes need updating (details below).
 2017-10-25 10:41:21 -07:00
Olivier Prat
ae8a9e68c8 Added debug tool to view shadow & view frustums 2017-10-25 11:58:16 +02:00
Brad Hefta-Gaub
ef78711b7b Merge pull request #11663 from AndrewMeadows/shape-sharing 
fix incorrect collision shape sharing for some ModelEntityItem configurations
 2017-10-24 21:04:57 -07:00
Brad Hefta-Gaub
2a865f3a45 Merge pull request #11666 from SamGondelman/mirrorMode 
Fix backwards HUD in mirror mode
 2017-10-24 21:03:29 -07:00
SamGondelman
046e5ca716 fix backwards HUD in mirror mode 2017-10-24 13:24:09 -07:00
Andrew Meadows
27f4d182d9 fix scale of rendered collision geometry 2017-10-24 13:23:46 -07:00
Nissim Hadar
f81675e3b4 Changed blend range from 32,000 m to 30,000m 2017-10-24 13:17:09 -07:00
LaShonda Hopper
d1ab1c5e26 [WL21389] Fixes issue with the ShapeData vert buffer offset (details below). 
When computing the buffer view offset for ShapeData the vertex vector
size should be scaled by a single vec3 size as opposed to 2.

This fix is taken from PR discussion:
 https://github.com/1P-Cusack/hifi/pull/10

 Proposed by: Andrew Meadows <andrew@highfidelity.io>

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:25 -04:00
LaShonda Hopper
226d51b8f5 [WL21389] Fix scaling issue when computing hull point list (details below). 
The entity dimensions should be scaled by 1 as opposed to 0.5.

Changes Committed:
    modified:   interface/src/Util.cpp
    modified:   libraries/render-utils/src/GeometryCache.cpp
    modified:   libraries/render-utils/src/GeometryCache.h
 2017-10-24 14:16:25 -04:00
LaShonda Hopper
d027993ac0 [WL21389] Address code review feedback (details below). 
* Renamed squared var to be consistent with format of others in the code base.
* Removed fabsf() that was accidentally left in.
* Reduced squared distance filter within GeometryCache::computeSimpleHullPointListForShape
  as suggested from 0.0025f to recommended 1.0e-6f (1mm^2).

Feedback Link:  https://github.com/highfidelity/hifi/pull/11336#pullrequestreview-70060918

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:25 -04:00
LaShonda Hopper
070660eb04 [WL21389] Switch to _positionView & filter dupe verts for ShapeInfo (details below). 
* Adjusts GeometryCache::computeSimpleHullPointListForShape to utilize
  ShapeData::_positionView as opposed to _normalView.
** Also filters out duplicate points or points close enough to be considered
   duplicate vertices.  This provides ShapeFactory with better point data
   and should reduce hits to the dedupe pass within createConvexHull.

Tested:
* Octagon & Tetrahedron
** They looked better than the prior commit, behaved closer to their shape as opposed
   to cone or narrow cylinder like.

Note:
* These changes are based on debug info observations using the Octagon and
  discussion with Andrew Meadows via Slack & https://github.com/highfidelity/hifi/pull/11336#pullrequestreview-69939120

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
    modified:   libraries/render-utils/src/GeometryCache.h
 2017-10-24 14:16:25 -04:00
LaShonda Hopper
0ad95806e3 [WL21389] Update point list function in line with GeometryCache::ShapeData update. 
Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:24 -04:00
LaShonda Hopper
9d64a3b991 [WL21389] Fixes warnings from last commit (details below). 
* Fixes int vs size_t comparison warning within ShapeInfo.
* Fixes unused var warning for shapeVerts local var within GeometryCache.

This should fix the mac & ubuntu builds.

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
    modified:   libraries/shared/src/ShapeInfo.cpp
 2017-10-24 14:16:24 -04:00
LaShonda Hopper
7f9ce5a4cd [WL21389][BuildFix] Minor refactor due to render-utils lib change (details below). 
As of Commit b93e91b9, render-utils no longer knows about entity lib.
This commit adjusts for that by altering the signature of
GeometryCache::computeSimpleHullPointListForShape to take in portions
of ShapeEntityItem data as opposed to the entity pointer.

Fixes build failure mentioned in:
 https://github.com/highfidelity/hifi/pull/11336#issuecomment-333635794

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Util.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
 2017-10-24 14:16:23 -04:00
LaShonda Hopper
789b850846 [WL21389] Addresses feedback from PR #11336. 
* Removes todos from ShapeEntityItem::shapeCalculator stub commit.
* Removes defined out debugging, as requested, from GeometryCache::computeSimpleHullPointListForShape.
* Moves cone handling to its own section for better contextual flow.

Changes Committed:
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:23 -04:00
LaShonda Hopper
8a4ac9ebc4 [WL21389] Resolves size_t vs int warnings in GeometryCache. 
Reviewed-by: Kris Pivin <krispivin@1stplayable.com>

Changes Committed:
	modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:23 -04:00
LaShonda Hopper
070c664ff2 [WL21389] Add out of bounds safeguard to computeShapeInfo helper (details below). 
* Switched direct map indexing to helper function which has out of bounds safeguard.
* Also updated GeometryCache::getShapeForEntityShape default fallback return from
  GeometryCache::NUM_SHAPES to GeometryCache::Sphere inline with general preference
  to act as if a shape is a sphere in the event of an error.

Changes Committed:
	modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:23 -04:00
LaShonda Hopper
5b50b362f1 [WL21389] WL21389 PR2: Representation of collision shapes need updating (details below). 
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.

* Moves GeometryCache::_shapes from public to private scope
    * Nothing aside from the class should be directly altering this, only querying
    * Updated instances of direct referencing which looks to have been limited to prior
      testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
    * GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
  RenderableShapeEntityItem
    * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
    * This helps circumvent the issue with library inclusion.  entity-render knows about
      entity; however, entity doesn't know about entity-renderer; however, GeometryCache
      data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
    * This callback is set up within Application::init of the Interface as it knows about
      both halves of the equation, and the callback needs to be setup prior to any entities
      collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
    * This should avoid any issues due to subversively setting the type or
      incorrectly setting the type as a tangential operation.
        * Audited instances of ShapeInfo::setPointCollection and all seemed to be
          calling the function immediately after having set the type via
          ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
    * This type is reserved for the circle which is now treated as a special
      type of Cylinder_Y with regard to collision as opposed to a simple hull.
    * Fixes the issue where jumping on a circle, at times, would
      result in the avatar sliding off towards an edge as if atop a
      squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
    * Auditing calls showed that majority of places were comparing against ShapeType
    * ShapeType::_type is a ShapeType so returning the type explicitly
      is more consistent.
        * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
          ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
    * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
      GeometryCache::buildShapes.
    * Also it appears that a Quad shape can't be created within world via the creation menu.
        * There's no explicit option at present to create one.
        * Trying subvert the Cube/Box creation option to generate one results in an enforced
          stubby box as opposed to a quad.
    * Given the aforementioned points, entity::Shape::Quad will default to
      SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
        * Added Todo regarding the shape being unsupported along with a notation to create
          a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Application.cpp
	modified:   interface/src/Util.cpp
	modified:   interface/src/Util.h
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   libraries/shared/src/ShapeInfo.h
	modified:   tests/gpu-test/src/TestInstancedShapes.cpp
 2017-10-24 14:16:17 -04:00
Olivier Prat
a34db5f26d Shadows are now cast by the current zone key light (sun) 2017-10-24 11:09:36 +02:00
Olivier Prat
43f9db5b70 Fixed small bug due to half texel offset in outline shader 2017-10-23 11:08:13 +02:00
Olivier Prat
0f120a1a2a Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-23 10:08:02 +02:00
Brad Hefta-Gaub
d6ad389dab Merge pull request #11611 from AndrewMeadows/faster-update-renderables 
Faster renderables update
 2017-10-20 13:43:08 -07:00
Andrew Meadows
c79bf3bc04 cleanup WANT_DETAILED_PROFILING 2017-10-19 14:31:50 -07:00
Olivier Prat
6acff216d9 Reduced blur tap for slightly better performance 2017-10-19 19:00:09 +02:00
Olivier Prat
32df0209f3 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-19 17:38:05 +02:00
Olivier Prat
410b1904cd Fixed bug in outline.qml that associated outline tab to wrong outline job config 2017-10-19 17:36:16 +02:00
Olivier Prat
fc66dcfdea Added outline to statsGPU script 2017-10-19 16:52:29 +02:00
Olivier Prat
382262da3d Working scissor with correct projected bounding box rect 2017-10-19 16:23:13 +02:00
Olivier Prat
111966b987 Fixed potential bug with outline frame buffer allocations. Still problems with avatar outline rect 2017-10-19 12:39:34 +02:00
Olivier Prat
cc30c0b841 Expanded scissor rect with outline blur width 2017-10-19 11:35:26 +02:00
Olivier Prat
f890c5bb8c Added project rect and scissor test. Need to increase bounds to take into account blur width 2017-10-18 19:40:03 +02:00
Nissim
fe286aff83 Andrew's corrections (per coding standard). 2017-10-18 08:42:07 -07:00
Olivier Prat
8cabd1c953 Fixed graphics bug with filled 2017-10-18 15:06:54 +02:00
Olivier Prat
25b3549e04 Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled 2017-10-18 15:00:53 +02:00
Olivier Prat
9ed5185a3e Multiple outline group config working 2017-10-17 10:01:06 +02:00
Andrew Meadows
339edc67c8 ifdef out more per-frame-per-entity profiling 2017-10-16 17:27:53 -07:00
Andrew Meadows
fb1c075a12 fix animating entities 2017-10-16 15:55:25 -07:00
Olivier Prat
70f892e67d Ready to plug multiple selections javascript side 2017-10-16 17:02:13 +02:00
Olivier Prat
1b67223e0e Preparing for multiple outline groups in shader 2017-10-16 12:38:44 +02:00
Olivier Prat
e42699c0ea Added multiple selections but still only first linked to outline 2017-10-16 10:57:06 +02:00
Olivier Prat
8d79313a9d Working mask rendering and debugging 2017-10-16 09:42:58 +02:00
Sam Gateau
ec934335dc CLeaning up the pr regarding the scripts with my branch blue 2017-10-15 22:34:58 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Olivier Prat
2658d65814 Preparing for outline color mask 2017-10-13 12:02:21 +02:00
Olivier Prat
049e3d47b6 Preparing for support of multiple concurrent outlines by adding mask id buffer 2017-10-13 10:23:42 +02:00
Olivier Prat
055270df9c Removed compilation warnings on Mac and Ubuntu 2017-10-12 19:26:05 +02:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Andrew Meadows
d9ba75ca72 fix warning about implicit cast from 64 to 32 bits 2017-10-11 06:07:07 -07:00
Andrew Meadows
886422cbef remove unused variable 2017-10-10 17:07:17 -07:00
Andrew Meadows
4bf99fe9d2 remove unused variable 2017-10-10 17:05:54 -07:00
Andrew Meadows
026195223a more correct use of BufferView in GeometryCache 2017-10-10 17:02:26 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Nissim Hadar
3070778b39 Fixed typo in comment. 2017-10-10 10:20:04 -07:00
Olivier Prat
d3add89b3c Adjusted bloom size range 2017-10-10 18:28:42 +02:00
Olivier Prat
f55d44dfc3 Threshold now doesn't downsample anymore. Done in separate pass 2017-10-10 17:49:35 +02:00
Olivier Prat
76305c5285 Better debugging options for bloom 2017-10-10 14:49:04 +02:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Olivier Prat
0261265330 Working bloom but still visually unstable with geometry aliasing 2017-10-09 19:17:51 +02:00
Olivier Prat
cda48cbf67 Three blurs working 2017-10-09 15:13:32 +02:00
Olivier Prat
0d3d309bce Quarter size debug rendering of bloom 2017-10-09 11:49:29 +02:00
Olivier Prat
50ab73009a Working threshold mask and debug on Bloom 2017-10-09 11:09:51 +02:00
Olivier Prat
98d39ff9e0 Merged with master 2017-10-09 09:37:18 +02:00
Olivier Prat
27a0fb62d3 Multiple gaussians as Unreal. First draft 2017-10-09 09:35:38 +02:00
Bradley Austin Davis
c92588685b Merge pull request #11533 from SamGondelman/modelMaster 
Fix model loading for real this time
 2017-10-08 10:23:13 -07:00
Nissim Hadar
e02876f1ea Zone position/direction sent to haze uniform. 2017-10-06 17:24:20 -07:00
SamGondelman
b4a3ab9204 fix debugDeferredLighting 2017-10-06 15:46:10 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
Nissim Hadar
8fad23aefd Keylight working. 2017-10-06 12:49:43 -07:00
Nissim Hadar
47a6f2d7c9 Initial work on adding keylight direction. 2017-10-06 12:01:15 -07:00
Nissim Hadar
9918757061 Initial work on adding keylight direction. 2017-10-06 11:43:57 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
SamGondelman
a6b7578c3c start fixing asynch issue, fixes model loading! 2017-10-05 12:30:00 -07:00
Sam Gateau
328d900533 Trying a simpler technique to find the best velocity candidate and cleaning default config 2017-10-05 00:57:17 -07:00
Nissim Hadar
794cb961d5 Merge branch 'master' into hazeZone 2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8 WIP - implementing range+altitude mode. 2017-10-04 23:03:21 -07:00
Nissim Hadar
6dcd8b7b57 Haze Range works. 2017-10-04 21:47:20 -07:00
Nissim Hadar
97f775f6f1 Clean-up. 2017-10-04 21:36:42 -07:00
Sam Gateau
69e68ef5ad Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-10-04 18:58:33 -07:00
SamGondelman
3a6e84e681 trying to fix model issue 2017-10-04 17:26:12 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
Nissim Hadar
48e5b9d1bc Haze enable/disable from UI works. 2017-10-03 17:42:04 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
Nissim Hadar
1cf7f5a732 For testing. 2017-10-03 09:54:44 -07:00
Sam Gateau
acb99592ee fixing th e bug on exit due to the debug anim draw of the avatars 2017-10-02 21:31:30 -07:00
samcake
6639287418 Merging with master 2017-10-02 17:03:09 -07:00
Nissim Hadar
cdbf067a24 Rename (haze)getParametersBuffer to getHazeParametersBuffer. 
Add corrections from Sam
 2017-10-02 16:54:02 -07:00
Nissim Hadar
ca4c5969d9 Clean-up. 2017-10-02 14:36:45 -07:00
Nissim Hadar
29d5e772d4 Removed "..Is.." from various methods. 2017-10-02 12:42:46 -07:00
Nissim Hadar
48fb7522c0 Removed blank line 2017-10-02 11:42:04 -07:00
Nissim Hadar
20a42d6fbd Fixed model name string 2017-10-02 10:11:34 -07:00
Nissim Hadar
97756146b1 Attempt to add qml configuration 2017-10-02 09:09:36 -07:00
Nissim Hadar
bdd469cec4 Integrated haze shader into this branch. 2017-10-01 21:52:34 -07:00
Nissim Hadar
ffecf42ebb Some clean-up. 2017-10-01 21:12:29 -07:00
Nissim Hadar
5a7fed022c Merging haze branch. 2017-09-30 00:04:28 -07:00
Nissim Hadar
f26345a3f0 Working on adding zone to haze. 2017-09-29 15:15:49 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00