Skip to content

Type raw texture payload variants #356

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

Closed
esnya wants to merge 1 commit into from
Closed

Type raw texture payload variants #356

Show file tree
Hide file tree
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
204 changes: 169 additions & 35 deletions src/PlateauResoniteLink/Application/Importing/TextureImportSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,78 @@

namespace PlateauResoniteLink.Application.Importing;

public enum RawTexturePayloadFormat
public abstract class RawTexturePayload
{
Rgba32 = 0,
RgbaFloat32 = 1,
private protected RawTexturePayload(
int width,
int height,
string? colorProfile,
byte[] bytes)
{
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(width);
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(height);
ArgumentNullException.ThrowIfNull(bytes);

Width = width;
Height = height;
ColorProfile = colorProfile;
Bytes = bytes;
}

public int Width { get; }

public int Height { get; }

public string? ColorProfile { get; }

public byte[] Bytes { get; }

public abstract TResult Match<TResult>(
Func<Rgba32RawTexturePayload, TResult> rgba32,
Func<RgbaFloat32RawTexturePayload, TResult> rgbaFloat32);
}

public sealed record RawTexturePayload(
int Width,
int Height,
string? ColorProfile,
byte[] Bytes,
RawTexturePayloadFormat Format = RawTexturePayloadFormat.Rgba32);
public sealed class Rgba32RawTexturePayload : RawTexturePayload
{
public Rgba32RawTexturePayload(
int width,
int height,
string? colorProfile,
byte[] bytes)
: base(width, height, colorProfile, bytes)
{
}

public override TResult Match<TResult>(
Func<Rgba32RawTexturePayload, TResult> rgba32,
Func<RgbaFloat32RawTexturePayload, TResult> rgbaFloat32)
{
ArgumentNullException.ThrowIfNull(rgba32);
ArgumentNullException.ThrowIfNull(rgbaFloat32);
return rgba32(this);
}
}

public sealed class RgbaFloat32RawTexturePayload : RawTexturePayload
{
public RgbaFloat32RawTexturePayload(
int width,
int height,
string? colorProfile,
byte[] bytes)
: base(width, height, colorProfile, bytes)
{
}

public override TResult Match<TResult>(
Func<Rgba32RawTexturePayload, TResult> rgba32,
Func<RgbaFloat32RawTexturePayload, TResult> rgbaFloat32)
{
ArgumentNullException.ThrowIfNull(rgba32);
ArgumentNullException.ThrowIfNull(rgbaFloat32);
return rgbaFloat32(this);
}
}

public interface ITextureImportSource
{
Expand All @@ -32,9 +92,14 @@ public interface ITextureImportSource
long? EstimatedByteLength { get; }
}

internal interface IRawTexturePayloadSource : ITextureImportSource
internal interface IRgba32RawTexturePayloadSource : ITextureImportSource
{
ValueTask<RawTexturePayload> MaterializeRawAsync(CancellationToken cancellationToken);
ValueTask<Rgba32RawTexturePayload> MaterializeRgba32Async(CancellationToken cancellationToken);
}

internal interface IRgbaFloat32RawTexturePayloadSource : ITextureImportSource
{
ValueTask<RgbaFloat32RawTexturePayload> MaterializeRgbaFloat32Async(CancellationToken cancellationToken);
}

internal static class TextureImportSourceMaterializer
Expand All @@ -44,17 +109,50 @@ public static ValueTask<RawTexturePayload> MaterializeRawAsync(
CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(source);
if (source is not IRawTexturePayloadSource rawSource)
if (source is IRgba32RawTexturePayloadSource rgba32Source)
{
return new ValueTask<RawTexturePayload>(MaterializeRgba32AsRawAsync(rgba32Source, cancellationToken));
}

if (source is IRgbaFloat32RawTexturePayloadSource rgbaFloat32Source)
{
return new ValueTask<RawTexturePayload>(MaterializeRgbaFloat32AsRawAsync(rgbaFloat32Source, cancellationToken));
}

throw new InvalidOperationException(
$"Texture import source '{source.GetType().Name}' cannot materialize a raw texture payload.");

static async Task<RawTexturePayload> MaterializeRgba32AsRawAsync(
IRgba32RawTexturePayloadSource source,
CancellationToken cancellationToken)
{
return await source.MaterializeRgba32Async(cancellationToken);
}

static async Task<RawTexturePayload> MaterializeRgbaFloat32AsRawAsync(
IRgbaFloat32RawTexturePayloadSource source,
CancellationToken cancellationToken)
{
return await source.MaterializeRgbaFloat32Async(cancellationToken);
}
}

public static ValueTask<Rgba32RawTexturePayload> MaterializeRgba32Async(
ITextureImportSource source,
CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(source);
if (source is not IRgba32RawTexturePayloadSource rgba32Source)
{
throw new InvalidOperationException(
$"Texture import source '{source.GetType().Name}' cannot materialize a raw texture payload.");
$"Texture import source '{source.GetType().Name}' cannot materialize an RGBA32 texture payload.");
}

