semicolin/totte
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

load Photos more async'ly

Browse Source
This commit is contained in:
Colin McMillen 2023-07-17 02:44:34 -04:00
parent faee485b5c
commit 0bc0d97122
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Program.cs
View File

@ -135,33 +135,39 @@ void main() {
public int GetUniformLocation(string name) { public int GetUniformLocation(string name) {
return GL.GetUniformLocation(Handle, name); return GL.GetUniformLocation(Handle, name);
} }
} }
// FIXME: this should probably be IDisposable?
public class Photo { public class Photo {
private string file;
private Texture texture; private Texture texture;
private Texture placeholder; private Texture placeholder;
private Image<Rgba32> image; private Image<Rgba32>? image = null;
public Photo(Image<Rgba32> image, Texture placeholder) { public Photo(string file, Texture placeholder) {
this.image = image; this.file = file;
this.placeholder = placeholder; this.placeholder = placeholder;
texture = placeholder; texture = placeholder;
}
public async void Load() {
image = await Image.LoadAsync<Rgba32>(file);
ExifProfile? exifs = image.Metadata.ExifProfile; ExifProfile? exifs = image.Metadata.ExifProfile;
if (exifs != null) { if (exifs != null) {
foreach (IExifValue exif in exifs.Values) { foreach (IExifValue exif in exifs.Values) {
if (exif.Tag.ToString() == "Model") { if (exif.Tag.ToString() == "Model") {
Console.WriteLine($"{exif.Tag}: {exif.GetValue()}"); Console.WriteLine($"{file} {exif.Tag}: {exif.GetValue()}");
} }
} }
} }
} }
public Texture Texture() { public Texture Texture() {
if (texture == placeholder) { if (texture == placeholder && image != null) {
Console.WriteLine("making texture for " + file);
texture = new Texture(image); texture = new Texture(image);
image.Dispose(); image.Dispose();
image = null;
} }
return texture; return texture;
} }
@ -177,6 +183,7 @@ public class Texture : IDisposable {
image.CopyPixelDataTo(pixelBytes); image.CopyPixelDataTo(pixelBytes);
Handle = GL.GenTexture(); Handle = GL.GenTexture();
Console.WriteLine("GL.GenTexture #" + Handle);
GL.ActiveTexture(TextureUnit.Texture0); GL.ActiveTexture(TextureUnit.Texture0);
GL.BindTexture(TextureTarget.Texture2D, Handle); GL.BindTexture(TextureTarget.Texture2D, Handle);
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, Size.X, Size.Y, 0, PixelFormat.Rgba, PixelType.UnsignedByte, pixelBytes); GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, Size.X, Size.Y, 0, PixelFormat.Rgba, PixelType.UnsignedByte, pixelBytes);
@ -223,7 +230,7 @@ public class UiGeometry {
public UiGeometry(Vector2i windowSize) { public UiGeometry(Vector2i windowSize) {
WindowSize = windowSize; WindowSize = windowSize;
int numThumbnails = 20; int numThumbnails = 10;
int thumbnailHeight = WindowSize.Y / numThumbnails; int thumbnailHeight = WindowSize.Y / numThumbnails;
int thumbnailWidth = (int) 1.0 * thumbnailHeight * activeCamera.Resolution.X / activeCamera.Resolution.Y; int thumbnailWidth = (int) 1.0 * thumbnailHeight * activeCamera.Resolution.X / activeCamera.Resolution.Y;
for (int i = 0; i < numThumbnails; i++) { for (int i = 0; i < numThumbnails; i++) {
@ -261,7 +268,6 @@ public class Game : GameWindow {
1, 2, 3 // second triangle 1, 2, 3 // second triangle
}; };
bool doneLoading = false;
int VertexBufferObject; int VertexBufferObject;
int ElementBufferObject; int ElementBufferObject;
int VertexArrayObject; int VertexArrayObject;
@ -355,22 +361,15 @@ public class Game : GameWindow {
string[] files = Directory.GetFiles(@"c:\users\colin\pictures\photos\2023\07\14\"); string[] files = Directory.GetFiles(@"c:\users\colin\pictures\photos\2023\07\14\");
//string[] files = Directory.GetFiles(@"C:\Users\colin\Pictures\photos\2018\06\23"); //string[] files = Directory.GetFiles(@"C:\Users\colin\Pictures\photos\2018\06\23");
List<Task<Image<Rgba32>>> imageTasks = new();
for (int i = 0; i < files.Count(); i++) { for (int i = 0; i < files.Count(); i++) {
string file = files[i]; string file = files[i];
if (file.ToLower().EndsWith(".jpg")) { if (file.ToLower().EndsWith(".jpg")) {
imageTasks.Add(Image.LoadAsync<Rgba32>(file)); Photo photo = new Photo(file, TEXTURE_WHITE);
photos.Add(photo);
await Task.Run( () => { photo.Load(); });
Console.WriteLine("file " + i);
} }
} }
Console.WriteLine(DateTime.Now);
await Task.WhenAll(imageTasks);
Console.WriteLine(DateTime.Now);
foreach (Task<Image<Rgba32>> task in imageTasks) {
Photo photo = new(task.Result, TEXTURE_WHITE);
photos.Add(photo);
}
doneLoading = true;
} }
protected override void OnUnload() { protected override void OnUnload() {
@ -379,9 +378,6 @@ public class Game : GameWindow {
protected override void OnRenderFrame(FrameEventArgs e) { protected override void OnRenderFrame(FrameEventArgs e) {
base.OnRenderFrame(e); base.OnRenderFrame(e);
if (!doneLoading) {
return;
}
GL.Clear(ClearBufferMask.ColorBufferBit); GL.Clear(ClearBufferMask.ColorBufferBit);
GL.BindBuffer(BufferTarget.ArrayBuffer, VertexBufferObject); GL.BindBuffer(BufferTarget.ArrayBuffer, VertexBufferObject);