de5e72f3a4
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request - Scale the retro terminal effects (#3468) scan lines with the screen's DPI. - Remove artifacts from sampling wrap around. Before & after, with my display scale set to 350%:  Before & after showing artifact removal, with my display scale set to 100%, and image enlarged to 400%:  <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [x] Closes #4362 * [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Requires documentation to be updated * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments Adds a constant buffer, which could be used for other settings for the retro terminal pixel shader. I haven't touched C++ in over a decade before this change, and this is the first time I've played with DirectX, so please assume my code isn't exactly best practice. 🙂 <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed - Changed display scale with experimental.retroTerminalEffect enabled, enjoyed scan lines on high resolution monitors. - Enabled experimental.retroTerminalEffect, turned the setting off, changed display scale. Retro tabs still scale scan lines.
88 lines
2.1 KiB
C
88 lines
2.1 KiB
C
#pragma once
|
|
|
|
#ifdef __INSIDE_WINDOWS
|
|
const char screenPixelShaderString[] = "";
|
|
#else
|
|
const char screenPixelShaderString[] = R"(
|
|
Texture2D shaderTexture;
|
|
SamplerState samplerState;
|
|
|
|
cbuffer PixelShaderSettings
|
|
{
|
|
float ScaledScanLinePeriod;
|
|
float ScaledGaussianSigma;
|
|
};
|
|
|
|
#define SCANLINE_FACTOR 0.5
|
|
|
|
static const float M_PI = 3.14159265f;
|
|
|
|
float Gaussian2D(float x, float y, float sigma)
|
|
{
|
|
return 1/(sigma*sqrt(2*M_PI)) * exp(-0.5*(x*x + y*y)/sigma/sigma);
|
|
}
|
|
|
|
float4 Blur(Texture2D input, float2 tex_coord, float sigma)
|
|
{
|
|
uint width, height;
|
|
shaderTexture.GetDimensions(width, height);
|
|
|
|
float texelWidth = 1.0f/width;
|
|
float texelHeight = 1.0f/height;
|
|
|
|
float4 color = { 0, 0, 0, 0 };
|
|
|
|
int sampleCount = 13;
|
|
|
|
for (int x = 0; x < sampleCount; x++)
|
|
{
|
|
float2 samplePos = { 0, 0 };
|
|
|
|
samplePos.x = tex_coord.x + (x - sampleCount/2) * texelWidth;
|
|
for (int y = 0; y < sampleCount; y++)
|
|
{
|
|
samplePos.y = tex_coord.y + (y - sampleCount/2) * texelHeight;
|
|
if (samplePos.x <= 0 || samplePos.y <= 0 || samplePos.x >= width || samplePos.y >= height) continue;
|
|
|
|
color += input.Sample(samplerState, samplePos) * Gaussian2D((x - sampleCount/2), (y - sampleCount/2), sigma);
|
|
}
|
|
}
|
|
|
|
return color;
|
|
}
|
|
|
|
float SquareWave(float y)
|
|
{
|
|
return 1 - (floor(y / ScaledScanLinePeriod) % 2) * SCANLINE_FACTOR;
|
|
}
|
|
|
|
float4 Scanline(float4 color, float4 pos)
|
|
{
|
|
float wave = SquareWave(pos.y);
|
|
|
|
// TODO:GH#3929 make this configurable.
|
|
// Remove the && false to draw scanlines everywhere.
|
|
if (length(color.rgb) < 0.2 && false)
|
|
{
|
|
return color + wave*0.1;
|
|
}
|
|
else
|
|
{
|
|
return color * wave;
|
|
}
|
|
}
|
|
|
|
float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
|
|
{
|
|
Texture2D input = shaderTexture;
|
|
|
|
// TODO:GH#3930 Make these configurable in some way.
|
|
float4 color = input.Sample(samplerState, tex);
|
|
color += Blur(input, tex, ScaledGaussianSigma)*0.3;
|
|
color = Scanline(color, pos);
|
|
|
|
return color;
|
|
}
|
|
)";
|
|
#endif
|