Skip to content
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

Feature/446 image sharp 2.0 #466

Merged
merged 20 commits into from
Apr 19, 2022
Merged

Feature/446 image sharp 2.0 #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
db4f0ba
Font rendering works
RedImp1470 Mar 17, 2022
ca07661
ITexture no longer implements IImageData
RedImp1470 Mar 18, 2022
cb15c4b
Images working as expected
RedImp1470 Mar 18, 2022
a858630
Minimized font atlas size
RedImp1470 Mar 18, 2022
71db489
RenderTests are using SixLabors.ImageSharp
RedImp1470 Mar 25, 2022
779746c
Merge branch 'develop' into feature/446-ImageSharp-2.0
RedImp1470 Mar 25, 2022
178bd11
Merge branch 'develop' into feature/446-ImageSharp-2.0
RedImp1470 Mar 30, 2022
8761fa4
Fixedd merge errors
RedImp1470 Mar 30, 2022
0bff276
RCI changes due to commit ca0766
RedImp1470 Mar 31, 2022
bea5a37
Blazor FileDecoder
RedImp1470 Mar 31, 2022
c011566
Blazor FileDecoder: fixed rgb/brg issue
RedImp1470 Mar 31, 2022
df0d33b
Desktop imp: removed bgr conversion
RedImp1470 Mar 31, 2022
cba53d9
Desktop FileDecoder doesn't copy the stream
RedImp1470 Mar 31, 2022
b322f8d
Linting
RedImp1470 Mar 31, 2022
3162c63
TexturePixelInfo: added row alignment
RedImp1470 Apr 6, 2022
738817e
RC/ RCI Blazor: removed try catch from Render() / gl to gl2
RedImp1470 Apr 6, 2022
5ea8136
Lets see if blazor builds on win-2022
ASPePeX Apr 6, 2022
cd99922
Merge branch 'develop' into feature/446-ImageSharp-2.0
ASPePeX Apr 12, 2022
aafcddc
Merge fix
ASPePeX Apr 12, 2022
8b31b94
Removed Blazor Windows builds
ASPePeX Apr 19, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ 'windows-2019', 'ubuntu-latest', 'macos-latest' ]
os: [ 'ubuntu-latest', 'macos-latest' ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
103 changes: 0 additions & 103 deletions Examples/Complete/Camera/Blazor/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
using Fusee.Serialization;
using Microsoft.JSInterop;
using ProtoBuf;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using System;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Path = System.IO.Path;
using Stream = System.IO.Stream;
Expand Down Expand Up @@ -83,105 +79,6 @@ public override void Run()
return Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase);
}
});

// Image handler
fap.RegisterTypeHandler(new AssetHandler
{
ReturnedType = typeof(Base.Core.ImageData),
Decoder = (_, __) => throw new NotImplementedException("Non-async decoder isn't supported in Blazor builds"),
DecoderAsync = async (string id, object storage) =>
{
var ext = Path.GetExtension(id).ToLower();

try
{
//using var ms = new MemoryStream();
//((Stream)storage).CopyTo(ms);
using var image = await Image.LoadAsync((Stream)storage);

image.Mutate(x => x.AutoOrient());
image.Mutate(x => x.RotateFlip(RotateMode.None, FlipMode.Vertical));
var ret = ReadPixels(image);

return ret;

// inner method to prevent Span<T> inside async method error
static ImageData ReadPixels(Image image)
{
var bpp = image.PixelType.BitsPerPixel;

switch (image.PixelType.BitsPerPixel)
{
case 16:
{
(image as Image<Rg32>).TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rg32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.Depth16));
}
case 24:
{
var rgb = image as Image<Rgb24>;

rgb.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgb24>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.RGB));
}
case 32:
{
var rgba = image as Image<Rgba32>;

rgba.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.RGBA));
}
case 48:
{
var rgba = image as Image<Rgba32>;

rgba.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.fRGB32));
}
case 64:
{
(image as Image<Rgba64>).TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba64>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.fRGBA32));
}
default:
{
Console.WriteLine($"Error converting! {bpp}");

throw new ArgumentException($"{bpp} Bits per pixel not supported!");

}
}
};
}
catch (Exception ex)
{
Console.WriteLine($"Error loading/converting image {id} {ex}");
Diagnostics.Error($"Error loading/converting image {id}", ex);

// return empty 1x1 image
return new ImageData(new byte[] { 0, 0, 0, 1, 0, 0, 0, 1 }, 1, 1,
new ImagePixelFormat(ColorFormat.RGBA));

}

},
Checker = (string id) =>
{
var ext = Path.GetExtension(id).ToLower();
return true;
}
});

AssetStorage.RegisterProvider(fap);

#endregion
Expand Down
103 changes: 0 additions & 103 deletions Examples/Complete/Deferred/Blazor/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
using Fusee.Serialization;
using Microsoft.JSInterop;
using ProtoBuf;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using System;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Path = System.IO.Path;
using Stream = System.IO.Stream;
Expand Down Expand Up @@ -86,105 +82,6 @@ public override void Run()
return Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase);
}
});

