vignette_final

+added: gui slider for maximum exposure of vignetting
+changed: shaders to logical min/max floats
this pr contains the glsl shaders as well and therefore makes the
https://github.com/GarageGames/Torque3D/pull/1225 Pull Request obsolete
This commit is contained in:
Miodrag Sejic 2015-03-07 14:03:12 +01:00
parent 74a05854d5
commit 351d5f08e9
8 changed files with 200 additions and 20 deletions

View file

@ -2426,7 +2426,50 @@
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
Enabled = "1";
};
new GuiSliderCtrl(ppOptionsVignetteVMax) {
range = "0.001 5";
ticks = "1000";
snap = "0";
value = "0.6";
position = "96 46";
extent = "221 17";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiSliderBoxProfile";
visible = "1";
active = "1";
variable = "$VignettePostEffect::VMax";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl(ppOptionsVignetteVMaxLabel) {
text = "Radius";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "26 48";
extent = "41 18";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Controls the maximum exposure of vignetting.";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
};
new GuiTabPageCtrl() {

View file

@ -20,13 +20,19 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
$VignettePostEffect::RadiusX = 0.6;
$VignettePostEffect::RadiusY = 0.2;
$VignettePostEffect::VMax = 0.6;
$VignettePostEffect::VMin = 0.2;
singleton ShaderData( VignetteShader )
{
DXVertexShaderFile = "shaders/common/postFx/postFxV.hlsl";
DXPixelShaderFile = "shaders/common/postFx/vignette/VignetteP.hlsl";
OGLVertexShaderFile = "shaders/common/postFx/gl//postFxV.glsl";
OGLPixelShaderFile = "shaders/common/postFx/vignette/gl/VignetteP.glsl";
samplerNames[0] = "$backBuffer";
pixVersion = 2.0;
};
@ -44,6 +50,6 @@ singleton PostEffect( VignettePostEffect )
function VignettePostEffect::setShaderConsts(%this)
{
%this.setShaderConst("$radiusX", $VignettePostEffect::RadiusX);
%this.setShaderConst("$radiusY", $VignettePostEffect::RadiusY);
%this.setShaderConst("$Vmax", $VignettePostEffect::VMax);
%this.setShaderConst("$Vmin", $VignettePostEffect::VMin);
}