Skip to content

Split getRoundedColor into two separate parts #6591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Split getRoundedColor into two separate parts #6591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions osu.Framework/Resources/Shaders/sh_Masking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ lowp vec4 getBorderColour()
return mix(top, bottom, relativeTexCoord.y);
}

lowp vec4 getRoundedColor(lowp vec4 texel, mediump vec2 texCoord)
lowp vec4 multiplyByVColour(lowp vec4 colour)
{
if (!g_IsMasking && v_BlendRange == vec2(0.0))
{
return v_Colour * texel;
}
return colour * v_Colour;
}

lowp vec4 applyRounding(lowp vec4 texel, mediump vec2 texCoord)
{
highp float dist = distanceFromRoundedRect(vec2(0.0), g_CornerRadius);
lowp float alphaFactor = 1.0;

Expand Down Expand Up @@ -113,7 +113,7 @@ lowp vec4 getRoundedColor(lowp vec4 texel, mediump vec2 texCoord)
highp float borderStart = 1.0 + fadeStart - g_BorderThickness;
lowp float colourWeight = min(borderStart - dist, 1.0);

lowp vec4 contentColour = v_Colour * texel;
lowp vec4 contentColour = texel;

if (colourWeight == 1.0)
return vec4(contentColour.rgb, contentColour.a * alphaFactor);
Expand All @@ -128,4 +128,11 @@ lowp vec4 getRoundedColor(lowp vec4 texel, mediump vec2 texCoord)
return blend(borderColour, contentColour);
}

lowp vec4 getRoundedColor(lowp vec4 texel, mediump vec2 texCoord)
{
texel = multiplyByVColour(texel);

return applyRounding(texel, texCoord);
}

#endif
Loading