Merge feature/gpu-bitmap-bestfit into master
This commit is contained in:
@@ -608,5 +608,29 @@ namespace OpenNest.Geometry
|
|||||||
var hull = ConvexHull.Compute(Vertices);
|
var hull = ConvexHull.Compute(Vertices);
|
||||||
return RotatingCalipers.MinimumBoundingRectangle(hull, startAngle, endAngle);
|
return RotatingCalipers.MinimumBoundingRectangle(hull, startAngle, endAngle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool ContainsPoint(Vector pt)
|
||||||
|
{
|
||||||
|
var n = IsClosed() ? Vertices.Count - 1 : Vertices.Count;
|
||||||
|
|
||||||
|
if (n < 3)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var inside = false;
|
||||||
|
|
||||||
|
for (int i = 0, j = n - 1; i < n; j = i++)
|
||||||
|
{
|
||||||
|
var vi = Vertices[i];
|
||||||
|
var vj = Vertices[j];
|
||||||
|
|
||||||
|
if ((vi.Y > pt.Y) != (vj.Y > pt.Y) &&
|
||||||
|
pt.X < (vj.X - vi.X) * (pt.Y - vi.Y) / (vj.Y - vi.Y) + vi.X)
|
||||||
|
{
|
||||||
|
inside = !inside;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return inside;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using OpenNest.CNC;
|
using OpenNest.CNC;
|
||||||
using OpenNest.Converters;
|
using OpenNest.Converters;
|
||||||
using OpenNest.Geometry;
|
using OpenNest.Geometry;
|
||||||
@@ -130,8 +131,10 @@ namespace OpenNest
|
|||||||
{
|
{
|
||||||
pts = new List<Vector>();
|
pts = new List<Vector>();
|
||||||
|
|
||||||
var entities1 = ConvertProgram.ToGeometry(Program);
|
var entities1 = ConvertProgram.ToGeometry(Program)
|
||||||
var entities2 = ConvertProgram.ToGeometry(part.Program);
|
.Where(e => e.Layer != SpecialLayers.Rapid);
|
||||||
|
var entities2 = ConvertProgram.ToGeometry(part.Program)
|
||||||
|
.Where(e => e.Layer != SpecialLayers.Rapid);
|
||||||
|
|
||||||
var shapes1 = Helper.GetShapes(entities1);
|
var shapes1 = Helper.GetShapes(entities1);
|
||||||
var shapes2 = Helper.GetShapes(entities2);
|
var shapes2 = Helper.GetShapes(entities2);
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using OpenNest.Converters;
|
using OpenNest.Converters;
|
||||||
using OpenNest.Engine.BestFit.Tiling;
|
using OpenNest.Engine.BestFit.Tiling;
|
||||||
using OpenNest.Geometry;
|
using OpenNest.Geometry;
|
||||||
@@ -9,12 +11,12 @@ namespace OpenNest.Engine.BestFit
|
|||||||
{
|
{
|
||||||
public class BestFitFinder
|
public class BestFitFinder
|
||||||
{
|
{
|
||||||
private readonly PairEvaluator _evaluator;
|
private readonly IPairEvaluator _evaluator;
|
||||||
private readonly BestFitFilter _filter;
|
private readonly BestFitFilter _filter;
|
||||||
|
|
||||||
public BestFitFinder(double maxPlateWidth, double maxPlateHeight)
|
public BestFitFinder(double maxPlateWidth, double maxPlateHeight, IPairEvaluator evaluator = null)
|
||||||
{
|
{
|
||||||
_evaluator = new PairEvaluator();
|
_evaluator = evaluator ?? new PairEvaluator();
|
||||||
_filter = new BestFitFilter
|
_filter = new BestFitFilter
|
||||||
{
|
{
|
||||||
MaxPlateWidth = maxPlateWidth,
|
MaxPlateWidth = maxPlateWidth,
|
||||||
@@ -30,12 +32,16 @@ namespace OpenNest.Engine.BestFit
|
|||||||
{
|
{
|
||||||
var strategies = BuildStrategies(drawing);
|
var strategies = BuildStrategies(drawing);
|
||||||
|
|
||||||
var allCandidates = new List<PairCandidate>();
|
var candidateBags = new ConcurrentBag<List<PairCandidate>>();
|
||||||
|
|
||||||
foreach (var strategy in strategies)
|
Parallel.ForEach(strategies, strategy =>
|
||||||
allCandidates.AddRange(strategy.GenerateCandidates(drawing, spacing, stepSize));
|
{
|
||||||
|
candidateBags.Add(strategy.GenerateCandidates(drawing, spacing, stepSize));
|
||||||
|
});
|
||||||
|
|
||||||
var results = allCandidates.Select(c => _evaluator.Evaluate(c)).ToList();
|
var allCandidates = candidateBags.SelectMany(c => c).ToList();
|
||||||
|
|
||||||
|
var results = _evaluator.EvaluateAll(allCandidates);
|
||||||
|
|
||||||
_filter.Apply(results);
|
_filter.Apply(results);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace OpenNest.Engine.BestFit
|
||||||
|
{
|
||||||
|
public interface IPairEvaluator
|
||||||
|
{
|
||||||
|
List<BestFitResult> EvaluateAll(List<PairCandidate> candidates);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,15 +1,29 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using OpenNest.Converters;
|
using OpenNest.Converters;
|
||||||
using OpenNest.Geometry;
|
using OpenNest.Geometry;
|
||||||
using OpenNest.Math;
|
using OpenNest.Math;
|
||||||
|
|
||||||
namespace OpenNest.Engine.BestFit
|
namespace OpenNest.Engine.BestFit
|
||||||
{
|
{
|
||||||
public class PairEvaluator
|
public class PairEvaluator : IPairEvaluator
|
||||||
{
|
{
|
||||||
private const double ChordTolerance = 0.01;
|
private const double ChordTolerance = 0.01;
|
||||||
|
|
||||||
|
public List<BestFitResult> EvaluateAll(List<PairCandidate> candidates)
|
||||||
|
{
|
||||||
|
var resultBag = new ConcurrentBag<BestFitResult>();
|
||||||
|
|
||||||
|
Parallel.ForEach(candidates, c =>
|
||||||
|
{
|
||||||
|
resultBag.Add(Evaluate(c));
|
||||||
|
});
|
||||||
|
|
||||||
|
return resultBag.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
public BestFitResult Evaluate(PairCandidate candidate)
|
public BestFitResult Evaluate(PairCandidate candidate)
|
||||||
{
|
{
|
||||||
var drawing = candidate.Drawing;
|
var drawing = candidate.Drawing;
|
||||||
|
|||||||
@@ -80,7 +80,12 @@ namespace OpenNest.Engine.BestFit
|
|||||||
// Pre-compute part1's offset lines (half-spacing outward)
|
// Pre-compute part1's offset lines (half-spacing outward)
|
||||||
var part1Lines = Helper.GetOffsetPartLines(part1, halfSpacing);
|
var part1Lines = Helper.GetOffsetPartLines(part1, halfSpacing);
|
||||||
|
|
||||||
for (var offset = perpMin; offset <= perpMax; offset += stepSize)
|
// Align sweep start to a multiple of stepSize so that offset=0 is always
|
||||||
|
// included. This ensures perfect grid arrangements (side-by-side, stacked)
|
||||||
|
// are generated for rectangular parts.
|
||||||
|
var alignedStart = System.Math.Ceiling(perpMin / stepSize) * stepSize;
|
||||||
|
|
||||||
|
for (var offset = alignedStart; offset <= perpMax; offset += stepSize)
|
||||||
{
|
{
|
||||||
var part2 = (Part)part2Template.Clone();
|
var part2 = (Part)part2Template.Clone();
|
||||||
|
|
||||||
|
|||||||
+234
-13
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using OpenNest.Converters;
|
using OpenNest.Converters;
|
||||||
using OpenNest.Engine.BestFit;
|
using OpenNest.Engine.BestFit;
|
||||||
@@ -21,8 +22,12 @@ namespace OpenNest
|
|||||||
|
|
||||||
public NestDirection NestDirection { get; set; }
|
public NestDirection NestDirection { get; set; }
|
||||||
|
|
||||||
|
public Func<Drawing, double, IPairEvaluator> CreateEvaluator { get; set; }
|
||||||
|
|
||||||
public bool Fill(NestItem item)
|
public bool Fill(NestItem item)
|
||||||
{
|
{
|
||||||
|
var sw = Stopwatch.StartNew();
|
||||||
|
|
||||||
var workArea = Plate.WorkArea();
|
var workArea = Plate.WorkArea();
|
||||||
var bestRotation = FindBestRotation(item);
|
var bestRotation = FindBestRotation(item);
|
||||||
|
|
||||||
@@ -37,22 +42,37 @@ namespace OpenNest
|
|||||||
engine.Fill(item.Drawing, bestRotation + Angle.HalfPI, NestDirection.Vertical)
|
engine.Fill(item.Drawing, bestRotation + Angle.HalfPI, NestDirection.Vertical)
|
||||||
};
|
};
|
||||||
|
|
||||||
// Pick the linear configuration with the most parts.
|
// Pick the best linear configuration. FillLinear already ensures
|
||||||
|
// geometry-aware spacing, so skip the redundant overlap check that
|
||||||
|
// can produce false positives on arcs/curves.
|
||||||
List<Part> linearBest = null;
|
List<Part> linearBest = null;
|
||||||
|
|
||||||
foreach (var config in configs)
|
foreach (var config in configs)
|
||||||
{
|
{
|
||||||
if (linearBest == null || config.Count > linearBest.Count)
|
if (IsBetterFill(config, linearBest))
|
||||||
linearBest = config;
|
linearBest = config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var linearMs = sw.ElapsedMilliseconds;
|
||||||
|
|
||||||
|
// Try rectangle best-fit (mixes orientations to fill remnant strips).
|
||||||
|
var rectResult = FillRectangleBestFit(item, workArea);
|
||||||
|
|
||||||
|
var rectMs = sw.ElapsedMilliseconds - linearMs;
|
||||||
|
|
||||||
// Try pair-based approach.
|
// Try pair-based approach.
|
||||||
var pairResult = FillWithPairs(item);
|
var pairResult = FillWithPairs(item);
|
||||||
|
|
||||||
// Pick whichever produced more parts.
|
var pairMs = sw.ElapsedMilliseconds - linearMs - rectMs;
|
||||||
|
|
||||||
|
// Pick whichever is the better fill.
|
||||||
|
Debug.WriteLine($"[NestEngine.Fill] Linear: {linearBest?.Count ?? 0} parts ({linearMs}ms) | Rect: {rectResult?.Count ?? 0} parts ({rectMs}ms) | Pair: {pairResult.Count} parts ({pairMs}ms) | WorkArea: {workArea.Width:F1}x{workArea.Height:F1}");
|
||||||
var best = linearBest;
|
var best = linearBest;
|
||||||
|
|
||||||
if (pairResult.Count > (best?.Count ?? 0))
|
if (IsBetterFill(rectResult, best))
|
||||||
|
best = rectResult;
|
||||||
|
|
||||||
|
if (IsBetterFill(pairResult, best))
|
||||||
best = pairResult;
|
best = pairResult;
|
||||||
|
|
||||||
if (best == null || best.Count == 0)
|
if (best == null || best.Count == 0)
|
||||||
@@ -76,6 +96,21 @@ namespace OpenNest
|
|||||||
var angles = FindHullEdgeAngles(groupParts);
|
var angles = FindHullEdgeAngles(groupParts);
|
||||||
var best = FillPattern(engine, groupParts, angles);
|
var best = FillPattern(engine, groupParts, angles);
|
||||||
|
|
||||||
|
// For single-part groups, also try rectangle best-fit and pair-based filling.
|
||||||
|
if (groupParts.Count == 1)
|
||||||
|
{
|
||||||
|
var nestItem = new NestItem { Drawing = groupParts[0].BaseDrawing };
|
||||||
|
var rectResult = FillRectangleBestFit(nestItem, workArea);
|
||||||
|
|
||||||
|
if (IsBetterFill(rectResult, best))
|
||||||
|
best = rectResult;
|
||||||
|
|
||||||
|
var pairResult = FillWithPairs(nestItem);
|
||||||
|
|
||||||
|
if (IsBetterFill(pairResult, best))
|
||||||
|
best = pairResult;
|
||||||
|
}
|
||||||
|
|
||||||
if (best == null || best.Count == 0)
|
if (best == null || best.Count == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -101,10 +136,28 @@ namespace OpenNest
|
|||||||
|
|
||||||
foreach (var config in configs)
|
foreach (var config in configs)
|
||||||
{
|
{
|
||||||
if (best == null || config.Count > best.Count)
|
if (IsBetterFill(config, best))
|
||||||
best = config;
|
best = config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Debug.WriteLine($"[Fill(NestItem,Box)] Linear: {best?.Count ?? 0} parts | WorkArea: {workArea.Width:F1}x{workArea.Height:F1}");
|
||||||
|
|
||||||
|
// Try rectangle best-fit (mixes orientations to fill remnant strips).
|
||||||
|
var rectResult = FillRectangleBestFit(item, workArea);
|
||||||
|
|
||||||
|
Debug.WriteLine($"[Fill(NestItem,Box)] RectBestFit: {rectResult?.Count ?? 0} parts");
|
||||||
|
|
||||||
|
if (IsBetterFill(rectResult, best))
|
||||||
|
best = rectResult;
|
||||||
|
|
||||||
|
// Try pair-based approach.
|
||||||
|
var pairResult = FillWithPairs(item, workArea);
|
||||||
|
|
||||||
|
Debug.WriteLine($"[Fill(NestItem,Box)] Pair: {pairResult.Count} parts | Winner: {(IsBetterFill(pairResult, best) ? "Pair" : "Linear")}");
|
||||||
|
|
||||||
|
if (IsBetterFill(pairResult, best))
|
||||||
|
best = pairResult;
|
||||||
|
|
||||||
if (best == null || best.Count == 0)
|
if (best == null || best.Count == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -124,6 +177,26 @@ namespace OpenNest
|
|||||||
var angles = FindHullEdgeAngles(groupParts);
|
var angles = FindHullEdgeAngles(groupParts);
|
||||||
var best = FillPattern(engine, groupParts, angles);
|
var best = FillPattern(engine, groupParts, angles);
|
||||||
|
|
||||||
|
Debug.WriteLine($"[Fill(groupParts,Box)] Linear: {best?.Count ?? 0} parts | WorkArea: {workArea.Width:F1}x{workArea.Height:F1}");
|
||||||
|
|
||||||
|
if (groupParts.Count == 1)
|
||||||
|
{
|
||||||
|
var nestItem = new NestItem { Drawing = groupParts[0].BaseDrawing };
|
||||||
|
var rectResult = FillRectangleBestFit(nestItem, workArea);
|
||||||
|
|
||||||
|
Debug.WriteLine($"[Fill(groupParts,Box)] RectBestFit: {rectResult?.Count ?? 0} parts");
|
||||||
|
|
||||||
|
if (IsBetterFill(rectResult, best))
|
||||||
|
best = rectResult;
|
||||||
|
|
||||||
|
var pairResult = FillWithPairs(nestItem, workArea);
|
||||||
|
|
||||||
|
Debug.WriteLine($"[Fill(groupParts,Box)] Pair: {pairResult.Count} parts | Winner: {(IsBetterFill(pairResult, best) ? "Pair" : "Linear")}");
|
||||||
|
|
||||||
|
if (IsBetterFill(pairResult, best))
|
||||||
|
best = pairResult;
|
||||||
|
}
|
||||||
|
|
||||||
if (best == null || best.Count == 0)
|
if (best == null || best.Count == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -221,16 +294,106 @@ namespace OpenNest
|
|||||||
return parts.Count > 0;
|
return parts.Count > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<Part> FillRectangleBestFit(NestItem item, Box workArea)
|
||||||
|
{
|
||||||
|
var binItem = ConvertToRectangleItem(item);
|
||||||
|
|
||||||
|
var bin = new Bin
|
||||||
|
{
|
||||||
|
Location = workArea.Location,
|
||||||
|
Size = workArea.Size
|
||||||
|
};
|
||||||
|
|
||||||
|
bin.Width += Plate.PartSpacing;
|
||||||
|
bin.Height += Plate.PartSpacing;
|
||||||
|
|
||||||
|
var engine = new FillBestFit(bin);
|
||||||
|
engine.Fill(binItem);
|
||||||
|
|
||||||
|
var nestItems = new List<NestItem> { item };
|
||||||
|
return ConvertToParts(bin, nestItems);
|
||||||
|
}
|
||||||
|
|
||||||
private List<Part> FillWithPairs(NestItem item)
|
private List<Part> FillWithPairs(NestItem item)
|
||||||
{
|
{
|
||||||
var finder = new BestFitFinder(Plate.Size.Width, Plate.Size.Height);
|
return FillWithPairs(item, Plate.WorkArea());
|
||||||
var tileResults = finder.FindAndTile(item.Drawing, Plate, Plate.PartSpacing);
|
}
|
||||||
|
|
||||||
if (tileResults.Count == 0)
|
private List<Part> FillWithPairs(NestItem item, Box workArea)
|
||||||
return new List<Part>();
|
{
|
||||||
|
IPairEvaluator evaluator = null;
|
||||||
|
|
||||||
var bestTile = tileResults[0];
|
if (CreateEvaluator != null)
|
||||||
return ConvertTileResultToParts(bestTile, item.Drawing);
|
{
|
||||||
|
try { evaluator = CreateEvaluator(item.Drawing, Plate.PartSpacing); }
|
||||||
|
catch { /* GPU not available, fall back to geometry */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
var finder = new BestFitFinder(Plate.Size.Width, Plate.Size.Height, evaluator);
|
||||||
|
var bestFits = finder.FindBestFits(item.Drawing, Plate.PartSpacing, stepSize: 0.25);
|
||||||
|
|
||||||
|
var keptResults = bestFits.Where(r => r.Keep).Take(50).ToList();
|
||||||
|
Debug.WriteLine($"[FillWithPairs] Total: {bestFits.Count}, Kept: {bestFits.Count(r => r.Keep)}, Trying: {keptResults.Count}");
|
||||||
|
|
||||||
|
var resultBag = new System.Collections.Concurrent.ConcurrentBag<(int count, List<Part> parts)>();
|
||||||
|
|
||||||
|
System.Threading.Tasks.Parallel.For(0, keptResults.Count, i =>
|
||||||
|
{
|
||||||
|
var result = keptResults[i];
|
||||||
|
var pairParts = BuildPairParts(result, item.Drawing);
|
||||||
|
var angles = FindHullEdgeAngles(pairParts);
|
||||||
|
var engine = new FillLinear(workArea, Plate.PartSpacing);
|
||||||
|
var filled = FillPattern(engine, pairParts, angles);
|
||||||
|
|
||||||
|
if (filled != null && filled.Count > 0)
|
||||||
|
resultBag.Add((filled.Count, filled));
|
||||||
|
});
|
||||||
|
|
||||||
|
List<Part> best = null;
|
||||||
|
|
||||||
|
foreach (var (count, parts) in resultBag)
|
||||||
|
{
|
||||||
|
if (best == null || count > best.Count)
|
||||||
|
best = parts;
|
||||||
|
}
|
||||||
|
|
||||||
|
(evaluator as IDisposable)?.Dispose();
|
||||||
|
|
||||||
|
Debug.WriteLine($"[FillWithPairs] Best pair result: {best?.Count ?? 0} parts");
|
||||||
|
return best ?? new List<Part>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Part> BuildPairParts(BestFitResult bestFit, Drawing drawing)
|
||||||
|
{
|
||||||
|
var candidate = bestFit.Candidate;
|
||||||
|
|
||||||
|
var part1 = new Part(drawing);
|
||||||
|
var bbox1 = part1.Program.BoundingBox();
|
||||||
|
part1.Offset(-bbox1.Location.X, -bbox1.Location.Y);
|
||||||
|
part1.UpdateBounds();
|
||||||
|
|
||||||
|
var part2 = new Part(drawing);
|
||||||
|
if (!candidate.Part2Rotation.IsEqualTo(0))
|
||||||
|
part2.Rotate(candidate.Part2Rotation);
|
||||||
|
var bbox2 = part2.Program.BoundingBox();
|
||||||
|
part2.Offset(-bbox2.Location.X, -bbox2.Location.Y);
|
||||||
|
part2.Location = candidate.Part2Offset;
|
||||||
|
part2.UpdateBounds();
|
||||||
|
|
||||||
|
if (!bestFit.OptimalRotation.IsEqualTo(0))
|
||||||
|
{
|
||||||
|
var pairBounds = ((IEnumerable<IBoundable>)new IBoundable[] { part1, part2 }).GetBoundingBox();
|
||||||
|
var center = pairBounds.Center;
|
||||||
|
part1.Rotate(-bestFit.OptimalRotation, center);
|
||||||
|
part2.Rotate(-bestFit.OptimalRotation, center);
|
||||||
|
}
|
||||||
|
|
||||||
|
var finalBounds = ((IEnumerable<IBoundable>)new IBoundable[] { part1, part2 }).GetBoundingBox();
|
||||||
|
var offset = new Vector(-finalBounds.Left, -finalBounds.Bottom);
|
||||||
|
part1.Offset(offset);
|
||||||
|
part2.Offset(offset);
|
||||||
|
|
||||||
|
return new List<Part> { part1, part2 };
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Part> ConvertTileResultToParts(TileResult tileResult, Drawing drawing)
|
private List<Part> ConvertTileResultToParts(TileResult tileResult, Drawing drawing)
|
||||||
@@ -295,6 +458,64 @@ namespace OpenNest
|
|||||||
return parts;
|
return parts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool HasOverlaps(List<Part> parts, double spacing)
|
||||||
|
{
|
||||||
|
if (parts == null || parts.Count <= 1)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
for (var i = 0; i < parts.Count; i++)
|
||||||
|
{
|
||||||
|
for (var j = i + 1; j < parts.Count; j++)
|
||||||
|
{
|
||||||
|
List<Vector> pts;
|
||||||
|
|
||||||
|
if (parts[i].Intersects(parts[j], out pts))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool IsBetterFill(List<Part> candidate, List<Part> current)
|
||||||
|
{
|
||||||
|
if (candidate == null || candidate.Count == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (current == null || current.Count == 0)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (candidate.Count != current.Count)
|
||||||
|
return candidate.Count > current.Count;
|
||||||
|
|
||||||
|
// Same count: prefer smaller bounding box (more compact).
|
||||||
|
var candidateBox = ((IEnumerable<IBoundable>)candidate).GetBoundingBox();
|
||||||
|
var currentBox = ((IEnumerable<IBoundable>)current).GetBoundingBox();
|
||||||
|
|
||||||
|
return candidateBox.Area() < currentBox.Area();
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool IsBetterValidFill(List<Part> candidate, List<Part> current)
|
||||||
|
{
|
||||||
|
if (candidate == null || candidate.Count == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Reject candidate if it has overlapping parts.
|
||||||
|
if (HasOverlaps(candidate, Plate.PartSpacing))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (current == null || current.Count == 0)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (candidate.Count != current.Count)
|
||||||
|
return candidate.Count > current.Count;
|
||||||
|
|
||||||
|
var candidateBox = ((IEnumerable<IBoundable>)candidate).GetBoundingBox();
|
||||||
|
var currentBox = ((IEnumerable<IBoundable>)current).GetBoundingBox();
|
||||||
|
|
||||||
|
return candidateBox.Area() < currentBox.Area();
|
||||||
|
}
|
||||||
|
|
||||||
private List<double> FindHullEdgeAngles(List<Part> parts)
|
private List<double> FindHullEdgeAngles(List<Part> parts)
|
||||||
{
|
{
|
||||||
var points = new List<Vector>();
|
var points = new List<Vector>();
|
||||||
@@ -376,10 +597,10 @@ namespace OpenNest
|
|||||||
var h = engine.Fill(pattern, NestDirection.Horizontal);
|
var h = engine.Fill(pattern, NestDirection.Horizontal);
|
||||||
var v = engine.Fill(pattern, NestDirection.Vertical);
|
var v = engine.Fill(pattern, NestDirection.Vertical);
|
||||||
|
|
||||||
if (best == null || h.Count > best.Count)
|
if (IsBetterValidFill(h, best))
|
||||||
best = h;
|
best = h;
|
||||||
|
|
||||||
if (best == null || v.Count > best.Count)
|
if (IsBetterValidFill(v, best))
|
||||||
best = v;
|
best = v;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,214 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using ILGPU;
|
||||||
|
using ILGPU.Runtime;
|
||||||
|
using OpenNest.Engine.BestFit;
|
||||||
|
using OpenNest.Geometry;
|
||||||
|
|
||||||
|
namespace OpenNest.Gpu
|
||||||
|
{
|
||||||
|
public class GpuPairEvaluator : IPairEvaluator, IDisposable
|
||||||
|
{
|
||||||
|
private readonly Context _context;
|
||||||
|
private readonly Accelerator _accelerator;
|
||||||
|
private readonly Drawing _drawing;
|
||||||
|
private readonly double _spacing;
|
||||||
|
private readonly double _cellSize;
|
||||||
|
|
||||||
|
public GpuPairEvaluator(Drawing drawing, double spacing, double cellSize = PartBitmap.DefaultCellSize)
|
||||||
|
{
|
||||||
|
_drawing = drawing;
|
||||||
|
_spacing = spacing;
|
||||||
|
_cellSize = cellSize;
|
||||||
|
_context = Context.CreateDefault();
|
||||||
|
_accelerator = _context.GetPreferredDevice(preferCPU: false)
|
||||||
|
.CreateAccelerator(_context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<BestFitResult> EvaluateAll(List<PairCandidate> candidates)
|
||||||
|
{
|
||||||
|
if (candidates.Count == 0)
|
||||||
|
return new List<BestFitResult>();
|
||||||
|
|
||||||
|
var dilation = _spacing / 2.0;
|
||||||
|
var bitmapA = PartBitmap.FromDrawing(_drawing, _cellSize, dilation);
|
||||||
|
|
||||||
|
if (bitmapA.Width == 0 || bitmapA.Height == 0)
|
||||||
|
return candidates.Select(c => MakeEmptyResult(c)).ToList();
|
||||||
|
|
||||||
|
// Group candidates by Part2Rotation so we rasterize B once per unique rotation
|
||||||
|
var groups = candidates
|
||||||
|
.Select((c, i) => new { Candidate = c, OriginalIndex = i })
|
||||||
|
.GroupBy(x => System.Math.Round(x.Candidate.Part2Rotation, 6));
|
||||||
|
|
||||||
|
var allResults = new BestFitResult[candidates.Count];
|
||||||
|
var trueArea = _drawing.Area * 2;
|
||||||
|
|
||||||
|
foreach (var group in groups)
|
||||||
|
{
|
||||||
|
var rotation = group.Key;
|
||||||
|
var groupItems = group.ToList();
|
||||||
|
|
||||||
|
// Rasterize B at this rotation
|
||||||
|
var bitmapB = PartBitmap.FromDrawingRotated(_drawing, rotation, _cellSize, dilation);
|
||||||
|
|
||||||
|
if (bitmapB.Width == 0 || bitmapB.Height == 0)
|
||||||
|
{
|
||||||
|
foreach (var item in groupItems)
|
||||||
|
allResults[item.OriginalIndex] = MakeEmptyResult(item.Candidate);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use the max dimensions so both bitmaps fit on the same grid
|
||||||
|
var gridWidth = System.Math.Max(bitmapA.Width, bitmapB.Width);
|
||||||
|
var gridHeight = System.Math.Max(bitmapA.Height, bitmapB.Height);
|
||||||
|
|
||||||
|
var paddedA = PadBitmap(bitmapA, gridWidth, gridHeight);
|
||||||
|
var paddedB = PadBitmap(bitmapB, gridWidth, gridHeight);
|
||||||
|
|
||||||
|
// Pack candidate offsets: convert world offset to cell offset
|
||||||
|
var candidateCount = groupItems.Count;
|
||||||
|
var offsets = new float[candidateCount * 3];
|
||||||
|
|
||||||
|
for (var i = 0; i < candidateCount; i++)
|
||||||
|
{
|
||||||
|
var c = groupItems[i].Candidate;
|
||||||
|
// Convert world-space offset to cell-space offset relative to bitmapA origin
|
||||||
|
offsets[i * 3 + 0] = (float)((c.Part2Offset.X - bitmapA.OriginX + bitmapB.OriginX) / _cellSize);
|
||||||
|
offsets[i * 3 + 1] = (float)((c.Part2Offset.Y - bitmapA.OriginY + bitmapB.OriginY) / _cellSize);
|
||||||
|
offsets[i * 3 + 2] = (float)c.Part2Rotation;
|
||||||
|
}
|
||||||
|
|
||||||
|
var resultScores = new float[candidateCount];
|
||||||
|
|
||||||
|
using var gpuPaddedA = _accelerator.Allocate1D(paddedA);
|
||||||
|
using var gpuPaddedB = _accelerator.Allocate1D(paddedB);
|
||||||
|
using var gpuOffsets = _accelerator.Allocate1D(offsets);
|
||||||
|
using var gpuResults = _accelerator.Allocate1D(resultScores);
|
||||||
|
|
||||||
|
var kernel = _accelerator.LoadAutoGroupedStreamKernel<
|
||||||
|
Index1D,
|
||||||
|
ArrayView1D<int, Stride1D.Dense>,
|
||||||
|
ArrayView1D<int, Stride1D.Dense>,
|
||||||
|
ArrayView1D<float, Stride1D.Dense>,
|
||||||
|
ArrayView1D<float, Stride1D.Dense>,
|
||||||
|
int, int>(NestingKernel);
|
||||||
|
|
||||||
|
kernel(candidateCount, gpuPaddedA.View, gpuPaddedB.View,
|
||||||
|
gpuOffsets.View, gpuResults.View, gridWidth, gridHeight);
|
||||||
|
|
||||||
|
_accelerator.Synchronize();
|
||||||
|
gpuResults.CopyToCPU(resultScores);
|
||||||
|
|
||||||
|
// Map results back
|
||||||
|
for (var i = 0; i < candidateCount; i++)
|
||||||
|
{
|
||||||
|
var item = groupItems[i];
|
||||||
|
var score = resultScores[i];
|
||||||
|
var hasOverlap = score <= 0f;
|
||||||
|
|
||||||
|
var combinedWidth = gridWidth * _cellSize;
|
||||||
|
var combinedHeight = gridHeight * _cellSize;
|
||||||
|
|
||||||
|
allResults[item.OriginalIndex] = new BestFitResult
|
||||||
|
{
|
||||||
|
Candidate = item.Candidate,
|
||||||
|
RotatedArea = hasOverlap ? 0 : combinedWidth * combinedHeight,
|
||||||
|
BoundingWidth = combinedWidth,
|
||||||
|
BoundingHeight = combinedHeight,
|
||||||
|
OptimalRotation = 0,
|
||||||
|
TrueArea = trueArea,
|
||||||
|
Keep = !hasOverlap,
|
||||||
|
Reason = hasOverlap ? "Overlap detected" : "Valid"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return allResults.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void NestingKernel(
|
||||||
|
Index1D index,
|
||||||
|
ArrayView1D<int, Stride1D.Dense> partBitmapA,
|
||||||
|
ArrayView1D<int, Stride1D.Dense> partBitmapB,
|
||||||
|
ArrayView1D<float, Stride1D.Dense> candidateOffsets,
|
||||||
|
ArrayView1D<float, Stride1D.Dense> results,
|
||||||
|
int gridWidth,
|
||||||
|
int gridHeight)
|
||||||
|
{
|
||||||
|
var candidateIdx = index * 3;
|
||||||
|
var offsetX = candidateOffsets[candidateIdx];
|
||||||
|
var offsetY = candidateOffsets[candidateIdx + 1];
|
||||||
|
// rotation is already baked into partBitmapB, offset is what matters
|
||||||
|
|
||||||
|
var overlapCount = 0;
|
||||||
|
var totalOccupied = 0;
|
||||||
|
|
||||||
|
for (var y = 0; y < gridHeight; y++)
|
||||||
|
{
|
||||||
|
for (var x = 0; x < gridWidth; x++)
|
||||||
|
{
|
||||||
|
var cellA = partBitmapA[y * gridWidth + x];
|
||||||
|
|
||||||
|
// Apply offset to look up part B's cell
|
||||||
|
var bx = (int)(x - offsetX);
|
||||||
|
var by = (int)(y - offsetY);
|
||||||
|
|
||||||
|
var cellB = 0;
|
||||||
|
if (bx >= 0 && bx < gridWidth && by >= 0 && by < gridHeight)
|
||||||
|
cellB = partBitmapB[by * gridWidth + bx];
|
||||||
|
|
||||||
|
if (cellA == 1 && cellB == 1)
|
||||||
|
overlapCount++;
|
||||||
|
if (cellA == 1 || cellB == 1)
|
||||||
|
totalOccupied++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (overlapCount > 0)
|
||||||
|
results[index] = 0f;
|
||||||
|
else
|
||||||
|
results[index] = (float)totalOccupied / (gridWidth * gridHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int[] PadBitmap(PartBitmap bitmap, int targetWidth, int targetHeight)
|
||||||
|
{
|
||||||
|
if (bitmap.Width == targetWidth && bitmap.Height == targetHeight)
|
||||||
|
return bitmap.Cells;
|
||||||
|
|
||||||
|
var padded = new int[targetWidth * targetHeight];
|
||||||
|
|
||||||
|
for (var y = 0; y < bitmap.Height; y++)
|
||||||
|
{
|
||||||
|
for (var x = 0; x < bitmap.Width; x++)
|
||||||
|
{
|
||||||
|
padded[y * targetWidth + x] = bitmap.Cells[y * bitmap.Width + x];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return padded;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static BestFitResult MakeEmptyResult(PairCandidate candidate)
|
||||||
|
{
|
||||||
|
return new BestFitResult
|
||||||
|
{
|
||||||
|
Candidate = candidate,
|
||||||
|
RotatedArea = 0,
|
||||||
|
BoundingWidth = 0,
|
||||||
|
BoundingHeight = 0,
|
||||||
|
OptimalRotation = 0,
|
||||||
|
TrueArea = 0,
|
||||||
|
Keep = false,
|
||||||
|
Reason = "No geometry"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_accelerator?.Dispose();
|
||||||
|
_context?.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0-windows</TargetFramework>
|
||||||
|
<RootNamespace>OpenNest.Gpu</RootNamespace>
|
||||||
|
<AssemblyName>OpenNest.Gpu</AssemblyName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\OpenNest.Core\OpenNest.Core.csproj" />
|
||||||
|
<ProjectReference Include="..\OpenNest.Engine\OpenNest.Engine.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="ILGPU" Version="1.5.1" />
|
||||||
|
<PackageReference Include="ILGPU.Algorithms" Version="1.5.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using OpenNest.Converters;
|
||||||
|
using OpenNest.Geometry;
|
||||||
|
using OpenNest.Math;
|
||||||
|
|
||||||
|
namespace OpenNest.Gpu
|
||||||
|
{
|
||||||
|
public class PartBitmap
|
||||||
|
{
|
||||||
|
public int[] Cells { get; set; }
|
||||||
|
public int Width { get; set; }
|
||||||
|
public int Height { get; set; }
|
||||||
|
public double CellSize { get; set; }
|
||||||
|
public double OriginX { get; set; }
|
||||||
|
public double OriginY { get; set; }
|
||||||
|
|
||||||
|
public const double DefaultCellSize = 0.05;
|
||||||
|
|
||||||
|
public static PartBitmap FromDrawing(Drawing drawing, double cellSize = DefaultCellSize, double spacingDilation = 0)
|
||||||
|
{
|
||||||
|
var polygons = GetClosedPolygons(drawing);
|
||||||
|
return Rasterize(polygons, cellSize, spacingDilation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PartBitmap FromDrawingRotated(Drawing drawing, double rotation, double cellSize = DefaultCellSize, double spacingDilation = 0)
|
||||||
|
{
|
||||||
|
var polygons = GetClosedPolygons(drawing);
|
||||||
|
|
||||||
|
if (!rotation.IsEqualTo(0))
|
||||||
|
{
|
||||||
|
foreach (var poly in polygons)
|
||||||
|
poly.Rotate(rotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Rasterize(polygons, cellSize, spacingDilation);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PartBitmap Rasterize(List<Polygon> polygons, double cellSize, double spacingDilation)
|
||||||
|
{
|
||||||
|
if (polygons.Count == 0)
|
||||||
|
return new PartBitmap { Cells = Array.Empty<int>(), Width = 0, Height = 0, CellSize = cellSize };
|
||||||
|
|
||||||
|
var minX = double.MaxValue;
|
||||||
|
var minY = double.MaxValue;
|
||||||
|
var maxX = double.MinValue;
|
||||||
|
var maxY = double.MinValue;
|
||||||
|
|
||||||
|
foreach (var poly in polygons)
|
||||||
|
{
|
||||||
|
poly.UpdateBounds();
|
||||||
|
var bb = poly.BoundingBox;
|
||||||
|
if (bb.Left < minX) minX = bb.Left;
|
||||||
|
if (bb.Bottom < minY) minY = bb.Bottom;
|
||||||
|
if (bb.Right > maxX) maxX = bb.Right;
|
||||||
|
if (bb.Top > maxY) maxY = bb.Top;
|
||||||
|
}
|
||||||
|
|
||||||
|
minX -= spacingDilation;
|
||||||
|
minY -= spacingDilation;
|
||||||
|
maxX += spacingDilation;
|
||||||
|
maxY += spacingDilation;
|
||||||
|
|
||||||
|
var width = (int)System.Math.Ceiling((maxX - minX) / cellSize);
|
||||||
|
var height = (int)System.Math.Ceiling((maxY - minY) / cellSize);
|
||||||
|
|
||||||
|
if (width <= 0 || height <= 0)
|
||||||
|
return new PartBitmap { Cells = Array.Empty<int>(), Width = 0, Height = 0, CellSize = cellSize };
|
||||||
|
|
||||||
|
var cells = new int[width * height];
|
||||||
|
|
||||||
|
for (var y = 0; y < height; y++)
|
||||||
|
{
|
||||||
|
for (var x = 0; x < width; x++)
|
||||||
|
{
|
||||||
|
var px = minX + (x + 0.5) * cellSize;
|
||||||
|
var py = minY + (y + 0.5) * cellSize;
|
||||||
|
var pt = new Vector(px, py);
|
||||||
|
|
||||||
|
foreach (var poly in polygons)
|
||||||
|
{
|
||||||
|
if (poly.ContainsPoint(pt))
|
||||||
|
{
|
||||||
|
cells[y * width + x] = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var dilationCells = (int)System.Math.Ceiling(spacingDilation / cellSize);
|
||||||
|
|
||||||
|
if (dilationCells > 0)
|
||||||
|
Dilate(cells, width, height, dilationCells);
|
||||||
|
|
||||||
|
return new PartBitmap
|
||||||
|
{
|
||||||
|
Cells = cells,
|
||||||
|
Width = width,
|
||||||
|
Height = height,
|
||||||
|
CellSize = cellSize,
|
||||||
|
OriginX = minX,
|
||||||
|
OriginY = minY
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<Polygon> GetClosedPolygons(Drawing drawing)
|
||||||
|
{
|
||||||
|
var entities = ConvertProgram.ToGeometry(drawing.Program)
|
||||||
|
.Where(e => e.Layer != SpecialLayers.Rapid);
|
||||||
|
var shapes = Helper.GetShapes(entities);
|
||||||
|
|
||||||
|
var polygons = new List<Polygon>();
|
||||||
|
|
||||||
|
foreach (var shape in shapes)
|
||||||
|
{
|
||||||
|
if (!shape.IsClosed())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var polygon = shape.ToPolygonWithTolerance(0.05);
|
||||||
|
polygon.Close();
|
||||||
|
polygons.Add(polygon);
|
||||||
|
}
|
||||||
|
|
||||||
|
return polygons;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void Dilate(int[] cells, int width, int height, int radius)
|
||||||
|
{
|
||||||
|
var source = (int[])cells.Clone();
|
||||||
|
|
||||||
|
for (var y = 0; y < height; y++)
|
||||||
|
{
|
||||||
|
for (var x = 0; x < width; x++)
|
||||||
|
{
|
||||||
|
if (source[y * width + x] != 1)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
for (var dy = -radius; dy <= radius; dy++)
|
||||||
|
{
|
||||||
|
for (var dx = -radius; dx <= radius; dx++)
|
||||||
|
{
|
||||||
|
var nx = x + dx;
|
||||||
|
var ny = y + dy;
|
||||||
|
|
||||||
|
if (nx >= 0 && nx < width && ny >= 0 && ny < height)
|
||||||
|
cells[ny * width + nx] = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,24 +9,66 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Core", "OpenNest.C
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Engine", "OpenNest.Engine\OpenNest.Engine.csproj", "{0083B9CC-54AD-4085-A30D-56BC6834B71A}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Engine", "OpenNest.Engine\OpenNest.Engine.csproj", "{0083B9CC-54AD-4085-A30D-56BC6834B71A}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Gpu", "OpenNest.Gpu\OpenNest.Gpu.csproj", "{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
|
Debug|x86 = Debug|x86
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
|
Release|x64 = Release|x64
|
||||||
|
Release|x86 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|Any CPU.Build.0 = Release|Any CPU
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{1F1E40E0-5C53-474F-A258-69C9C3FAC15A}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|Any CPU.Build.0 = Release|Any CPU
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{5A5FDE8D-F8DB-440E-866C-C4807E1686CF}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|Any CPU.Build.0 = Release|Any CPU
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{0083B9CC-54AD-4085-A30D-56BC6834B71A}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{1F0DD58E-9E83-4F78-A9D9-0557C0B2D96F}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -172,6 +172,7 @@ namespace OpenNest.Actions
|
|||||||
{
|
{
|
||||||
var plate = plateView.Plate;
|
var plate = plateView.Plate;
|
||||||
var engine = new NestEngine(plate);
|
var engine = new NestEngine(plate);
|
||||||
|
engine.CreateEvaluator = GpuEvaluatorFactory.Create;
|
||||||
var groupParts = parts.Select(p => p.BasePart).ToList();
|
var groupParts = parts.Select(p => p.BasePart).ToList();
|
||||||
|
|
||||||
var bounds = plate.WorkArea();
|
var bounds = plate.WorkArea();
|
||||||
|
|||||||
@@ -25,10 +25,8 @@ namespace OpenNest.Actions
|
|||||||
private void FillArea()
|
private void FillArea()
|
||||||
{
|
{
|
||||||
var engine = new NestEngine(plateView.Plate);
|
var engine = new NestEngine(plateView.Plate);
|
||||||
engine.FillArea(SelectedArea, new NestItem
|
engine.CreateEvaluator = GpuEvaluatorFactory.Create;
|
||||||
{
|
engine.Fill(new NestItem { Drawing = drawing }, SelectedArea);
|
||||||
Drawing = drawing
|
|
||||||
});
|
|
||||||
|
|
||||||
plateView.Invalidate();
|
plateView.Invalidate();
|
||||||
Update();
|
Update();
|
||||||
|
|||||||
Generated
+21
-1
@@ -59,6 +59,7 @@
|
|||||||
this.mnuViewZoomIn = new System.Windows.Forms.ToolStripMenuItem();
|
this.mnuViewZoomIn = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.mnuViewZoomOut = new System.Windows.Forms.ToolStripMenuItem();
|
this.mnuViewZoomOut = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.mnuTools = new System.Windows.Forms.ToolStripMenuItem();
|
this.mnuTools = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.mnuToolsBestFitViewer = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.mnuToolsMeasureArea = new System.Windows.Forms.ToolStripMenuItem();
|
this.mnuToolsMeasureArea = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.mnuToolsAlign = new System.Windows.Forms.ToolStripMenuItem();
|
this.mnuToolsAlign = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.mnuToolsAlignLeft = new System.Windows.Forms.ToolStripMenuItem();
|
this.mnuToolsAlignLeft = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
@@ -129,6 +130,7 @@
|
|||||||
this.plateIndexStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
this.plateIndexStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||||
this.plateSizeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
this.plateSizeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||||
this.plateQtyStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
this.plateQtyStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||||
|
this.gpuStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||||
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
|
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
|
||||||
this.btnNew = new System.Windows.Forms.ToolStripButton();
|
this.btnNew = new System.Windows.Forms.ToolStripButton();
|
||||||
this.btnOpen = new System.Windows.Forms.ToolStripButton();
|
this.btnOpen = new System.Windows.Forms.ToolStripButton();
|
||||||
@@ -412,6 +414,7 @@
|
|||||||
//
|
//
|
||||||
this.mnuTools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.mnuTools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
this.mnuToolsMeasureArea,
|
this.mnuToolsMeasureArea,
|
||||||
|
this.mnuToolsBestFitViewer,
|
||||||
this.mnuToolsAlign,
|
this.mnuToolsAlign,
|
||||||
this.toolStripMenuItem14,
|
this.toolStripMenuItem14,
|
||||||
this.mnuSetOffsetIncrement,
|
this.mnuSetOffsetIncrement,
|
||||||
@@ -429,6 +432,13 @@
|
|||||||
this.mnuToolsMeasureArea.Text = "Measure Area";
|
this.mnuToolsMeasureArea.Text = "Measure Area";
|
||||||
this.mnuToolsMeasureArea.Click += new System.EventHandler(this.MeasureArea_Click);
|
this.mnuToolsMeasureArea.Click += new System.EventHandler(this.MeasureArea_Click);
|
||||||
//
|
//
|
||||||
|
// mnuToolsBestFitViewer
|
||||||
|
//
|
||||||
|
this.mnuToolsBestFitViewer.Name = "mnuToolsBestFitViewer";
|
||||||
|
this.mnuToolsBestFitViewer.Size = new System.Drawing.Size(214, 22);
|
||||||
|
this.mnuToolsBestFitViewer.Text = "Best-Fit Viewer";
|
||||||
|
this.mnuToolsBestFitViewer.Click += new System.EventHandler(this.BestFitViewer_Click);
|
||||||
|
//
|
||||||
// mnuToolsAlign
|
// mnuToolsAlign
|
||||||
//
|
//
|
||||||
this.mnuToolsAlign.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.mnuToolsAlign.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
@@ -909,7 +919,8 @@
|
|||||||
this.spacerLabel,
|
this.spacerLabel,
|
||||||
this.plateIndexStatusLabel,
|
this.plateIndexStatusLabel,
|
||||||
this.plateSizeStatusLabel,
|
this.plateSizeStatusLabel,
|
||||||
this.plateQtyStatusLabel});
|
this.plateQtyStatusLabel,
|
||||||
|
this.gpuStatusLabel});
|
||||||
this.statusStrip1.Location = new System.Drawing.Point(0, 543);
|
this.statusStrip1.Location = new System.Drawing.Point(0, 543);
|
||||||
this.statusStrip1.Name = "statusStrip1";
|
this.statusStrip1.Name = "statusStrip1";
|
||||||
this.statusStrip1.Size = new System.Drawing.Size(1098, 24);
|
this.statusStrip1.Size = new System.Drawing.Size(1098, 24);
|
||||||
@@ -962,6 +973,13 @@
|
|||||||
this.plateQtyStatusLabel.Size = new System.Drawing.Size(55, 19);
|
this.plateQtyStatusLabel.Size = new System.Drawing.Size(55, 19);
|
||||||
this.plateQtyStatusLabel.Text = "Qty : 0";
|
this.plateQtyStatusLabel.Text = "Qty : 0";
|
||||||
//
|
//
|
||||||
|
// gpuStatusLabel
|
||||||
|
//
|
||||||
|
this.gpuStatusLabel.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left;
|
||||||
|
this.gpuStatusLabel.Name = "gpuStatusLabel";
|
||||||
|
this.gpuStatusLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
|
||||||
|
this.gpuStatusLabel.Size = new System.Drawing.Size(55, 19);
|
||||||
|
//
|
||||||
// toolStrip1
|
// toolStrip1
|
||||||
//
|
//
|
||||||
this.toolStrip1.AutoSize = false;
|
this.toolStrip1.AutoSize = false;
|
||||||
@@ -1287,7 +1305,9 @@
|
|||||||
private System.Windows.Forms.ToolStripMenuItem manualSequenceToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem manualSequenceToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem autoSequenceAllPlatesToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem autoSequenceAllPlatesToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem mnuToolsMeasureArea;
|
private System.Windows.Forms.ToolStripMenuItem mnuToolsMeasureArea;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem mnuToolsBestFitViewer;
|
||||||
private System.Windows.Forms.ToolStripButton btnSaveAs;
|
private System.Windows.Forms.ToolStripButton btnSaveAs;
|
||||||
private System.Windows.Forms.ToolStripMenuItem centerPartsToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem centerPartsToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripStatusLabel gpuStatusLabel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,6 +39,7 @@ namespace OpenNest.Forms
|
|||||||
LoadPosts();
|
LoadPosts();
|
||||||
EnableCheck();
|
EnableCheck();
|
||||||
UpdateStatus();
|
UpdateStatus();
|
||||||
|
UpdateGpuStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetNestName(DateTime date, int id)
|
private string GetNestName(DateTime date, int id)
|
||||||
@@ -191,6 +192,20 @@ namespace OpenNest.Forms
|
|||||||
UpdatePlateStatus();
|
UpdatePlateStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void UpdateGpuStatus()
|
||||||
|
{
|
||||||
|
if (GpuEvaluatorFactory.GpuAvailable)
|
||||||
|
{
|
||||||
|
gpuStatusLabel.Text = $"GPU : {GpuEvaluatorFactory.DeviceName}";
|
||||||
|
gpuStatusLabel.ForeColor = Color.DarkGreen;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gpuStatusLabel.Text = "GPU : None (CPU)";
|
||||||
|
gpuStatusLabel.ForeColor = Color.Gray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void UpdateLocationMode()
|
private void UpdateLocationMode()
|
||||||
{
|
{
|
||||||
if (activeForm == null)
|
if (activeForm == null)
|
||||||
@@ -501,6 +516,33 @@ namespace OpenNest.Forms
|
|||||||
activeForm.PlateView.SetAction(typeof(ActionSelectArea));
|
activeForm.PlateView.SetAction(typeof(ActionSelectArea));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void BestFitViewer_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (activeForm == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var plate = activeForm.PlateView.Plate;
|
||||||
|
var drawing = activeForm.Nest.Drawings.Count > 0
|
||||||
|
? activeForm.Nest.Drawings.First()
|
||||||
|
: null;
|
||||||
|
|
||||||
|
if (drawing == null)
|
||||||
|
{
|
||||||
|
MessageBox.Show("No drawings available.", "Best-Fit Viewer",
|
||||||
|
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
using (var form = new BestFitViewerForm(drawing, plate))
|
||||||
|
{
|
||||||
|
if (form.ShowDialog(this) == DialogResult.OK && form.SelectedResult != null)
|
||||||
|
{
|
||||||
|
var parts = NestEngine.BuildPairParts(form.SelectedResult, drawing);
|
||||||
|
activeForm.PlateView.SetAction(typeof(ActionClone), parts);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void SetOffsetIncrement_Click(object sender, EventArgs e)
|
private void SetOffsetIncrement_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (activeForm == null) return;
|
if (activeForm == null) return;
|
||||||
@@ -645,6 +687,7 @@ namespace OpenNest.Forms
|
|||||||
: activeForm.PlateView.Plate;
|
: activeForm.PlateView.Plate;
|
||||||
|
|
||||||
var engine = new NestEngine(plate);
|
var engine = new NestEngine(plate);
|
||||||
|
engine.CreateEvaluator = GpuEvaluatorFactory.Create;
|
||||||
|
|
||||||
if (!engine.Pack(items))
|
if (!engine.Pack(items))
|
||||||
break;
|
break;
|
||||||
@@ -718,6 +761,7 @@ namespace OpenNest.Forms
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
var engine = new NestEngine(activeForm.PlateView.Plate);
|
var engine = new NestEngine(activeForm.PlateView.Plate);
|
||||||
|
engine.CreateEvaluator = GpuEvaluatorFactory.Create;
|
||||||
engine.Fill(new NestItem
|
engine.Fill(new NestItem
|
||||||
{
|
{
|
||||||
Drawing = drawing
|
Drawing = drawing
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using ILGPU;
|
||||||
|
using ILGPU.Runtime;
|
||||||
|
using OpenNest.Engine.BestFit;
|
||||||
|
using OpenNest.Gpu;
|
||||||
|
|
||||||
|
namespace OpenNest
|
||||||
|
{
|
||||||
|
internal static class GpuEvaluatorFactory
|
||||||
|
{
|
||||||
|
private static bool _probed;
|
||||||
|
private static bool _gpuAvailable;
|
||||||
|
private static string _deviceName;
|
||||||
|
|
||||||
|
public static bool GpuAvailable
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (!_probed) Probe();
|
||||||
|
return _gpuAvailable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string DeviceName
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (!_probed) Probe();
|
||||||
|
return _deviceName ?? "None";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IPairEvaluator Create(Drawing drawing, double spacing)
|
||||||
|
{
|
||||||
|
if (!GpuAvailable)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return new GpuPairEvaluator(drawing, spacing);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Debug.WriteLine($"[GpuEvaluatorFactory] GPU evaluator failed: {ex.Message}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void Probe()
|
||||||
|
{
|
||||||
|
_probed = true;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var context = Context.CreateDefault();
|
||||||
|
foreach (var device in context.Devices)
|
||||||
|
{
|
||||||
|
if (device.AcceleratorType == AcceleratorType.Cuda ||
|
||||||
|
device.AcceleratorType == AcceleratorType.OpenCL)
|
||||||
|
{
|
||||||
|
_gpuAvailable = true;
|
||||||
|
_deviceName = device.Name;
|
||||||
|
Debug.WriteLine($"[GpuEvaluatorFactory] GPU found: {device.Name} ({device.AcceleratorType})");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Debug.WriteLine("[GpuEvaluatorFactory] No GPU device found");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Debug.WriteLine($"[GpuEvaluatorFactory] GPU probe failed: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\OpenNest.Core\OpenNest.Core.csproj" />
|
<ProjectReference Include="..\OpenNest.Core\OpenNest.Core.csproj" />
|
||||||
<ProjectReference Include="..\OpenNest.Engine\OpenNest.Engine.csproj" />
|
<ProjectReference Include="..\OpenNest.Engine\OpenNest.Engine.csproj" />
|
||||||
|
<ProjectReference Include="..\OpenNest.Gpu\OpenNest.Gpu.csproj" />
|
||||||
<PackageReference Include="ACadSharp" Version="3.1.32" />
|
<PackageReference Include="ACadSharp" Version="3.1.32" />
|
||||||
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
|
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user