Merge pull request #89025 from Chubercik/clipper2-1.3.0

clipper2: Update to 1.3.0
godotengine · Mar 8, 2024 · 7755079 · 7755079
2 parents 6f51f73 + 973448e
commit 7755079
Show file tree

Hide file tree

Showing 15 changed files with 1,542 additions and 1,447 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -185,7 +185,7 @@ License: MPL-2.0
 
 Files: ./thirdparty/clipper2/
 Comment: Clipper2
-Copyright: 2010-2013, Angus Johnson
+Copyright: 2010-2023, Angus Johnson
 License: BSL-1.0
 
 Files: ./thirdparty/cvtt/

diff --git a/modules/navigation/2d/nav_mesh_generator_2d.cpp b/modules/navigation/2d/nav_mesh_generator_2d.cpp
@@ -789,7 +789,7 @@ void NavMeshGenerator2D::generator_bake_from_source_geometry_data(Ref<Navigation
 		const int rect_end_y = baking_rect.position[1] + baking_rect.size[1] + baking_rect_offset.y;
 
 		Rect64 clipper_rect = Rect64(rect_begin_x, rect_begin_y, rect_end_x, rect_end_y);
-		RectClip rect_clip = RectClip(clipper_rect);
+		RectClip64 rect_clip = RectClip64(clipper_rect);
 
 		traversable_polygon_paths = rect_clip.Execute(traversable_polygon_paths);
 		obstruction_polygon_paths = rect_clip.Execute(obstruction_polygon_paths);
@@ -821,7 +821,7 @@ void NavMeshGenerator2D::generator_bake_from_source_geometry_data(Ref<Navigation
 		const int rect_end_y = baking_rect.position[1] + baking_rect.size[1] + baking_rect_offset.y - border_size;
 
 		Rect64 clipper_rect = Rect64(rect_begin_x, rect_begin_y, rect_end_x, rect_end_y);
-		RectClip rect_clip = RectClip(clipper_rect);
+		RectClip64 rect_clip = RectClip64(clipper_rect);
 
 		path_solution = rect_clip.Execute(path_solution);
 	}

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -94,14 +94,17 @@ Files extracted from upstream source:
 ## clipper2
 
 - Upstream: https://github.com/AngusJohnson/Clipper2
-- Version: 1.2.2 (756c5079aacab5837e812a143c59dc48a09f22e7, 2023)
+- Version: 1.3.0 (98db5662e8dd1808a5a7b50c5605a2289bb390e8, 2023)
 - License: BSL 1.0
 
 Files extracted from upstream source:
 
-- `CPP/Clipper2Lib` folder
+- `CPP/Clipper2Lib/` folder (in root)
 - `LICENSE`
 
+Apply the patches in the `patches/` folder when syncing on newer upstream
+commits.
+
 
 ## cvtt