// Image handler
fap.RegisterTypeHandler(new AssetHandler
{
ReturnedType = typeof(Base.Core.ImageData),
Decoder = (_, __) => throw new NotImplementedException("Non-async decoder isn't supported in Blazor builds"),
DecoderAsync = async (string id, object storage) =>
{
var ext = Path.GetExtension(id).ToLower();

try
{
//using var ms = new MemoryStream();
//((Stream)storage).CopyTo(ms);
using var image = await Image.LoadAsync((Stream)storage);

image.Mutate(x => x.AutoOrient());
image.Mutate(x => x.RotateFlip(RotateMode.None, FlipMode.Vertical));
var ret = ReadPixels(image);

return ret;

// inner method to prevent Span<T> inside async method error
static ImageData ReadPixels(Image image)
{
var bpp = image.PixelType.BitsPerPixel;

switch (image.PixelType.BitsPerPixel)
{
case 16:
{
(image as Image<Rg32>).TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rg32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.Depth16));
}
case 24:
{
var rgb = image as Image<Rgb24>;

rgb.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgb24>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.RGB));
}
case 32:
{
var rgba = image as Image<Rgba32>;

rgba.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.RGBA));
}
case 48:
{
var rgba = image as Image<Rgba32>;

rgba.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.fRGB32));
}
case 64:
{
(image as Image<Rgba64>).TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba64>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.fRGBA32));
}
default:
{
Console.WriteLine($"Error converting! {bpp}");

throw new ArgumentException($"{bpp} Bits per pixel not supported!");

}
}
};
}
catch (Exception ex)
{
Console.WriteLine($"Error loading/converting image {id} {ex}");
Diagnostics.Error($"Error loading/converting image {id}", ex);

// return empty 1x1 image
return new ImageData(new byte[] { 0, 0, 0, 1, 0, 0, 0, 1 }, 1, 1,
new ImagePixelFormat(ColorFormat.RGBA));

}

},
Checker = (string id) =>
{
var ext = Path.GetExtension(id).ToLower();
return true;
}
});

AssetStorage.RegisterProvider(fap);

#endregion
Expand Down
103 changes: 0 additions & 103 deletions Examples/Complete/Picking/Blazor/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
using Fusee.Serialization;
using Microsoft.JSInterop;
using ProtoBuf;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using System;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Path = System.IO.Path;
using Stream = System.IO.Stream;
Expand Down Expand Up @@ -86,105 +82,6 @@ public override void Run()
return Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase);
}
});

// Image handler
fap.RegisterTypeHandler(new AssetHandler
{
ReturnedType = typeof(Base.Core.ImageData),
Decoder = (_, __) => throw new NotImplementedException("Non-async decoder isn't supported in Blazor builds"),
DecoderAsync = async (string id, object storage) =>
{
var ext = Path.GetExtension(id).ToLower();

try
{
//using var ms = new MemoryStream();
//((Stream)storage).CopyTo(ms);
using var image = await Image.LoadAsync((Stream)storage);

image.Mutate(x => x.AutoOrient());
image.Mutate(x => x.RotateFlip(RotateMode.None, FlipMode.Vertical));
var ret = ReadPixels(image);

return ret;

// inner method to prevent Span<T> inside async method error
static ImageData ReadPixels(Image image)
{
var bpp = image.PixelType.BitsPerPixel;

switch (image.PixelType.BitsPerPixel)
{
case 16:
{
(image as Image<Rg32>).TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rg32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.Depth16));
}
case 24:
{
var rgb = image as Image<Rgb24>;

rgb.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgb24>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.RGB));
}
case 32:
{
var rgba = image as Image<Rgba32>;

rgba.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.RGBA));
}
case 48:
{
var rgba = image as Image<Rgba32>;

rgba.TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba32>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.fRGB32));
}
case 64:
{
(image as Image<Rgba64>).TryGetSinglePixelSpan(out var res);
var resBytes = MemoryMarshal.AsBytes<Rgba64>(res.ToArray());
return new ImageData(resBytes.ToArray(), image.Width, image.Height,
new ImagePixelFormat(ColorFormat.fRGBA32));
}
default:
{
Console.WriteLine($"Error converting! {bpp}");

throw new ArgumentException($"{bpp} Bits per pixel not supported!");

}
}
};
}
catch (Exception ex)
{
Console.WriteLine($"Error loading/converting image {id} {ex}");
Diagnostics.Error($"Error loading/converting image {id}", ex);

// return empty 1x1 image
return new ImageData(new byte[] { 0, 0, 0, 1, 0, 0, 0, 1 }, 1, 1,
new ImagePixelFormat(ColorFormat.RGBA));

}

},
Checker = (string id) =>
{
var ext = Path.GetExtension(id).ToLower();
return true;
}
});

AssetStorage.RegisterProvider(fap);

#endregion
Expand Down
Loading