Quellcode durchsuchen

Merge pull request #57818 from raulsntos/typed-navigation

Rémi Verschelde vor 3 Jahren
Ursprung
Commit
a5963500b9
2 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
  1. 4 4
      scene/2d/navigation_region_2d.cpp
  2. 2 2
      scene/2d/navigation_region_2d.h

+ 4 - 4
scene/2d/navigation_region_2d.cpp

@@ -104,8 +104,8 @@ void NavigationPolygon::_set_polygons(const TypedArray<Vector<int32_t>> &p_array
 	}
 }
 
-Array NavigationPolygon::_get_polygons() const {
-	Array ret;
+TypedArray<Vector<int32_t>> NavigationPolygon::_get_polygons() const {
+	TypedArray<Vector<int32_t>> ret;
 	ret.resize(polygons.size());
 	for (int i = 0; i < ret.size(); i++) {
 		ret[i] = polygons[i].indices;
@@ -122,8 +122,8 @@ void NavigationPolygon::_set_outlines(const TypedArray<Vector<Vector2>> &p_array
 	rect_cache_dirty = true;
 }
 
-Array NavigationPolygon::_get_outlines() const {
-	Array ret;
+TypedArray<Vector<Vector2>> NavigationPolygon::_get_outlines() const {
+	TypedArray<Vector<Vector2>> ret;
 	ret.resize(outlines.size());
 	for (int i = 0; i < ret.size(); i++) {
 		ret[i] = outlines[i];

+ 2 - 2
scene/2d/navigation_region_2d.h

@@ -55,10 +55,10 @@ protected:
 	static void _bind_methods();
 
 	void _set_polygons(const TypedArray<Vector<int32_t>> &p_array);
-	Array _get_polygons() const;
+	TypedArray<Vector<int32_t>> _get_polygons() const;
 
 	void _set_outlines(const TypedArray<Vector<Vector2>> &p_array);
-	Array _get_outlines() const;
+	TypedArray<Vector<Vector2>> _get_outlines() const;
 
 public:
 #ifdef TOOLS_ENABLED