Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Clipper2 to release a8269ca #4

Merged
merged 4 commits into from
Dec 7, 2024
Merged

Bump Clipper2 to release a8269ca #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50bf38c
pull latest Clipper2 submodule code
kmarcisz Dec 6, 2024
63d9550
use new signature for ellipse binding
kmarcisz Dec 6, 2024
0f3fe1e
remove deprecated compilation flag
kmarcisz Dec 6, 2024
c54bff9
build the new library version with latest Clipper2 code
kmarcisz Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clipper2
Open in desktop
Submodule clipper2 updated 80 files
+13 −37 .github/workflows/actions_cpp.yml
+1 −1 .github/workflows/actions_csharp.yml
+353 −121 CPP/BenchMark/GetIntersectPtBenchmark.cpp
+1 −1 CPP/BenchMark/PointInPolygonBenchmark.cpp
+71 −16 CPP/CMakeLists.txt
+6 −0 CPP/Clipper2Config.cmake.in
+158 −43 CPP/Clipper2Lib/include/clipper2/clipper.core.h
+27 −23 CPP/Clipper2Lib/include/clipper2/clipper.engine.h
+373 −111 CPP/Clipper2Lib/include/clipper2/clipper.export.h
+11 −23 CPP/Clipper2Lib/include/clipper2/clipper.h
+8 −8 CPP/Clipper2Lib/include/clipper2/clipper.offset.h
+9 −8 CPP/Clipper2Lib/include/clipper2/clipper.rectclip.h
+1 −1 CPP/Clipper2Lib/include/clipper2/clipper.version.h
+111 −59 CPP/Clipper2Lib/src/clipper.engine.cpp
+127 −158 CPP/Clipper2Lib/src/clipper.offset.cpp
+49 −26 CPP/Clipper2Lib/src/clipper.rectclip.cpp
+44 −19 CPP/Tests/TestExportHeaders.cpp
+52 −0 CPP/Tests/TestIsCollinear.cpp
+0 −2 CPP/Tests/TestLines.cpp
+75 −3 CPP/Tests/TestOffsets.cpp
+16 −2 CPP/Tests/TestPolygons.cpp
+2 −3 CPP/Tests/TestPolytreeHoles.cpp
+62 −0 CPP/Tests/TestRect.cpp
+10 −0 CPP/Tests/TestRectClip.cpp
+22 −21 CPP/Utils/ClipFileLoad.cpp
+15 −15 CPP/Utils/ClipFileSave.cpp
+33 −32 CPP/Utils/clipper.svg.cpp
+12 −12 CPP/Utils/clipper.svg.h
+5 −5 CPP/Utils/clipper.svg.utils.h
+3 −3 CSharp/Clipper2Lib.Benchmark/Benchmarks.cs
+1 −1 CSharp/Clipper2Lib.Benchmark/Program.cs
+29 −33 CSharp/Clipper2Lib.Examples/ConsoleDemo/Main.cs
+7 −9 CSharp/Clipper2Lib.Examples/InflateDemo/Main.cs
+102 −55 CSharp/Clipper2Lib/Clipper.Core.cs
+190 −208 CSharp/Clipper2Lib/Clipper.Engine.cs
+3 −3 CSharp/Clipper2Lib/Clipper.Minkowski.cs
+159 −198 CSharp/Clipper2Lib/Clipper.Offset.cs
+95 −93 CSharp/Clipper2Lib/Clipper.RectClip.cs
+136 −53 CSharp/Clipper2Lib/Clipper.cs
+1 −1 CSharp/Clipper2Lib/HashCode.cs
+57 −47 CSharp/USINGZ.TestApp/Program.cs
+4 −0 CSharp/USINGZ.TestApp/UsingZTestApp.csproj
+22 −14 CSharp/Utils/ClipFileIO/Clipper.FileIO.cs
+18 −17 CSharp/Utils/SVG/Clipper.SVG.cs
+186 −0 DLL/CPP_DLL/Clipper2ZDll.vcxproj
+1 −1 DLL/CPP_DLL/Clipper2_DLL.sln
+7 −6 DLL/CPP_DLL/Clipper2_Dll.vcxproj
+31 −0 DLL/CPP_DLL/Clipper2_Z_DLL.sln
+0 −11 DLL/CSharp_TestApp/CSharp_TestApp.csproj
+0 −291 DLL/CSharp_TestApp/Program.cs
+0 −16 DLL/CSharp_TestApp2/CSharp_TestApp2.csproj
+0 −63 DLL/CSharp_TestApp2/CSharp_TestApp2.sln
+0 −184 DLL/CSharp_TestApp2/Program.cs
+0 −0 DLL/Delphi_TestApp/COMPILE AND ADD Clipper2_64.dll HERE
+0 −736 DLL/Delphi_TestApp/Test_DLL.dpr
+0 −138 DLL/Delphi_TestApp/Test_DLL.dproj
+0 −0 DLL/TEST_APPS/CSharp_TestApps/COPY Clipper2 DLLs HERE
+19 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp/CSharp_TestApp.csproj
+0 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp/CSharp_TestApp.sln
+392 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp/Clipper2DllCore.cs
+469 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp/Clipper2DllSvg.cs
+253 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp/Program.cs
+ − DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp/polytree_sample.png
+23 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp2/CSharp_TestApp2.csproj
+49 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp2/CSharp_TestApp2.sln
+392 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp2/Clipper2DllCore.cs
+469 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp2/Clipper2DllSvg.cs
+123 −0 DLL/TEST_APPS/CSharp_TestApps/CSharp_TestApp2/Program.cs
+0 −0 DLL/TEST_APPS/Delphi_TestApps/Output/COPY Clipper2 DLLs HERE
+329 −0 DLL/TEST_APPS/Delphi_TestApps/TestApp1/Clipper2DllCore.pas
+774 −0 DLL/TEST_APPS/Delphi_TestApps/TestApp1/Clipper2DllSVG.pas
+135 −0 DLL/TEST_APPS/Delphi_TestApps/TestApp1/Test1_DLL.dpr
+189 −0 DLL/TEST_APPS/Delphi_TestApps/TestApp1/Test1_DLL.dproj
+161 −80 Delphi/Clipper2Lib/Clipper.Core.pas
+62 −60 Delphi/Clipper2Lib/Clipper.Engine.pas
+130 −163 Delphi/Clipper2Lib/Clipper.Offset.pas
+47 −25 Delphi/Clipper2Lib/Clipper.RectClip.pas
+9 −8 Delphi/Clipper2Lib/Clipper.pas
+112 −35 Delphi/Utils/Clipper.SVG.pas
+6 −3 README.md
8 changes: 4 additions & 4 deletions clipper2-wasm/clipper.bindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ EMSCRIPTEN_BINDINGS(clipper_module) {
.function("Intersects", &Rect64::Intersects)
.function("Equals", &Rect64::operator==);

function("Ellipse64", select_overload<Path64(const Point64&, double, double, int)>(&Ellipse), allow_raw_pointers());
function("EllipseFromRect64", select_overload<Path64(const Rect64&, int)>(&Ellipse), allow_raw_pointers());
function("Ellipse64", select_overload<Path64(const Point64&, double, double, size_t)>(&Ellipse), allow_raw_pointers());
function("EllipseFromRect64", select_overload<Path64(const Rect64&, size_t)>(&Ellipse), allow_raw_pointers());

// Translate64
function("TranslatePath64", select_overload<Path64(const Path64&, int64_t, int64_t)>(&TranslatePath), allow_raw_pointers());
Expand Down Expand Up @@ -234,8 +234,8 @@ EMSCRIPTEN_BINDINGS(clipper_module) {
.function("Intersects", &RectD::Intersects)
.function("Equals", &RectD::operator==);

function("EllipseD", select_overload<PathD(const PointD&, double, double, int)>(&Ellipse), allow_raw_pointers());
function("EllipseFromRectD", select_overload<PathD(const RectD&, int)>(&Ellipse), allow_raw_pointers());
function("EllipseD", select_overload<PathD(const PointD&, double, double, size_t)>(&Ellipse), allow_raw_pointers());
function("EllipseFromRectD", select_overload<PathD(const RectD&, size_t)>(&Ellipse), allow_raw_pointers());

// TranslateD
function("TranslatePathD", select_overload<PathD(const PathD&, double, double)>(&TranslatePath), allow_raw_pointers());
Expand Down
2 changes: 1 addition & 1 deletion clipper2-wasm/compile-wasm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mkdir -p clipper2-wasm/dist/umd
COMMON_FLAGS="-Iclipper2/CPP/Clipper2Lib/include -DUSINGZ --bind -s MODULARIZE=1 -s WASM_BIGINT -s ALLOW_MEMORY_GROWTH=1 -s EXIT_RUNTIME=0"

# Development build flags
DEV_FLAGS="-g3 -s ASSERTIONS=2 --source-map-base http://localhost:11009/ -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=1 -s SAFE_HEAP=1 -O0"
DEV_FLAGS="-g3 -s ASSERTIONS=2 --source-map-base http://localhost:11009/ -s DISABLE_EXCEPTION_CATCHING=0 -s SAFE_HEAP=1 -O0"

# Production build flags
PROD_FLAGS="-O3 -s DISABLE_EXCEPTION_CATCHING=1"
Expand Down
10 changes: 5 additions & 5 deletions clipper2-wasm/dist/es/clipper2z-utils.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified clipper2-wasm/dist/es/clipper2z-utils.wasm
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions clipper2-wasm/dist/es/clipper2z.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified clipper2-wasm/dist/es/clipper2z.wasm
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions clipper2-wasm/dist/umd/clipper2z-utils.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified clipper2-wasm/dist/umd/clipper2z-utils.wasm
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions clipper2-wasm/dist/umd/clipper2z.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified clipper2-wasm/dist/umd/clipper2z.wasm
View file
Open in desktop
Binary file not shown.