diff --git a/Atomorph.NET.Demo/Program.cs b/Atomorph.NET.Demo/Program.cs index f926672..e8e03b9 100644 --- a/Atomorph.NET.Demo/Program.cs +++ b/Atomorph.NET.Demo/Program.cs @@ -30,8 +30,8 @@ public static class Program morph.SetDensity(2); // Higher than 1 sets fluid to 0. morph.SetMotion(InterpolationMethod.Spline); morph.SetFading(InterpolationMethod.Perlin); - morph.SetThreads(8); - morph.SetCycleLength(100000); + morph.SetThreads(80); + morph.SetCycleLength(10000); morph.SetFeather(0); morph.SetKeepBackground(false); morph.SetFinite(true); @@ -52,7 +52,6 @@ public static class Program } return 0; - // Add your main logic here } private static bool LoadFiles(Morph morph, Options options) diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0001.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0001.png index c1a5e9a..ce04ee5 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0001.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0001.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0002.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0002.png index fb6779e..4642a89 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0002.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0002.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0003.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0003.png index 4da4ea6..959330f 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0003.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0003.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0004.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0004.png index 196c96d..1999660 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0004.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0004.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0005.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0005.png index 95bb06b..b1a6150 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0005.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0005.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0006.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0006.png index c9a63fd..3cb497b 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0006.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0006.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0007.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0007.png index 7d1cfc3..fa065f1 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0007.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0007.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0008.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0008.png index 7b9fd9d..aefe2ff 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0008.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0008.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0009.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0009.png index a03100c..8861056 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0009.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0009.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0010.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0010.png index c99271d..1de7d39 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0010.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0010.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0011.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0011.png index bf22410..a5f1edc 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0011.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0011.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0012.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0012.png index 2335699..27b794f 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0012.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0012.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0013.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0013.png index 3763894..949629c 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0013.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0013.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0014.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0014.png index 6367dd8..2921660 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0014.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0014.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0015.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0015.png index 0aa7539..7da29d2 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0015.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0015.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0016.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0016.png index 8f9ab7a..8049662 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0016.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0016.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0017.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0017.png index cc26904..f60fbe2 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0017.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0017.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0018.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0018.png index 87408db..bfe861e 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0018.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0018.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0019.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0019.png index 75e1034..e161d26 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0019.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0019.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0020.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0020.png index 411cdb4..d1ff017 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0020.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0020.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0021.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0021.png index 68f9b66..9369c83 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0021.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0021.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0022.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0022.png index f4a4778..18f1408 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0022.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0022.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0023.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0023.png index 19525a3..da50eb4 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0023.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0023.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0024.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0024.png index a30ee9d..e093a1e 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0024.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0024.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0025.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0025.png index cdaf7c7..ff0aca5 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0025.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0025.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0026.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0026.png index a2919f2..e77516d 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0026.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0026.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0027.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0027.png index 91010d9..c517711 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0027.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0027.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0028.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0028.png index 6f57aa7..8c79e84 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0028.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0028.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0029.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0029.png index 868d74e..f8d0bd4 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0029.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0029.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0030.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0030.png index 43cfbda..af036e8 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0030.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0030.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0031.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0031.png index db0d50a..db0e479 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0031.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0031.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0032.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0032.png index 5ee9fc4..8de5aad 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0032.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0032.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0033.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0033.png index 0940035..ac056e3 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0033.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0033.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0034.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0034.png index 48268f9..23e449e 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0034.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0034.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0035.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0035.png index 1fc605c..92285fe 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0035.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0035.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0036.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0036.png index 0140bfb..55ec121 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0036.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0036.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0037.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0037.png index 4be096f..ecdb92b 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0037.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0037.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0038.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0038.png index e7e7aab..a2c6f3a 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0038.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0038.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0039.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0039.png index f62a0b9..1b7d033 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0039.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0039.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0040.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0040.png index 8a9f9fd..fc19dae 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0040.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0040.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0041.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0041.png index 13f0280..2322ec5 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0041.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0041.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0042.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0042.png index 7142e0c..39521d6 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0042.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0042.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0043.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0043.png index 35c87e1..5c01583 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0043.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0043.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0044.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0044.png index d76f4fa..35adcf0 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0044.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0044.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0045.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0045.png index aa0f8b2..2a140f9 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0045.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0045.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0046.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0046.png index 86aefd5..5559cfd 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0046.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0046.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0047.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0047.png index 9840ccb..1bf0607 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0047.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0047.png differ diff --git a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0048.png b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0048.png index 0280824..0e91f0e 100644 Binary files a/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0048.png and b/Atomorph.NET.Demo/Tests/output/test_${TITLE}_0048.png differ diff --git a/Atomorph.NET/AtomorphThread.cs b/Atomorph.NET/AtomorphThread.cs index dad457a..6044cfd 100644 --- a/Atomorph.NET/AtomorphThread.cs +++ b/Atomorph.NET/AtomorphThread.cs @@ -99,7 +99,7 @@ public class AtomorphThread : IDisposable f = new Frame(); _frames[nr] = f; } - + foreach (var fPixel in framePt.Pixels) { f.Pixels[fPixel.Key] = fPixel.Value; @@ -268,7 +268,11 @@ public class AtomorphThread : IDisposable public void Start() { _running = true; - _stepThread = new Thread(Run) { Name = "AtomorphThread", }; + _stepThread = new Thread(Run) + { + Name = "AtomorphThread", + IsBackground = true, + }; _stepThread.Start(); } @@ -530,23 +534,24 @@ public class AtomorphThread : IDisposable #else private static object morph_mutex = new object(); - private static void MorphAsync(Point[][] map, ulong width, ulong height, ulong repeat, uint rngSeed, - ref double gain) + private class GainWrapper { - var random = new PcgRandom((int)rngSeed); + public double Gain { get; set; } + } - ulong y = (ulong)random.Next(0, (int)(height - 1)); + private static async Task MorphAsync(Point[][] map, ulong width, ulong height, ulong repeat, Pcg32Single random, + GainWrapper gain) + { + ulong y = random.GenerateNext((uint)(height - 1)); ulong y_next = (y + 1) % (height); ulong y_prev = (y > 0 ? y - 1 : height - 1); for (ulong i = 0; i < repeat; ++i) { - ulong x1, x2; - x1 = (ulong)random.Next(0, (int)(width - 1)); - do - { - x2 = (ulong)random.Next(0, (int)(width - 1)); - } while (x1 == x2); + ulong x1 = random.GenerateNext((uint)(width - 1)); + ulong x2 = random.GenerateNext((uint)(width - 2)); + if (x2 >= x1) + x2++; var x1_y_prev = map[x1][y_prev]; var x2_y_prev = map[x2][y_prev]; @@ -573,45 +578,52 @@ public class AtomorphThread : IDisposable { if (map[x1][y].Word != x1_y.Word || map[x2][y].Word != x2_y.Word) continue; - var buf = map[x2][y]; - map[x2][y] = map[x1][y]; - map[x1][y] = buf; - gain += c1 - c2; + (map[x2][y], map[x1][y]) = (map[x1][y], map[x2][y]); + gain.Gain += c1 - c2; } } } } + private Task[]? _morphWorkers = null; + private Pcg32Single[]? _morphRandoms = null; private bool Morph() { var ch = _chains[_counter % _blobMapW]; if (ch.Width <= 1) return false; - var map = ch.Points; + var map = ch.Points!; double gain = 0.0; + var gainWrapper = new GainWrapper { Gain = 0.0 }; if (_threadCount == 0) { - MorphAsync(map, ch.Width, ch.Height, _cycleLength, (uint)_random.Next(), ref gain); + var random = new Pcg32Single((uint)_random.Next()); + MorphAsync(map, ch.Width, ch.Height, _cycleLength, random, gainWrapper).ConfigureAwait(false).GetAwaiter() + .GetResult(); } else { - List workers = []; + if (_morphWorkers is null || (ulong)_morphWorkers.Length != _threadCount) + _morphWorkers = new Task[_threadCount]; + if (_morphRandoms is null || (ulong)_morphRandoms.Length != _threadCount) + { + _morphRandoms = new Pcg32Single[_threadCount]; + for (ulong i = 0; i < _threadCount; ++i) + { + _morphRandoms[i] = new Pcg32Single((uint)_random.Next()); + } + } + for (ulong i = 0; i < _threadCount; ++i) { - var thread = new Thread(() => - MorphAsync(map, ch.Width, ch.Height, _cycleLength, (uint)_random.Next(), ref gain)); - thread.Name = $"MorphThread-{i}"; - thread.Start(); - workers.Add(thread); - } - - while (workers.Any()) - { - workers.Last().Join(); - workers.RemoveAt(workers.Count - 1); + var random = _morphRandoms[i]; + var workerTask = MorphAsync(map, ch.Width, ch.Height, _cycleLength, random, gainWrapper); + _morphWorkers[i] = workerTask; } + Task.WaitAll(_morphWorkers); } + gain = gainWrapper.Gain; _chainMapE -= gain; return false; @@ -717,8 +729,8 @@ public class AtomorphThread : IDisposable { pos = it; var ownerPos = f.Owners[pos]; - if (bl.Surface.Count(v => v == pos) != 0 || f.Owners.Count(v => v.Key == pos) == 0 || - checkedBlobs.Count(v => v == ownerPos) != 0 || !HasPixel(frameKey, pos)) + if (!HasPixel(frameKey, pos) || bl.Surface.Contains(pos) || !f.Owners.ContainsKey(pos) || + checkedBlobs.Contains(ownerPos)) { // Don't expand into itself and empty positions. if (checkThreshold && (ulong)bl.Surface.Count >= _blobMinSize) @@ -759,7 +771,6 @@ public class AtomorphThread : IDisposable } } - MainHandling: if (bestFound) { // Merge with this blob. diff --git a/Atomorph.NET/AtomorphUtilities.cs b/Atomorph.NET/AtomorphUtilities.cs index 29219ac..8359123 100644 --- a/Atomorph.NET/AtomorphUtilities.cs +++ b/Atomorph.NET/AtomorphUtilities.cs @@ -15,6 +15,7 @@ public static class AtomorphUtilities y = pt.Y + pt.YFract/(float)(byte.MaxValue+1); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static ulong PointDistance(Point p1, Point p2) { var xd = (ulong)Math.Abs(((byte.MaxValue+1)*p1.X+p1.XFract) - ((byte.MaxValue+1)*p2.X+p2.XFract)); diff --git a/Atomorph.NET/Models/Point.cs b/Atomorph.NET/Models/Point.cs index 7fc2322..6649b62 100644 --- a/Atomorph.NET/Models/Point.cs +++ b/Atomorph.NET/Models/Point.cs @@ -1,3 +1,5 @@ +using System.Runtime.CompilerServices; + namespace Atomorph.Models; public record struct Point @@ -14,41 +16,53 @@ public record struct Point // } point; // - private ulong _word; + private ushort _x; + private ushort _y; + private byte _xFract; + private byte _yFract; + private PointFlags _flags; public ulong Word { - get => _word; - set => _word = value; + [method: MethodImpl(MethodImplOptions.AggressiveInlining)] + get => _x | ((ulong)_y << 16) | ((ulong)_xFract << 32) | ((ulong)_yFract << 40) | ((ulong)_flags << 48); + set + { + _x = (ushort)(value & 0xFFFF); + _y = (ushort)((value >> 16) & 0xFFFF); + _xFract = (byte)((value >> 32) & 0xFF); + _yFract = (byte)((value >> 40) & 0xFF); + _flags = (PointFlags)((value >> 48) & 0xFF); + } } public ushort X { - get => (ushort)(_word & 0xFFFF); - set => _word = (_word & ~0xFFFFUL) | value; + get => _x; + set => _x = value; } public ushort Y { - get => (ushort)((_word >> 16) & 0xFFFF); - set => _word = (_word & ~(0xFFFFUL << 16)) | ((ulong)value << 16); + get => _y; + set => _y = value; } public byte XFract { - get => (byte)((_word >> 32) & 0xFF); - set => _word = (_word & ~(0xFFUL << 32)) | ((ulong)value << 32); + get => _xFract; + set => _xFract = value; } public byte YFract { - get => (byte)((_word >> 40) & 0xFF); - set => _word = (_word & ~(0xFFUL << 40)) | ((ulong)value << 40); + get => _yFract; + set => _yFract = value; } public PointFlags Flags { - get => (PointFlags)((_word >> 48) & 0xFF); - set => _word = (_word & ~(0xFFUL << 48)) | ((ulong)value << 48); + get => _flags; + set => _flags = value; } } \ No newline at end of file