Skip to content

Commit f61551d

Browse files
antonfirsovantonfirsov
committed
restructure solutions and fix DrawShapesWithImageSharp sample
1 parent 64edabf commit f61551d

File tree

3 files changed

+40
-39
lines changed

3 files changed

+40
-39
lines changed

ImageSharp.Drawing.Samples.sln renamed to DrawingBackendBenchmark.sln

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@ VisualStudioVersion = 18.4.11626.88 stable
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5D20AA90-6969-D8BD-9DCD-8634F4692FDA}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{69CD3146-97C1-401E-BDDB-1FFBA63B8810}"
9-
EndProject
108
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
119
EndProject
1210
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{042B144E-5444-4B88-B4F2-038E54FC25D0}"
1311
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUWindowDemo", "samples\WebGPUWindowDemo\WebGPUWindowDemo.csproj", "{380AB484-A32A-416A-81E7-E48A134913E8}"
15-
EndProject
1612
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU", "src\ImageSharp.Drawing.WebGPU\ImageSharp.Drawing.WebGPU.csproj", "{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}"
1713
EndProject
1814
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU.ShaderGen", "src\ImageSharp.Drawing.WebGPU.ShaderGen\ImageSharp.Drawing.WebGPU.ShaderGen.csproj", "{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}"
@@ -29,18 +25,6 @@ Global
2925
Release|x86 = Release|x86
3026
EndGlobalSection
3127
GlobalSection(ProjectConfigurationPlatforms) = postSolution
32-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x64.ActiveCfg = Debug|Any CPU
35-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x64.Build.0 = Debug|Any CPU
36-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x86.ActiveCfg = Debug|Any CPU
37-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x86.Build.0 = Debug|Any CPU
38-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x64.ActiveCfg = Release|Any CPU
41-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x64.Build.0 = Release|Any CPU
42-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x86.ActiveCfg = Release|Any CPU
43-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x86.Build.0 = Release|Any CPU
4428
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4529
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
4630
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -53,18 +37,6 @@ Global
5337
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x64.Build.0 = Release|Any CPU
5438
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x86.ActiveCfg = Release|Any CPU
5539
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x86.Build.0 = Release|Any CPU
56-
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57-
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
58-
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x64.ActiveCfg = Debug|Any CPU
59-
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x64.Build.0 = Debug|Any CPU
60-
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x86.ActiveCfg = Debug|Any CPU
61-
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x86.Build.0 = Debug|Any CPU
62-
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
63-
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|Any CPU.Build.0 = Release|Any CPU
64-
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x64.ActiveCfg = Release|Any CPU
65-
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x64.Build.0 = Release|Any CPU
66-
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x86.ActiveCfg = Release|Any CPU
67-
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x86.Build.0 = Release|Any CPU
6840
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6941
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
7042
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -106,9 +78,7 @@ Global
10678
HideSolutionNode = FALSE
10779
EndGlobalSection
10880
GlobalSection(NestedProjects) = preSolution
109-
{69CD3146-97C1-401E-BDDB-1FFBA63B8810} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
11081
{042B144E-5444-4B88-B4F2-038E54FC25D0} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
111-
{380AB484-A32A-416A-81E7-E48A134913E8} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
11282
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
11383
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
11484
{0AF23A97-CD73-409A-AA29-D214AA400AB0} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}

