maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Expose vignette strength

Browse source
This commit is contained in:
luboslenco 2019-02-21 14:20:18 +01:00
parent 905f18a9a3
commit 1e5b11d0a3
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Shaders/compositor_pass/compositor_pass.frag.glsl
View file

@ -110,7 +110,7 @@ vec4 LUTlookup(in vec4 textureColor, in sampler2D lookupTable) {
}
float vignette() {
return 0.3 + 0.7 * pow(16.0 * texCoord.x * texCoord.y * (1.0 - texCoord.x) * (1.0 - texCoord.y), 0.2);
return (1.0 - compoVignetteStrength) + compoVignetteStrength * pow(16.0 * texCoord.x * texCoord.y * (1.0 - texCoord.x) * (1.0 - texCoord.y), 0.2);
}
#ifdef _CGlare

1
blender/arm/props_renderpath.py
View file

@ -485,6 +485,7 @@ class ArmRPListItem(bpy.types.PropertyGroup):
arm_lens_texture: StringProperty(name="Lens Texture", default="")
arm_fisheye: BoolProperty(name="Fish Eye", default=False, update=assets.invalidate_shader_cache)
arm_vignette: BoolProperty(name="Vignette", default=False, update=assets.invalidate_shader_cache)
arm_vignette_strength: FloatProperty(name="Strength", default=0.7, update=assets.invalidate_shader_cache)
arm_lensflare: BoolProperty(name="Lens Flare", default=False, update=assets.invalidate_shader_cache)
arm_lut_texture: StringProperty(name="LUT Texture", description="Color Grading", default="", update=assets.invalidate_shader_cache)
arm_skin: EnumProperty(

3
blender/arm/props_ui.py
View file

@ -1006,6 +1006,9 @@ class ArmRenderPathCompositorPanel(bpy.types.Panel):
col.prop(rpdat, 'arm_sharpen_strength')
layout.prop(rpdat, 'arm_fisheye')
layout.prop(rpdat, 'arm_vignette')
col = layout.column()
col.enabled = rpdat.arm_vignette
col.prop(rpdat, 'arm_vignette_strength')
layout.prop(rpdat, 'arm_lensflare')
layout.prop(rpdat, 'arm_grain')
col = layout.column()

5
blender/arm/write_data.py
View file

@ -550,6 +550,11 @@ const int volumSteps = """ + str(rpdat.arm_volumetric_light_steps) + """;
if rpdat.arm_grain:
f.write(
"""const float compoGrainStrength = """ + str(round(rpdat.arm_grain_strength * 100) / 100) + """;
""")
if rpdat.arm_vignette:
f.write(
"""const float compoVignetteStrength = """ + str(round(rpdat.arm_vignette_strength * 100) / 100) + """;
""")
if rpdat.arm_sharpen: