aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-15 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore helper method to create dummy texture

Browse Source 
This is actually used in osu! tests, and I'd rather this PR be
non-breaking.
This commit is contained in:
Dan Balasescu
2024-08-08 13:52:14 +09:00
parent 19775809b7
commit ab6d9056c3
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Framework.Benchmarks/BenchmarkTextBuilder.cs
View File

@@ -5,9 +5,7 @@ using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
using osu.Framework.Graphics.Rendering.Dummy;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Text;
using osuTK.Graphics;
namespace osu.Framework.Benchmarks
{
@@ -51,7 +49,7 @@ namespace osu.Framework.Benchmarks
{
public ITexturedCharacterGlyph Get(string? fontName, char character) => new TexturedCharacterGlyph(
new CharacterGlyph(character, character, character, character, character, null),
new DummyRenderer().CreateTexture(1, 1, true, TextureFilteringMode.Linear, WrapMode.None, WrapMode.None, Color4.White));
new DummyRenderer().CreateTexture(1, 1));
public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run<ITexturedCharacterGlyph?>(() => Get(fontName, character));
}

8
osu.Framework.Tests/Graphics/TextureRegionTest.cs
View File

@@ -4,8 +4,6 @@
using NUnit.Framework;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Rendering.Dummy;
using osu.Framework.Graphics.Textures;
using osuTK.Graphics;
namespace osu.Framework.Tests.Graphics
{
@@ -15,7 +13,7 @@ namespace osu.Framework.Tests.Graphics
[Test]
public void TestRegionHasCorrectSize()
{
var tex = new DummyRenderer().CreateTexture(100, 100, true, TextureFilteringMode.Linear, WrapMode.None, WrapMode.None, Color4.White);
var tex = new DummyRenderer().CreateTexture(100, 100);
Assert.That(tex.Width, Is.EqualTo(100));
Assert.That(tex.Height, Is.EqualTo(100));
@@ -35,7 +33,7 @@ namespace osu.Framework.Tests.Graphics
[Test]
public void TestRegionHasCorrectSizeWithOffset()
{
var tex = new DummyRenderer().CreateTexture(100, 100, true, TextureFilteringMode.Linear, WrapMode.None, WrapMode.None, Color4.White);
var tex = new DummyRenderer().CreateTexture(100, 100);
Assert.That(tex.Width, Is.EqualTo(100));
Assert.That(tex.Height, Is.EqualTo(100));
@@ -55,7 +53,7 @@ namespace osu.Framework.Tests.Graphics
[Test]
public void TestScaleAdjustOnlyAffectsDisplaySize()
{
var tex = new DummyRenderer().CreateTexture(100, 100, true, TextureFilteringMode.Linear, WrapMode.None, WrapMode.None, Color4.White);
var tex = new DummyRenderer().CreateTexture(100, 100);
tex.ScaleAdjust = 2;
Assert.That(tex.Width, Is.EqualTo(100));

3
osu.Framework.Tests/Text/TextBuilderTest.cs
View File

@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.IO.Stores;
using osu.Framework.Text;
using osuTK;
using osuTK.Graphics;
namespace osu.Framework.Tests.Text
{
@@ -676,7 +675,7 @@ namespace osu.Framework.Tests.Text
private readonly struct TestGlyph : ITexturedCharacterGlyph
{
public Texture Texture => new DummyRenderer().CreateTexture(1, 1, true, TextureFilteringMode.Linear, WrapMode.None, WrapMode.None, Color4.White);
public Texture Texture => new DummyRenderer().CreateTexture(1, 1);
public float XOffset { get; }
public float YOffset { get; }
public float XAdvance { get; }

3
osu.Framework/Graphics/Rendering/Dummy/DummyRenderer.cs
View File

@@ -43,6 +43,9 @@ namespace osu.Framework.Graphics.Rendering.Dummy
protected override IShaderStorageBufferObject<TData> CreateShaderStorageBufferObject<TData>(int uboSize, int ssboSize)
=> new DummyShaderStorageBufferObject<TData>(ssboSize);
public Texture CreateTexture(int width, int height, bool manualMipmaps = false, TextureFilteringMode filteringMode = TextureFilteringMode.Linear, WrapMode wrapModeS = WrapMode.None)
=> base.CreateTexture(width, height, manualMipmaps, filteringMode, wrapModeS, wrapModeS, null);
protected override INativeTexture CreateNativeTexture(int width, int height, bool manualMipmaps = false, TextureFilteringMode filteringMode = TextureFilteringMode.Linear,
Color4? initialisationColour = null)
=> new DummyNativeTexture(this);