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