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
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
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
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
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
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
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
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
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
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