‎ImageSharp.Drawing.sln‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU.S
335335
EndProject
336336
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.ManualBenchmarks", "tests\ImageSharp.Drawing.ManualBenchmarks\ImageSharp.Drawing.ManualBenchmarks.csproj", "{70193989-E587-451A-AF34-4C74FEE5DA5A}"
337337
EndProject
338+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}"
339+
EndProject
340+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUWindowDemo", "samples\WebGPUWindowDemo\WebGPUWindowDemo.csproj", "{999D90DE-6940-4693-9F80-701F2D5DB77A}"
341+
EndProject
342+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}"
343+
EndProject
338344
Global
339345
GlobalSection(SolutionConfigurationPlatforms) = preSolution
340346
Debug|Any CPU = Debug|Any CPU
@@ -417,6 +423,30 @@ Global
417423
{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x64.Build.0 = Release|Any CPU
418424
{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x86.ActiveCfg = Release|Any CPU
419425
{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x86.Build.0 = Release|Any CPU
426+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
427+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
428+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x64.ActiveCfg = Debug|Any CPU
429+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x64.Build.0 = Debug|Any CPU
430+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x86.ActiveCfg = Debug|Any CPU
431+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x86.Build.0 = Debug|Any CPU
432+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
433+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|Any CPU.Build.0 = Release|Any CPU
434+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x64.ActiveCfg = Release|Any CPU
435+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x64.Build.0 = Release|Any CPU
436+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x86.ActiveCfg = Release|Any CPU
437+
{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x86.Build.0 = Release|Any CPU
438+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
439+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
440+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x64.ActiveCfg = Debug|Any CPU
441+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x64.Build.0 = Debug|Any CPU
442+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x86.ActiveCfg = Debug|Any CPU
443+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x86.Build.0 = Debug|Any CPU
444+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
445+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|Any CPU.Build.0 = Release|Any CPU
446+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x64.ActiveCfg = Release|Any CPU
447+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x64.Build.0 = Release|Any CPU
448+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x86.ActiveCfg = Release|Any CPU
449+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x86.Build.0 = Release|Any CPU
420450
EndGlobalSection
421451
GlobalSection(SolutionProperties) = preSolution
422452
HideSolutionNode = FALSE
@@ -446,6 +476,8 @@ Global
446476
{061582C2-658F-40AE-A978-7D74A4EB2C0A} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
447477
{C7606104-5D58-4670-912C-3F336606B02D} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
448478
{70193989-E587-451A-AF34-4C74FEE5DA5A} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
479+
{999D90DE-6940-4693-9F80-701F2D5DB77A} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
480+
{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
449481
EndGlobalSection
450482
GlobalSection(ExtensibilityGlobals) = postSolution
451483
SolutionGuid = {5F8B9D1F-CD8B-4CC5-8216-D531E25BD795}

‎samples/DrawShapesWithImageSharp/Program.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,11 @@ private static void DrawOval()
136136
=> new EllipsePolygon(0, 0, 10, 20).Scale(5).SaveImage("Curves", "Ellipse.png");
137137

138138
private static void DrawArc() => new Polygon(new CubicBezierLineSegment(
139-
[
140-
new(10, 400),
141-
new(30, 10),
142-
new(240, 30),
143-
new(300, 400)
144-
])).SaveImage(500, 500, "Curves", "Arc.png");
139+
[new PointF(10, 400),
140+
new PointF(30, 10),
141+
new PointF(240, 30),
142+
new PointF(300, 400)]))
143+
.SaveImage(500, 500, "Curves", "Arc.png");
145144

146145
private static void OutputDrawnShape()
147146
{
@@ -237,7 +236,7 @@ public static void SaveImage(this IPathCollection collection, params string[] pa
237236
int height = (int)(collection.Bounds.Top + collection.Bounds.Bottom);
238237
using Image<Rgba32> img = new(width, height);
239238

240-
img.Mutate(i => i.ProcessWithCanvas(canvas =>
239+
img.Mutate(i => i.Paint(canvas =>
241240
{
242241
// Fill the canvas background and draw our shape.
243242
canvas.Fill(Brushes.Solid(Color.DarkBlue));
@@ -263,7 +262,7 @@ public static void SaveImageWithPath(this IPathCollection collection, IPath shap
263262

264263
using Image<Rgba32> img = new(width, height);
265264

266-
img.Mutate(i => i.ProcessWithCanvas(canvas =>
265+
img.Mutate(i => i.Paint(canvas =>
267266
{
268267
// Fill the canvas background and draw our shape.
269268
canvas.Fill(Brushes.Solid(Color.DarkBlue));
@@ -285,7 +284,7 @@ public static void SaveImage(this IPath shape, int width, int height, params str
285284
public static void SaveImage(this IPathCollection shape, int width, int height, params string[] path)
286285
{
287286
using Image<Rgba32> img = new(width, height);
288-
img.Mutate(i => i.ProcessWithCanvas(canvas =>
287+
img.Mutate(i => i.Paint(canvas =>
289288
{
290289
canvas.Fill(Brushes.Solid(Color.DarkBlue));
291290
canvas.Fill(Brushes.Solid(Color.HotPink), shape);

0 commit comments

Comments
 (0)