return rawSource.MaterializeRawAsync(cancellationToken);
return rgba32Source.MaterializeRgba32Async(cancellationToken);
}
}

internal sealed class InMemoryRawTextureImportSource : IRawTexturePayloadSource
internal sealed class InMemoryRawTextureImportSource : IRgba32RawTexturePayloadSource
{
private readonly byte[] bytes;

Expand Down Expand Up @@ -88,18 +186,18 @@ public InMemoryRawTextureImportSource(

public long? EstimatedByteLength => bytes.Length;

public ValueTask<RawTexturePayload> MaterializeRawAsync(CancellationToken cancellationToken)
public ValueTask<Rgba32RawTexturePayload> MaterializeRgba32Async(CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
return ValueTask.FromResult(new RawTexturePayload(
return ValueTask.FromResult(new Rgba32RawTexturePayload(
Width,
Height,
ColorProfile,
(byte[])bytes.Clone()));
}
}

internal sealed class InMemoryEncodedTextureImportSource : IRawTexturePayloadSource
internal sealed class InMemoryEncodedTextureImportSource : IRgba32RawTexturePayloadSource
{
private readonly byte[] bytes;

Expand All @@ -123,7 +221,7 @@ public InMemoryEncodedTextureImportSource(

public long? EstimatedByteLength => bytes.Length;

public async ValueTask<RawTexturePayload> MaterializeRawAsync(CancellationToken cancellationToken)
public async ValueTask<Rgba32RawTexturePayload> MaterializeRgba32Async(CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
using MemoryStream stream = new(bytes, writable: false);
Expand All @@ -138,7 +236,7 @@ internal sealed class DatasetTextureImportSource(
IPlateauDatasetContentSource datasetSource,
string relativePath,
string? colorProfile,
string identity) : IRawTexturePayloadSource
string identity) : IRgba32RawTexturePayloadSource
{
public string Identity { get; } = identity;

Expand All @@ -150,7 +248,7 @@ internal sealed class DatasetTextureImportSource(
? lengthSource.TryGetFileLength(relativePath)
: null;

public async ValueTask<RawTexturePayload> MaterializeRawAsync(CancellationToken cancellationToken)
public async ValueTask<Rgba32RawTexturePayload> MaterializeRgba32Async(CancellationToken cancellationToken)
{
await using Stream stream = await datasetSource.OpenReadAsync(relativePath, cancellationToken);
using Image<Rgba32> image = await Image.LoadAsync<Rgba32>(stream, cancellationToken);
Expand All @@ -161,7 +259,7 @@ public async ValueTask<RawTexturePayload> MaterializeRawAsync(CancellationToken
internal sealed class FileTextureImportSource(
string absolutePath,
string colorProfile,
string identity) : IRawTexturePayloadSource
string identity) : IRgba32RawTexturePayloadSource
{
public string Identity { get; } = identity;

Expand All @@ -188,19 +286,40 @@ public long? EstimatedByteLength
}
}

public async ValueTask<RawTexturePayload> MaterializeRawAsync(CancellationToken cancellationToken)
public async ValueTask<Rgba32RawTexturePayload> MaterializeRgba32Async(CancellationToken cancellationToken)
{
using Image<Rgba32> image = await Image.LoadAsync<Rgba32>(absolutePath, cancellationToken);
return TextureImportSourceFactory.CreateRawPayloadFromImage(image, ColorProfile);
}
}

internal sealed class GeneratedTextureImportSource(
Func<CancellationToken, ValueTask<RawTexturePayload>> materializeRawAsync,
internal sealed class GeneratedRgba32TextureImportSource(
Func<CancellationToken, ValueTask<Rgba32RawTexturePayload>> materializeRgba32Async,
string identity,
string description,
string? colorProfile,
long? estimatedByteLength = null) : IRgba32RawTexturePayloadSource
{
public string Identity { get; } = identity;

public string Description { get; } = description;

public string? ColorProfile { get; } = colorProfile;

public long? EstimatedByteLength { get; } = estimatedByteLength;

public ValueTask<Rgba32RawTexturePayload> MaterializeRgba32Async(CancellationToken cancellationToken)
{
return materializeRgba32Async(cancellationToken);
}
}

internal sealed class GeneratedRgbaFloat32TextureImportSource(
Func<CancellationToken, ValueTask<RgbaFloat32RawTexturePayload>> materializeRgbaFloat32Async,
string identity,
string description,
string? colorProfile,
long? estimatedByteLength = null) : IRawTexturePayloadSource
long? estimatedByteLength = null) : IRgbaFloat32RawTexturePayloadSource
{
public string Identity { get; } = identity;

Expand All @@ -210,9 +329,9 @@ internal sealed class GeneratedTextureImportSource(

public long? EstimatedByteLength { get; } = estimatedByteLength;

public ValueTask<RawTexturePayload> MaterializeRawAsync(CancellationToken cancellationToken)
public ValueTask<RgbaFloat32RawTexturePayload> MaterializeRgbaFloat32Async(CancellationToken cancellationToken)
{
return materializeRawAsync(cancellationToken);
return materializeRgbaFloat32Async(cancellationToken);
}
}

Expand Down Expand Up @@ -266,15 +385,30 @@ public static ITextureImportSource CreateFileImage(
identity ?? $"file:{Path.GetFullPath(absolutePath)}:{colorProfile}");
}

public static ITextureImportSource CreateGeneratedImage(
Func<CancellationToken, ValueTask<RawTexturePayload>> materializeRawAsync,
public static ITextureImportSource CreateGeneratedRgba32Image(
Func<CancellationToken, ValueTask<Rgba32RawTexturePayload>> materializeRgba32Async,
string identity,
string description,
string? colorProfile,
long? estimatedByteLength = null)
{
return new GeneratedRgba32TextureImportSource(
materializeRgba32Async,
identity,
description,
colorProfile,
estimatedByteLength);
}

public static ITextureImportSource CreateGeneratedRgbaFloat32Image(
Func<CancellationToken, ValueTask<RgbaFloat32RawTexturePayload>> materializeRgbaFloat32Async,
string identity,
string description,
string? colorProfile,
long? estimatedByteLength = null)
{
return new GeneratedTextureImportSource(
materializeRawAsync,
return new GeneratedRgbaFloat32TextureImportSource(
materializeRgbaFloat32Async,
identity,
description,
colorProfile,
Expand All @@ -290,7 +424,7 @@ public static ITextureImportSource CreateGeneratedImageFromClone(
ArgumentNullException.ThrowIfNull(image);
Image<Rgba32> retainedImage = image.Clone();
object gate = new();
return CreateGeneratedImage(
return CreateGeneratedRgba32Image(
cancellationToken =>
{
cancellationToken.ThrowIfCancellationRequested();
Expand All @@ -305,14 +439,14 @@ public static ITextureImportSource CreateGeneratedImageFromClone(
(long)image.Width * image.Height * 4);
}

public static RawTexturePayload CreateRawPayloadFromImage(
public static Rgba32RawTexturePayload CreateRawPayloadFromImage(
Image<Rgba32> image,
string? colorProfile)
{
ArgumentNullException.ThrowIfNull(image);
byte[] rawBytes = new byte[image.Width * image.Height * 4];
image.CopyPixelDataTo(rawBytes);
return new RawTexturePayload(
return new Rgba32RawTexturePayload(
image.Width,
image.Height,
colorProfile,
Expand Down
18 changes: 8 additions & 10 deletions ...PlateauResoniteLink/Targets/Resonite/Diagnostics/SceneSinkRecordingClientCanonicalDump.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ private static JsonObject CreateImportNode(SceneSinkRecordingClient client)
List<JsonObject> textureNodes = [];
for (int index = 0; index < client.ImportedTexturePayloads.Count; index++)
{
RawTexturePayload texture = client.ImportedTexturePayloads[index];
if (texture.Format != RawTexturePayloadFormat.Rgba32)
if (client.ImportedTexturePayloads[index] is not Rgba32RawTexturePayload texture)
{
continue;
}
Expand All @@ -164,8 +163,7 @@ private static JsonObject CreateImportNode(SceneSinkRecordingClient client)
List<JsonObject> hdrTextureNodes = [];
for (int index = 0; index < client.ImportedTexturePayloads.Count; index++)
{
RawTexturePayload texture = client.ImportedTexturePayloads[index];
if (texture.Format != RawTexturePayloadFormat.RgbaFloat32)
if (client.ImportedTexturePayloads[index] is not RgbaFloat32RawTexturePayload texture)
{
continue;
}
Expand Down Expand Up @@ -398,16 +396,16 @@ private static string CreateMeshToken(ImportMeshRawData mesh)

private static string CreateTextureToken(RawTexturePayload texture)
{
return texture.Format == RawTexturePayloadFormat.RgbaFloat32
? string.Create(
return texture.Match(
rgba32 => string.Create(
CultureInfo.InvariantCulture,
$"hdr-texture:{texture.Width}x{texture.Height}:{HashBytes(texture.Bytes)}")
: string.Create(
$"texture:{rgba32.Width}x{rgba32.Height}:{rgba32.ColorProfile}:{HashBytes(rgba32.Bytes)}"),
rgbaFloat32 => string.Create(
CultureInfo.InvariantCulture,
$"texture:{texture.Width}x{texture.Height}:{texture.ColorProfile}:{HashBytes(texture.Bytes)}");
$"hdr-texture:{rgbaFloat32.Width}x{rgbaFloat32.Height}:{HashBytes(rgbaFloat32.Bytes)}"));
}

private static string CreateHdrTextureToken(RawTexturePayload texture)
private static string CreateHdrTextureToken(RgbaFloat32RawTexturePayload texture)
{
return string.Create(
CultureInfo.InvariantCulture,
Expand Down
Loading
Loading