diff options
| author | Jari Karppinen <jari.karppinen@qt.io> | 2019-05-03 14:36:25 +0300 |
|---|---|---|
| committer | Jari Karppinen <jari.karppinen@qt.io> | 2019-05-07 08:03:29 +0000 |
| commit | fe0a5a474392de0036019f0083a4401863508a83 (patch) | |
| tree | 769547b1d341b317f767c9da9acb2bf0a7bc5ecf | |
| parent | 0c4ffac9163ffdcf04d9307eb391f0534af9badd (diff) | |
Fix shader compilation errors in copies of VignetteEffect.effect
Apply updates from qt3d-runtime commit
6945d224433d731aaff1f83bf4d05ba812c8c36c to qt3dstudio files.
Task-number: QT3DS-3387
Change-Id: I777ed67d53ece891d8d338732221de16c9019713
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | Studio/Content/Effect Library/VignetteEffect.effect | 10 | ||||
| -rw-r--r-- | examples/studio3d/SampleProject/effects/VignetteEffect.effect | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Studio/Content/Effect Library/VignetteEffect.effect b/Studio/Content/Effect Library/VignetteEffect.effect index ec726ac0..7fbf7dbe 100644 --- a/Studio/Content/Effect Library/VignetteEffect.effect +++ b/Studio/Content/Effect Library/VignetteEffect.effect @@ -15,20 +15,18 @@ void frag() { - float radius = vig_radius; vec4 origColor = texture2D_0(TexCoord); vec2 uv = TexCoord.xy; vec2 center = vec2(0.5); vec4 bg = origColor; - uv *= 1.0 - uv.yx; - float vig = uv.x*uv.y * vig_strength; + uv *= 1.0 - uv.yx; + float vig = uv.x * uv.y * vig_strength; vig = pow(vig, vig_radius); - vec4 vigmixcolor = vec4(vig_color,vig) * vec4(vig); - gl_FragColor = vec4(mix(origColor,vigmixcolor,1.0-vig)); - + vec4 vigColor = vec4(vig_color.rgb, vig) * vig; + gl_FragColor = mix(origColor, vigColor, 1.0 - vig); } ]]></FragmentShader> </Shader> diff --git a/examples/studio3d/SampleProject/effects/VignetteEffect.effect b/examples/studio3d/SampleProject/effects/VignetteEffect.effect index ec726ac0..7fbf7dbe 100644 --- a/examples/studio3d/SampleProject/effects/VignetteEffect.effect +++ b/examples/studio3d/SampleProject/effects/VignetteEffect.effect @@ -15,20 +15,18 @@ void frag() { - float radius = vig_radius; vec4 origColor = texture2D_0(TexCoord); vec2 uv = TexCoord.xy; vec2 center = vec2(0.5); vec4 bg = origColor; - uv *= 1.0 - uv.yx; - float vig = uv.x*uv.y * vig_strength; + uv *= 1.0 - uv.yx; + float vig = uv.x * uv.y * vig_strength; vig = pow(vig, vig_radius); - vec4 vigmixcolor = vec4(vig_color,vig) * vec4(vig); - gl_FragColor = vec4(mix(origColor,vigmixcolor,1.0-vig)); - + vec4 vigColor = vec4(vig_color.rgb, vig) * vig; + gl_FragColor = mix(origColor, vigColor, 1.0 - vig); } ]]></FragmentShader> </Shader> |