Merge pull request #338 from karaoke-dev/dependabot/nuget/ppy.osu.Fra…

…mework-2023.403.0 Bump ppy.osu.Framework from 2023.327.0 to 2023.403.0
karaoke-dev · Apr 3, 2023 · 9134b17 · 9134b17
2 parents ec991e6 + de2bf76
commit 9134b17
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/osu.Framework.Font.Tests/Resources/Shaders/sh_CRT.fs b/osu.Framework.Font.Tests/Resources/Shaders/sh_CRT.fs
@@ -58,7 +58,7 @@ void main(void)
 
 	if (insideLens(lensUV))
 	{
-		vec4 lensCol = toSRGB(texture2D(m_Sampler, lensUV * resolution));
+		vec4 lensCol = texture2D(m_Sampler, lensUV * resolution);
 		lensCol = scanlines(lensCol, lensUV);
 		float smoothEdge = smoothLensEdge(lensUV);
 		col = vec4(lensCol.rgb * smoothEdge, clamp(lensCol.a + 1.0 - smoothEdge, 0.0, 1.0));

diff --git a/osu.Framework.Font/Graphics/Shaders/OutlineShader.cs b/osu.Framework.Font/Graphics/Shaders/OutlineShader.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Shaders.Types;
@@ -29,8 +30,8 @@ public override void ApplyValue(IRenderer renderer)
 
         outlineParametersBuffer.Data = new OutlineParameters
         {
-            Colour = new Vector4(Colour.R, Colour.G, Colour.B, Colour.A),
-            OutlineColour = new Vector4(OutlineColour.R, OutlineColour.G, OutlineColour.B, OutlineColour.A),
+            Colour = new Vector4(Colour.ToSRGB().R, Colour.ToSRGB().G, Colour.ToSRGB().B, Colour.ToSRGB().A),
+            OutlineColour = new Vector4(OutlineColour.ToSRGB().R, OutlineColour.ToSRGB().G, OutlineColour.ToSRGB().B, OutlineColour.ToSRGB().A),
             Radius = Radius,
         };
 

diff --git a/osu.Framework.Font/Graphics/Shaders/ShadowShader.cs b/osu.Framework.Font/Graphics/Shaders/ShadowShader.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Extensions;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
@@ -28,7 +29,7 @@ public override void ApplyValue(IRenderer renderer)
 
         shadowParametersBuffer.Data = new ShadowParameters
         {
-            Colour = new Vector4(ShadowColour.R, ShadowColour.G, ShadowColour.B, ShadowColour.A),
+            Colour = new Vector4(ShadowColour.ToSRGB().R, ShadowColour.ToSRGB().G, ShadowColour.ToSRGB().B, ShadowColour.ToSRGB().A),
             Offset = renderer.ToShaderVector2(ShadowOffset),
         };
 

diff --git a/osu.Framework.Font/Resources/Shaders/sh_Outline.fs b/osu.Framework.Font/Resources/Shaders/sh_Outline.fs
@@ -68,7 +68,7 @@ lowp vec4 outline(float radius, mediump vec2 texCoord, mediump vec2 texSize, med
 
 void main(void)
 {
-	lowp vec4 texColour = toSRGB(texture(sampler2D(m_Texture, m_Sampler), v_TexCoord));
+	lowp vec4 texColour = texture(sampler2D(m_Texture, m_Sampler), v_TexCoord);
 	lowp vec4 originColour = vec4(mix(texColour.rgb, g_Colour.rgb, g_Colour.a), texColour.a);
 	lowp vec4 outlineColour = outline(g_Radius * g_InflationPercentage, v_TexCoord, g_TexSize, g_OutlineColour);
 

diff --git a/osu.Framework.Font/Resources/Shaders/sh_Pixel.fs b/osu.Framework.Font/Resources/Shaders/sh_Pixel.fs
@@ -21,5 +21,5 @@ void main(void)
 	uv = uv * separaorParts;
     uv = floor(uv);
     uv = uv / separaorParts;
-    o_Colour = toSRGB(texture(sampler2D(m_Texture, m_Sampler), uv));
+    o_Colour = texture(sampler2D(m_Texture, m_Sampler), uv);
 }
diff --git a/osu.Framework.Font/Resources/Shaders/sh_Rainbow.fs b/osu.Framework.Font/Resources/Shaders/sh_Rainbow.fs
@@ -22,7 +22,7 @@ layout(location = 0) out vec4 o_Colour;
 void main(void)
 {
 	float pos = (v_TexCoord.y - g_Uv[0]) / (g_Uv[1] - g_Uv[0]);
-	vec4 texColor = toSRGB(texture(sampler2D(m_Texture, m_Sampler), v_TexCoord));
+	vec4 texColor = texture(sampler2D(m_Texture, m_Sampler), v_TexCoord);
 
 	vec4 col = vec4(g_Section * ((g_Time * g_Speed) + pos), g_Saturation, g_Brightness, 1);
 	vec4 finalCol = mix(texColor, vec4(hsv2rgb(col).xyz, texColor.a), g_Mix);

diff --git a/osu.Framework.Font/Resources/Shaders/sh_RepeatMovingBackground.fs b/osu.Framework.Font/Resources/Shaders/sh_RepeatMovingBackground.fs
@@ -39,5 +39,5 @@ void main(void) {
     // get point colour from sample.
     vec4 texColor = texture(sampler2D(m_Texture, m_Sampler), v_TexCoord);
     vec4 repeatSampleColor = v_Colour * vec4(texture(sampler2D(m_RepeatTexture, m_RepeatSampler), fixedTexCoord).xyz, texColor.a);
-    o_Colour = toSRGB(mix(texColor, repeatSampleColor, g_Mix));
+    o_Colour = mix(texColor, repeatSampleColor, g_Mix);
 }
diff --git a/osu.Framework.Font/Resources/Shaders/sh_Shadow.fs b/osu.Framework.Font/Resources/Shaders/sh_Shadow.fs
@@ -21,7 +21,7 @@ lowp vec4 shadow(texture2D tex, mediump vec2 texCoord, mediump vec2 texSize, med
 
 void main(void)
 {
-	lowp vec4 texture = toSRGB(texture(sampler2D(m_Texture, m_Sampler), v_TexCoord));
+	lowp vec4 texture = texture(sampler2D(m_Texture, m_Sampler), v_TexCoord);
 	lowp vec4 shadow = shadow(m_Texture, v_TexCoord, g_TexSize, g_Colour, g_Offset * g_InflationPercentage);
 	o_Colour = mix(shadow, texture, texture.a);
 }
diff --git a/osu.Framework.Font/osu.Framework.Font.csproj b/osu.Framework.Font/osu.Framework.Font.csproj
@@ -28,7 +28,7 @@
     <NeutralLanguage>en</NeutralLanguage>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework" Version="2023.327.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.403.0" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\**\*" />