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
Olivier Prat
03daba9bac
Removed duplicate shader include
2018-02-02 18:18:24 +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
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
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08: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
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
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
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
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08: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
