Skip to content

Linear color space #24

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

Open
all-iver wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Linear color space #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db3222a
Send linear colors to the material
all-iver Jul 7, 2022
5cec2d3
Revert part of the last commit that accidentally contained old code
all-iver Jul 7, 2022
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
17 changes: 14 additions & 3 deletions Assets/Shapes2D/Scripts/Shape.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,13 +826,24 @@ void ApplyShaderPropertiesToMaterial(Material material, bool disableBlending = f
material.SetFloat("_YScale", shaderSettings.yScale);
material.SetFloat("_OutlineSize", shaderSettings.outlineSize);
material.SetFloat("_Blur", shaderSettings.blur);
material.SetColor("_OutlineColor", shaderSettings.outlineColor);
// Colors from the inspector are in sRGB, but I found a unity forum post that says Unity is supposed to
// convert to linear when you call material.SetColor(). however, we're not getting correct colors in
// linear color space unless we convert to linear here, so I'm not sure where it's going wrong.
var outlineColor = shaderSettings.outlineColor;
var fillColor = shaderSettings.fillColor;
var fillColor2 = shaderSettings.fillColor2;
if (QualitySettings.activeColorSpace == ColorSpace.Linear) {
outlineColor = outlineColor.linear;
fillColor = fillColor.linear;
fillColor2 = fillColor2.linear;
}
material.SetColor("_OutlineColor", outlineColor);
if (shaderSettings.fillType >= FillType.SolidColor
&& shaderSettings.fillType < FillType.Texture)
material.SetColor("_FillColor", shaderSettings.fillColor);
material.SetColor("_FillColor", fillColor);
if (shaderSettings.fillType >= FillType.Gradient
&& shaderSettings.fillType < FillType.Texture)
material.SetColor("_FillColor2", shaderSettings.fillColor2);
material.SetColor("_FillColor2", fillColor2);
if (shaderSettings.fillType > FillType.SolidColor) {
material.SetFloat("_FillRotation", shaderSettings.fillRotation);
material.SetFloat("_FillOffsetX", shaderSettings.fillOffset.x);
Expand Down