diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-08 22:19:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 22:19:55 +0100 |
| commit | a5963500b9b1b4cc965c2ff14d1f50ca955f4964 (patch) | |
| tree | c5fdd34021dc5e3e519df172ea15de5f9b3e84d8 /scene | |
| parent | f05f2dd80fca926a5dc1a58249321b638209f425 (diff) | |
| parent | 68b04a5a073e66f73b0df3daec89999960f04c84 (diff) | |
Merge pull request #57818 from raulsntos/typed-navigation
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/navigation_region_2d.cpp | 8 | ||||
| -rw-r--r-- | scene/2d/navigation_region_2d.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scene/2d/navigation_region_2d.cpp b/scene/2d/navigation_region_2d.cpp index 4bead978f1..e685ad8f67 100644 --- a/scene/2d/navigation_region_2d.cpp +++ b/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]; diff --git a/scene/2d/navigation_region_2d.h b/scene/2d/navigation_region_2d.h index 012debb584..487a578401 100644 --- a/scene/2d/navigation_region_2d.h +++ b/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 |