From 23c2682c6e1e8a5bb5142425285bb8cbaf61cf74 Mon Sep 17 00:00:00 2001 From: wo80 Date: Sat, 5 Mar 2022 01:01:39 +0100 Subject: [PATCH] Move Windows-specific projects into separate solution. --- src/MeshExplorer.sln | 51 ++++++++++ src/MeshExplorer/Controls/DarkListBox.cs | 6 +- src/MeshExplorer/FormMain.cs | 2 +- src/MeshExplorer/MeshExplorer.csproj | 3 +- .../Triangle.Examples.csproj | 9 +- .../ExtensionMethods.cs | 0 .../FunctionRenderer.cs | 0 src/Triangle.Rendering.GDI/Helper.cs | 28 ++++++ .../ImageRenderer.cs | 10 +- .../LayerRenderer.cs | 12 ++- .../MeshRenderer.cs | 14 +-- .../Native/GradientFillMode.cs | 0 .../Native/GradientRect.cs | 0 .../Native/GradientTriangle.cs | 0 .../Native/NativeMethods.cs | 0 .../Native/TriVertex.cs | 0 .../RenderControl.cs | 0 .../Triangle.Rendering.GDI.csproj | 17 ++++ src/Triangle.Rendering/ColorManager.cs | 95 +++---------------- src/Triangle.Rendering/RenderManager.cs | 19 +--- .../Triangle.Rendering.csproj | 4 +- src/Triangle.sln | 40 +++----- src/Triangle/Triangle.csproj | 9 +- 23 files changed, 161 insertions(+), 158 deletions(-) create mode 100644 src/MeshExplorer.sln rename src/{Triangle.Rendering => Triangle.Rendering.GDI}/ExtensionMethods.cs (100%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/FunctionRenderer.cs (100%) create mode 100644 src/Triangle.Rendering.GDI/Helper.cs rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/ImageRenderer.cs (96%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/LayerRenderer.cs (92%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/MeshRenderer.cs (90%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/Native/GradientFillMode.cs (100%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/Native/GradientRect.cs (100%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/Native/GradientTriangle.cs (100%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/Native/NativeMethods.cs (100%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/Native/TriVertex.cs (100%) rename src/{Triangle.Rendering/GDI => Triangle.Rendering.GDI}/RenderControl.cs (100%) create mode 100644 src/Triangle.Rendering.GDI/Triangle.Rendering.GDI.csproj diff --git a/src/MeshExplorer.sln b/src/MeshExplorer.sln new file mode 100644 index 0000000..82786a9 --- /dev/null +++ b/src/MeshExplorer.sln @@ -0,0 +1,51 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeshExplorer", "MeshExplorer\MeshExplorer.csproj", "{336AAF8A-5316-4303-9E73-5E38BD0B28AF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triangle.Rendering", "Triangle.Rendering\Triangle.Rendering.csproj", "{41022E0E-BD0F-439E-BC3A-AABB1B43471B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triangle.Rendering.GDI", "Triangle.Rendering.GDI\Triangle.Rendering.GDI.csproj", "{D535E102-92B4-4F92-B284-A7170AE00CD6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|x64.ActiveCfg = Debug|x64 + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|x64.Build.0 = Debug|x64 + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|Any CPU.Build.0 = Release|Any CPU + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|x64.ActiveCfg = Release|x64 + {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|x64.Build.0 = Release|x64 + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|x64.ActiveCfg = Debug|x64 + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|x64.Build.0 = Debug|x64 + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|Any CPU.Build.0 = Release|Any CPU + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|x64.ActiveCfg = Release|x64 + {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|x64.Build.0 = Release|x64 + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Debug|x64.ActiveCfg = Debug|x64 + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Debug|x64.Build.0 = Debug|x64 + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Release|Any CPU.Build.0 = Release|Any CPU + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Release|x64.ActiveCfg = Release|x64 + {D535E102-92B4-4F92-B284-A7170AE00CD6}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {90F4F9E9-43D6-4A3D-91D5-B2DF113E13AE} + EndGlobalSection +EndGlobal diff --git a/src/MeshExplorer/Controls/DarkListBox.cs b/src/MeshExplorer/Controls/DarkListBox.cs index 2fc2262..c5a8555 100644 --- a/src/MeshExplorer/Controls/DarkListBox.cs +++ b/src/MeshExplorer/Controls/DarkListBox.cs @@ -70,11 +70,7 @@ namespace MeshExplorer.Controls e.Graphics.FillRectangle(background, e.Bounds); } - using (SolidBrush pen = new SolidBrush(Color.White)) - { - e.Graphics.DrawString(content, this.Font, pen, - new PointF(10, e.Bounds.Y + 3), StringFormat.GenericDefault); - } + TextRenderer.DrawText(e.Graphics, content, Font, new Point(10, e.Bounds.Y + 3), Color.White, TextFormatFlags.EndEllipsis); } } } diff --git a/src/MeshExplorer/FormMain.cs b/src/MeshExplorer/FormMain.cs index 1d149bf..96191b4 100644 --- a/src/MeshExplorer/FormMain.cs +++ b/src/MeshExplorer/FormMain.cs @@ -62,7 +62,7 @@ namespace MeshExplorer if (control != null) { InitializeRenderControl((Control)control); - renderManager.Initialize(control); + renderManager.Initialize(control, new TriangleNet.Rendering.GDI.LayerRenderer()); } else { diff --git a/src/MeshExplorer/MeshExplorer.csproj b/src/MeshExplorer/MeshExplorer.csproj index df84711..1623467 100644 --- a/src/MeshExplorer/MeshExplorer.csproj +++ b/src/MeshExplorer/MeshExplorer.csproj @@ -8,7 +8,8 @@ - + + \ No newline at end of file diff --git a/src/Triangle.Examples/Triangle.Examples.csproj b/src/Triangle.Examples/Triangle.Examples.csproj index 07f242f..4282bd9 100644 --- a/src/Triangle.Examples/Triangle.Examples.csproj +++ b/src/Triangle.Examples/Triangle.Examples.csproj @@ -4,7 +4,6 @@ Exe net6.0 TriangleNet - $(SolutionDir)bin\$(Configuration) @@ -12,12 +11,12 @@ - - - - + + + + diff --git a/src/Triangle.Rendering/ExtensionMethods.cs b/src/Triangle.Rendering.GDI/ExtensionMethods.cs similarity index 100% rename from src/Triangle.Rendering/ExtensionMethods.cs rename to src/Triangle.Rendering.GDI/ExtensionMethods.cs diff --git a/src/Triangle.Rendering/GDI/FunctionRenderer.cs b/src/Triangle.Rendering.GDI/FunctionRenderer.cs similarity index 100% rename from src/Triangle.Rendering/GDI/FunctionRenderer.cs rename to src/Triangle.Rendering.GDI/FunctionRenderer.cs diff --git a/src/Triangle.Rendering.GDI/Helper.cs b/src/Triangle.Rendering.GDI/Helper.cs new file mode 100644 index 0000000..81f71cd --- /dev/null +++ b/src/Triangle.Rendering.GDI/Helper.cs @@ -0,0 +1,28 @@ +using System.Collections.Generic; +using System.Drawing; + +namespace TriangleNet.Rendering.GDI +{ + internal class Helper + { + public static void Dispose(Dictionary brushes) + { + foreach (var brush in brushes.Values) + { + brush.Dispose(); + } + } + + public static Dictionary GetBrushDictionary(Dictionary ColorDictionary) + { + var brushes = new Dictionary(); + + foreach (var item in ColorDictionary) + { + brushes.Add(item.Key, new SolidBrush(item.Value)); + } + + return brushes; + } + } +} diff --git a/src/Triangle.Rendering/GDI/ImageRenderer.cs b/src/Triangle.Rendering.GDI/ImageRenderer.cs similarity index 96% rename from src/Triangle.Rendering/GDI/ImageRenderer.cs rename to src/Triangle.Rendering.GDI/ImageRenderer.cs index 78ffa7e..3011273 100644 --- a/src/Triangle.Rendering/GDI/ImageRenderer.cs +++ b/src/Triangle.Rendering.GDI/ImageRenderer.cs @@ -275,11 +275,11 @@ namespace TriangleNet.Rendering.GDI var colors = new ColorManager(); colors.Background = Color.White; - colors.Point = new SolidBrush(Color.FromArgb(60, 80, 120)); - colors.SteinerPoint = new SolidBrush(Color.DarkGreen); - colors.Line = new Pen(Color.FromArgb(200, 200, 200)); - colors.Segment = new Pen(Color.SteelBlue); - colors.VoronoiLine = new Pen(Color.FromArgb(160, 170, 180)); + colors.Point = Color.FromArgb(60, 80, 120); + colors.SteinerPoint = Color.DarkGreen; + colors.Line = Color.FromArgb(200, 200, 200); + colors.Segment = Color.SteelBlue; + colors.VoronoiLine = Color.FromArgb(160, 170, 180); return colors; } diff --git a/src/Triangle.Rendering/GDI/LayerRenderer.cs b/src/Triangle.Rendering.GDI/LayerRenderer.cs similarity index 92% rename from src/Triangle.Rendering/GDI/LayerRenderer.cs rename to src/Triangle.Rendering.GDI/LayerRenderer.cs index d80c752..6a9aa78 100644 --- a/src/Triangle.Rendering/GDI/LayerRenderer.cs +++ b/src/Triangle.Rendering.GDI/LayerRenderer.cs @@ -88,13 +88,17 @@ namespace TriangleNet.Rendering.GDI } else { - meshRenderer.RenderEdges(layer.Points.Data, layer.Indices.Data, Context.ColorManager.Line); + using var pen = new Pen(Context.ColorManager.Line); + + meshRenderer.RenderEdges(layer.Points.Data, layer.Indices.Data, pen); } } private void RenderPolygon(IRenderLayer layer) { - meshRenderer.RenderSegments(layer.Points.Data, layer.Indices.Data, Context.ColorManager.Segment); + using var pen = new Pen(Context.ColorManager.Segment); + + meshRenderer.RenderSegments(layer.Points.Data, layer.Indices.Data, pen); } private void RenderPoints(IRenderLayer layer) @@ -111,7 +115,9 @@ namespace TriangleNet.Rendering.GDI } else { - meshRenderer.RenderEdges(layer.Points.Data, layer.Indices.Data, Context.ColorManager.VoronoiLine); + using var pen = new Pen(Context.ColorManager.VoronoiLine); + + meshRenderer.RenderEdges(layer.Points.Data, layer.Indices.Data, pen); } } } diff --git a/src/Triangle.Rendering/GDI/MeshRenderer.cs b/src/Triangle.Rendering.GDI/MeshRenderer.cs similarity index 90% rename from src/Triangle.Rendering/GDI/MeshRenderer.cs rename to src/Triangle.Rendering.GDI/MeshRenderer.cs index f630cee..71e9d48 100644 --- a/src/Triangle.Rendering/GDI/MeshRenderer.cs +++ b/src/Triangle.Rendering.GDI/MeshRenderer.cs @@ -7,7 +7,6 @@ namespace TriangleNet.Rendering.GDI { using System.Drawing; - using TriangleNet.Rendering.GDI.Native; /// /// Renders a mesh. @@ -30,13 +29,16 @@ namespace TriangleNet.Rendering.GDI int n = points.Length / size; int m = limit > 0 ? limit : n; + using var Point = new SolidBrush(Context.ColorManager.Point); + using var SteinerPoint = new SolidBrush(Context.ColorManager.SteinerPoint); + // Draw unchanged points - RenderPoints(points, size, 0, m, Context.ColorManager.Point); + RenderPoints(points, size, 0, m, Point); // Draw new (Steiner) points if (limit > 0) { - RenderPoints(points, size, m, n, Context.ColorManager.SteinerPoint); + RenderPoints(points, size, m, n, SteinerPoint); } } @@ -86,9 +88,9 @@ namespace TriangleNet.Rendering.GDI bool filled = partition != null; - var brushes = filled ? Context.ColorManager.GetBrushDictionary() : null; + var brushes = filled ? Helper.GetBrushDictionary(Context.ColorManager.ColorDictionary) : null; - // TODO: remove hardcoded color + // TODO: remove hard-coded color var pen = new Pen(Color.FromArgb(20, 20, 20)); // Draw triangles @@ -133,7 +135,7 @@ namespace TriangleNet.Rendering.GDI if (filled) { - Context.ColorManager.Dispose(brushes); + Helper.Dispose(brushes); } } diff --git a/src/Triangle.Rendering/GDI/Native/GradientFillMode.cs b/src/Triangle.Rendering.GDI/Native/GradientFillMode.cs similarity index 100% rename from src/Triangle.Rendering/GDI/Native/GradientFillMode.cs rename to src/Triangle.Rendering.GDI/Native/GradientFillMode.cs diff --git a/src/Triangle.Rendering/GDI/Native/GradientRect.cs b/src/Triangle.Rendering.GDI/Native/GradientRect.cs similarity index 100% rename from src/Triangle.Rendering/GDI/Native/GradientRect.cs rename to src/Triangle.Rendering.GDI/Native/GradientRect.cs diff --git a/src/Triangle.Rendering/GDI/Native/GradientTriangle.cs b/src/Triangle.Rendering.GDI/Native/GradientTriangle.cs similarity index 100% rename from src/Triangle.Rendering/GDI/Native/GradientTriangle.cs rename to src/Triangle.Rendering.GDI/Native/GradientTriangle.cs diff --git a/src/Triangle.Rendering/GDI/Native/NativeMethods.cs b/src/Triangle.Rendering.GDI/Native/NativeMethods.cs similarity index 100% rename from src/Triangle.Rendering/GDI/Native/NativeMethods.cs rename to src/Triangle.Rendering.GDI/Native/NativeMethods.cs diff --git a/src/Triangle.Rendering/GDI/Native/TriVertex.cs b/src/Triangle.Rendering.GDI/Native/TriVertex.cs similarity index 100% rename from src/Triangle.Rendering/GDI/Native/TriVertex.cs rename to src/Triangle.Rendering.GDI/Native/TriVertex.cs diff --git a/src/Triangle.Rendering/GDI/RenderControl.cs b/src/Triangle.Rendering.GDI/RenderControl.cs similarity index 100% rename from src/Triangle.Rendering/GDI/RenderControl.cs rename to src/Triangle.Rendering.GDI/RenderControl.cs diff --git a/src/Triangle.Rendering.GDI/Triangle.Rendering.GDI.csproj b/src/Triangle.Rendering.GDI/Triangle.Rendering.GDI.csproj new file mode 100644 index 0000000..d1db388 --- /dev/null +++ b/src/Triangle.Rendering.GDI/Triangle.Rendering.GDI.csproj @@ -0,0 +1,17 @@ + + + + Library + net6.0-windows + true + TriangleNet.Rendering.GDI + Triangle.Rendering.GDI + AnyCPU;x64 + + + + + + + + diff --git a/src/Triangle.Rendering/ColorManager.cs b/src/Triangle.Rendering/ColorManager.cs index fd89305..bee0b2c 100644 --- a/src/Triangle.Rendering/ColorManager.cs +++ b/src/Triangle.Rendering/ColorManager.cs @@ -7,88 +7,37 @@ namespace TriangleNet.Rendering public class ColorManager { - Color background; - SolidBrush point; - SolidBrush steinerPoint; - Pen line; - Pen segment; - Pen voronoiLine; - #region Public properties /// /// Gets or sets the background color. /// - public Color Background - { - get { return background; } - set { background = value; } - } + public Color Background { get; set; } /// /// Gets or sets the brush used for points. /// - public SolidBrush Point - { - get { return point; } - set - { - if (point != null) point.Dispose(); - point = value; - } - } + public Color Point { get; set; } /// /// Gets or sets the brush used for steiner points. /// - public SolidBrush SteinerPoint - { - get { return steinerPoint; } - set - { - if (steinerPoint != null) steinerPoint.Dispose(); - steinerPoint = value; - } - } + public Color SteinerPoint { get; set; } /// /// Gets or sets the pen used for mesh edges. /// - public Pen Line - { - get { return line; } - set - { - if (line != null) line.Dispose(); - line = value; - } - } + public Color Line { get; set; } /// /// Gets or sets the pen used for mesh segments. /// - public Pen Segment - { - get { return segment; } - set - { - if (segment != null) segment.Dispose(); - segment = value; - } - } + public Color Segment { get; set; } /// /// Gets or sets the pen used for Voronoi edges. /// - public Pen VoronoiLine - { - get { return voronoiLine; } - set - { - if (voronoiLine != null) voronoiLine.Dispose(); - voronoiLine = value; - } - } + public Color VoronoiLine { get; set; } #endregion @@ -98,7 +47,7 @@ namespace TriangleNet.Rendering public Dictionary ColorDictionary { get; set; } /// - /// Gets or sets a colormap used for function plotting. + /// Gets or sets a color map used for function plotting. /// public ColorMap ColorMap { get; set; } @@ -110,11 +59,11 @@ namespace TriangleNet.Rendering var colors = new ColorManager(); colors.Background = Color.FromArgb(0, 0, 0); - colors.Point = new SolidBrush(Color.Green); - colors.SteinerPoint = new SolidBrush(Color.Peru); - colors.Line = new Pen(Color.FromArgb(30, 30, 30)); - colors.Segment = new Pen(Color.DarkBlue); - colors.VoronoiLine = new Pen(Color.FromArgb(40, 50, 60)); + colors.Point = Color.Green; + colors.SteinerPoint = Color.Peru; + colors.Line = Color.FromArgb(30, 30, 30); + colors.Segment = Color.DarkBlue; + colors.VoronoiLine = Color.FromArgb(40, 50, 60); return colors; } @@ -145,26 +94,6 @@ namespace TriangleNet.Rendering } } - internal void Dispose(Dictionary brushes) - { - foreach (var brush in brushes.Values) - { - brush.Dispose(); - } - } - - internal Dictionary GetBrushDictionary() - { - var brushes = new Dictionary(); - - foreach (var item in ColorDictionary) - { - brushes.Add(item.Key, new SolidBrush(item.Value)); - } - - return brushes; - } - // Change or add as many colors as you like... private static Color[] regionColors = { Color.Transparent, diff --git a/src/Triangle.Rendering/RenderManager.cs b/src/Triangle.Rendering/RenderManager.cs index c70cfa1..86a07b6 100644 --- a/src/Triangle.Rendering/RenderManager.cs +++ b/src/Triangle.Rendering/RenderManager.cs @@ -2,10 +2,8 @@ namespace TriangleNet.Rendering { using System.Collections.Generic; - using System.Windows.Forms; using TriangleNet.Geometry; using TriangleNet.Meshing; - using TriangleNet.Rendering.GDI; using TriangleNet.Rendering.Util; public class RenderManager @@ -26,21 +24,11 @@ namespace TriangleNet.Rendering { } - public RenderManager(IRenderControl control) - { - Initialize(control); - } - public RenderManager(IRenderControl control, IRenderer renderer) { Initialize(control, renderer); } - public void Initialize(IRenderControl control) - { - Initialize(control, new LayerRenderer()); - } - public void Initialize(IRenderControl control, IRenderer renderer) { this.zoom = new Projection(control.ClientRectangle); @@ -58,12 +46,7 @@ namespace TriangleNet.Rendering public bool TryCreateControl(string assemblyName, IEnumerable dependencies, out IRenderControl control) { - if (!ReflectionHelper.TryCreateControl(assemblyName, dependencies, out control)) - { - return false; - } - - return control is Control; + return ReflectionHelper.TryCreateControl(assemblyName, dependencies, out control); } public void Resize() diff --git a/src/Triangle.Rendering/Triangle.Rendering.csproj b/src/Triangle.Rendering/Triangle.Rendering.csproj index 679a9a5..9618430 100644 --- a/src/Triangle.Rendering/Triangle.Rendering.csproj +++ b/src/Triangle.Rendering/Triangle.Rendering.csproj @@ -2,9 +2,7 @@ Library - net6.0-windows - true - $(SolutionDir)bin\$(Configuration) + net6.0 TriangleNet.Rendering Triangle.Rendering AnyCPU;x64 diff --git a/src/Triangle.sln b/src/Triangle.sln index 25ef40f..e69823c 100644 --- a/src/Triangle.sln +++ b/src/Triangle.sln @@ -5,13 +5,11 @@ VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triangle", "Triangle\Triangle.csproj", "{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeshExplorer", "MeshExplorer\MeshExplorer.csproj", "{336AAF8A-5316-4303-9E73-5E38BD0B28AF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triangle.Rendering", "Triangle.Rendering\Triangle.Rendering.csproj", "{41022E0E-BD0F-439E-BC3A-AABB1B43471B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triangle.Tests", "Triangle.Tests\Triangle.Tests.csproj", "{67CCA496-DCD1-4D43-85D5-0A19A3948774}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Triangle.Examples", "Triangle.Examples\Triangle.Examples.csproj", "{70EC2A88-E7CC-4678-9936-ED539969B003}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triangle.Examples", "Triangle.Examples\Triangle.Examples.csproj", "{70EC2A88-E7CC-4678-9936-ED539969B003}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triangle.Rendering", "Triangle.Rendering\Triangle.Rendering.csproj", "{20D64FA8-EC38-4507-9D99-96F855ED62C0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -29,22 +27,6 @@ Global {F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Release|Any CPU.Build.0 = Release|Any CPU {F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Release|x64.ActiveCfg = Release|x64 {F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Release|x64.Build.0 = Release|x64 - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|x64.ActiveCfg = Debug|x64 - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Debug|x64.Build.0 = Debug|x64 - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|Any CPU.Build.0 = Release|Any CPU - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|x64.ActiveCfg = Release|x64 - {336AAF8A-5316-4303-9E73-5E38BD0B28AF}.Release|x64.Build.0 = Release|x64 - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|x64.ActiveCfg = Debug|x64 - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Debug|x64.Build.0 = Debug|x64 - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|Any CPU.Build.0 = Release|Any CPU - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|x64.ActiveCfg = Release|x64 - {41022E0E-BD0F-439E-BC3A-AABB1B43471B}.Release|x64.Build.0 = Release|x64 {67CCA496-DCD1-4D43-85D5-0A19A3948774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67CCA496-DCD1-4D43-85D5-0A19A3948774}.Debug|Any CPU.Build.0 = Debug|Any CPU {67CCA496-DCD1-4D43-85D5-0A19A3948774}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -55,12 +37,20 @@ Global {67CCA496-DCD1-4D43-85D5-0A19A3948774}.Release|x64.Build.0 = Release|Any CPU {70EC2A88-E7CC-4678-9936-ED539969B003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {70EC2A88-E7CC-4678-9936-ED539969B003}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70EC2A88-E7CC-4678-9936-ED539969B003}.Debug|x64.ActiveCfg = Debug|Any CPU - {70EC2A88-E7CC-4678-9936-ED539969B003}.Debug|x64.Build.0 = Debug|Any CPU + {70EC2A88-E7CC-4678-9936-ED539969B003}.Debug|x64.ActiveCfg = Debug|x64 + {70EC2A88-E7CC-4678-9936-ED539969B003}.Debug|x64.Build.0 = Debug|x64 {70EC2A88-E7CC-4678-9936-ED539969B003}.Release|Any CPU.ActiveCfg = Release|Any CPU {70EC2A88-E7CC-4678-9936-ED539969B003}.Release|Any CPU.Build.0 = Release|Any CPU - {70EC2A88-E7CC-4678-9936-ED539969B003}.Release|x64.ActiveCfg = Release|Any CPU - {70EC2A88-E7CC-4678-9936-ED539969B003}.Release|x64.Build.0 = Release|Any CPU + {70EC2A88-E7CC-4678-9936-ED539969B003}.Release|x64.ActiveCfg = Release|x64 + {70EC2A88-E7CC-4678-9936-ED539969B003}.Release|x64.Build.0 = Release|x64 + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Debug|x64.ActiveCfg = Debug|x64 + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Debug|x64.Build.0 = Debug|x64 + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Release|Any CPU.Build.0 = Release|Any CPU + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Release|x64.ActiveCfg = Release|x64 + {20D64FA8-EC38-4507-9D99-96F855ED62C0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Triangle/Triangle.csproj b/src/Triangle/Triangle.csproj index cfcc134..662a324 100644 --- a/src/Triangle/Triangle.csproj +++ b/src/Triangle/Triangle.csproj @@ -2,14 +2,17 @@ netstandard2.0 - $(SolutionDir)bin\$(Configuration) TriangleNet Triangle AnyCPU;x64 + true + Christian Woltering + 1.0.0 + 1.0.0-beta5 - + - +