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

Photo.Unload() is now async

Browse Source
This commit is contained in:
Colin McMillen 2023-07-25 22:00:43 -04:00
parent b0fd20cd89
commit 32cb03ab15
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Program.cs
View File

@ -187,9 +187,10 @@ public class Photo {
image = tmp; image = tmp;
} }
public void Unload() { public async void UnloadAsync() {
Loaded = false;
if (texture != placeholder) { if (texture != placeholder) {
texture.Dispose(); await Task.Run( () => { texture.Dispose(); });
texture = placeholder; texture = placeholder;
} }
} }
@ -703,19 +704,15 @@ public class Game : GameWindow {
int maxLoadedImage = Math.Min(photoIndex + 20, photos.Count - 1); int maxLoadedImage = Math.Min(photoIndex + 20, photos.Count - 1);
// First, unload images that are far outside our window. // First, unload images that are far outside our window.
// FIXME: also cancel any in-progress loading tasks that have moved outside our window. // FIXME: also cancel any in-progress loading tasks that have moved outside our window.
Stopwatch stopwatch = new Stopwatch(); // FIXME: maybe use an LRU cache for evicting images?
stopwatch.Start(); // FIXME: keep around thumbnail-sized textures?
foreach (int i in loadedImages) { foreach (int i in loadedImages) {
if (i < minUnloadedImage || i > maxUnloadedImage) { if (i < minUnloadedImage || i > maxUnloadedImage) {
loadedImages.Remove(i);
photos[i].Unload();
// Console.WriteLine("unloading " + i); // Console.WriteLine("unloading " + i);
loadedImages.Remove(i);
photos[i].UnloadAsync();
} }
} }
stopwatch.Stop();
if (stopwatch.Elapsed.TotalMilliseconds > 1) {
Console.WriteLine(stopwatch.Elapsed.TotalMilliseconds);
}
// Then, start loading any images that aren't in our window. // Then, start loading any images that aren't in our window.
for (int i = minLoadedImage; i <= maxLoadedImage; i++) { for (int i = minLoadedImage; i <= maxLoadedImage; i++) {