Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-22 11:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rethink the previous fix.

Browse Source
This commit is contained in:
Relintai 2023-06-11 18:32:15 +02:00
parent 50c96d5414
commit 975e5c4a9e
12 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/2d/navigation_agent_2d.cpp
View File

@ -98,7 +98,7 @@ void NavigationAgent2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("distance_to_target"), &NavigationAgent2D::distance_to_target); ClassDB::bind_method(D_METHOD("distance_to_target"), &NavigationAgent2D::distance_to_target);
ClassDB::bind_method(D_METHOD("get_current_navigation_result"), &NavigationAgent2D::get_current_navigation_result); ClassDB::bind_method(D_METHOD("get_current_navigation_result"), &NavigationAgent2D::get_current_navigation_result);
ClassDB::bind_method(D_METHOD("get_current_navigation_path"), &NavigationAgent2D::get_current_navigation_path_bind); ClassDB::bind_method(D_METHOD("get_current_navigation_path"), &NavigationAgent2D::get_current_navigation_path);
ClassDB::bind_method(D_METHOD("get_current_navigation_path_index"), &NavigationAgent2D::get_current_navigation_path_index); ClassDB::bind_method(D_METHOD("get_current_navigation_path_index"), &NavigationAgent2D::get_current_navigation_path_index);
ClassDB::bind_method(D_METHOD("is_target_reached"), &NavigationAgent2D::is_target_reached); ClassDB::bind_method(D_METHOD("is_target_reached"), &NavigationAgent2D::is_target_reached);
ClassDB::bind_method(D_METHOD("is_target_reachable"), &NavigationAgent2D::is_target_reachable); ClassDB::bind_method(D_METHOD("is_target_reachable"), &NavigationAgent2D::is_target_reachable);
@ -596,11 +596,7 @@ Ref<NavigationPathQueryResult2D> NavigationAgent2D::get_current_navigation_resul
return navigation_result; return navigation_result;
} }
const Vector<Vector2> &NavigationAgent2D::get_current_navigation_path() const { Vector<Vector2> NavigationAgent2D::get_current_navigation_path() const {
return navigation_result->get_path();
}
Vector<Vector2> NavigationAgent2D::get_current_navigation_path_bind() const {
return navigation_result->get_path(); return navigation_result->get_path();
} }

3
scene/2d/navigation_agent_2d.h
View File

@ -197,8 +197,7 @@ public:
Ref<NavigationPathQueryResult2D> get_current_navigation_result() const; Ref<NavigationPathQueryResult2D> get_current_navigation_result() const;
const Vector<Vector2> &get_current_navigation_path() const; Vector<Vector2> get_current_navigation_path() const;
Vector<Vector2> get_current_navigation_path_bind() const;
int get_current_navigation_path_index() const { int get_current_navigation_path_index() const {
return nav_path_index; return nav_path_index;

2
scene/2d/navigation_obstacle_2d.cpp
View File

@ -52,7 +52,7 @@ void NavigationObstacle2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_velocity"), &NavigationObstacle2D::get_velocity); ClassDB::bind_method(D_METHOD("get_velocity"), &NavigationObstacle2D::get_velocity);
ClassDB::bind_method(D_METHOD("set_vertices", "vertices"), &NavigationObstacle2D::set_vertices); ClassDB::bind_method(D_METHOD("set_vertices", "vertices"), &NavigationObstacle2D::set_vertices);
ClassDB::bind_method(D_METHOD("get_vertices"), &NavigationObstacle2D::get_vertices_bind); ClassDB::bind_method(D_METHOD("get_vertices"), &NavigationObstacle2D::get_vertices);
ClassDB::bind_method(D_METHOD("set_avoidance_layers", "layers"), &NavigationObstacle2D::set_avoidance_layers); ClassDB::bind_method(D_METHOD("set_avoidance_layers", "layers"), &NavigationObstacle2D::set_avoidance_layers);
ClassDB::bind_method(D_METHOD("get_avoidance_layers"), &NavigationObstacle2D::get_avoidance_layers); ClassDB::bind_method(D_METHOD("get_avoidance_layers"), &NavigationObstacle2D::get_avoidance_layers);

3
scene/2d/navigation_obstacle_2d.h
View File

@ -92,8 +92,7 @@ public:
} }
void set_vertices(const Vector<Vector2> &p_vertices); void set_vertices(const Vector<Vector2> &p_vertices);
const Vector<Vector2> &get_vertices() const { return vertices; }; Vector<Vector2> get_vertices() const { return vertices; };
Vector<Vector2> get_vertices_bind() const { return vertices; };
void set_avoidance_layers(uint32_t p_layers); void set_avoidance_layers(uint32_t p_layers);
uint32_t get_avoidance_layers() const; uint32_t get_avoidance_layers() const;

8
scene/3d/navigation_agent.cpp
View File

@ -111,7 +111,7 @@ void NavigationAgent::_bind_methods() {
ClassDB::bind_method(D_METHOD("distance_to_target"), &NavigationAgent::distance_to_target); ClassDB::bind_method(D_METHOD("distance_to_target"), &NavigationAgent::distance_to_target);
ClassDB::bind_method(D_METHOD("get_current_navigation_result"), &NavigationAgent::get_current_navigation_result); ClassDB::bind_method(D_METHOD("get_current_navigation_result"), &NavigationAgent::get_current_navigation_result);
ClassDB::bind_method(D_METHOD("get_current_navigation_path"), &NavigationAgent::get_current_navigation_path_bind); ClassDB::bind_method(D_METHOD("get_current_navigation_path"), &NavigationAgent::get_current_navigation_path);
ClassDB::bind_method(D_METHOD("get_current_navigation_path_index"), &NavigationAgent::get_current_navigation_path_index); ClassDB::bind_method(D_METHOD("get_current_navigation_path_index"), &NavigationAgent::get_current_navigation_path_index);
ClassDB::bind_method(D_METHOD("is_target_reached"), &NavigationAgent::is_target_reached); ClassDB::bind_method(D_METHOD("is_target_reached"), &NavigationAgent::is_target_reached);
ClassDB::bind_method(D_METHOD("is_target_reachable"), &NavigationAgent::is_target_reachable); ClassDB::bind_method(D_METHOD("is_target_reachable"), &NavigationAgent::is_target_reachable);
@ -573,11 +573,7 @@ Ref<NavigationPathQueryResult3D> NavigationAgent::get_current_navigation_result(
return navigation_result; return navigation_result;
} }
const Vector<Vector3> &NavigationAgent::get_current_navigation_path() const { Vector<Vector3> NavigationAgent::get_current_navigation_path() const {
return navigation_result->get_path();
}
Vector<Vector3> NavigationAgent::get_current_navigation_path_bind() const {
return navigation_result->get_path(); return navigation_result->get_path();
} }

3
scene/3d/navigation_agent.h
View File

@ -222,8 +222,7 @@ public:
Ref<NavigationPathQueryResult3D> get_current_navigation_result() const; Ref<NavigationPathQueryResult3D> get_current_navigation_result() const;
const Vector<Vector3> &get_current_navigation_path() const; Vector<Vector3> get_current_navigation_path() const;
Vector<Vector3> get_current_navigation_path_bind() const;
int get_current_navigation_path_index() const { int get_current_navigation_path_index() const {
return nav_path_index; return nav_path_index;

2
scene/3d/navigation_obstacle.cpp
View File

@ -62,7 +62,7 @@ void NavigationObstacle::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_velocity"), &NavigationObstacle::get_velocity); ClassDB::bind_method(D_METHOD("get_velocity"), &NavigationObstacle::get_velocity);
ClassDB::bind_method(D_METHOD("set_vertices", "vertices"), &NavigationObstacle::set_vertices); ClassDB::bind_method(D_METHOD("set_vertices", "vertices"), &NavigationObstacle::set_vertices);
ClassDB::bind_method(D_METHOD("get_vertices"), &NavigationObstacle::get_vertices_bind); ClassDB::bind_method(D_METHOD("get_vertices"), &NavigationObstacle::get_vertices);
ClassDB::bind_method(D_METHOD("set_avoidance_layers", "layers"), &NavigationObstacle::set_avoidance_layers); ClassDB::bind_method(D_METHOD("set_avoidance_layers", "layers"), &NavigationObstacle::set_avoidance_layers);
ClassDB::bind_method(D_METHOD("get_avoidance_layers"), &NavigationObstacle::get_avoidance_layers); ClassDB::bind_method(D_METHOD("get_avoidance_layers"), &NavigationObstacle::get_avoidance_layers);

3
scene/3d/navigation_obstacle.h
View File

@ -105,8 +105,7 @@ public:
real_t get_height() const { return height; } real_t get_height() const { return height; }
void set_vertices(const Vector<Vector3> &p_vertices); void set_vertices(const Vector<Vector3> &p_vertices);
const Vector<Vector3> &get_vertices() const { return vertices; }; Vector<Vector3> get_vertices() const { return vertices; };
Vector<Vector3> get_vertices_bind() const { return vertices; };
void set_avoidance_layers(uint32_t p_layers); void set_avoidance_layers(uint32_t p_layers);
uint32_t get_avoidance_layers() const; uint32_t get_avoidance_layers() const;

2
servers/navigation/navigation_path_query_parameters_2d.cpp
View File

@ -83,7 +83,7 @@ void NavigationPathQueryParameters2D::set_map(const RID &p_map) {
parameters.map = p_map; parameters.map = p_map;
} }
const RID &NavigationPathQueryParameters2D::get_map() const { const RID NavigationPathQueryParameters2D::get_map() const {
return parameters.map; return parameters.map;
} }

2
servers/navigation/navigation_path_query_parameters_2d.h
View File

@ -70,7 +70,7 @@ public:
PathPostProcessing get_path_postprocessing() const; PathPostProcessing get_path_postprocessing() const;
void set_map(const RID &p_map); void set_map(const RID &p_map);
const RID &get_map() const; const RID get_map() const;
void set_start_position(const Vector2 p_start_position); void set_start_position(const Vector2 p_start_position);
Vector2 get_start_position() const; Vector2 get_start_position() const;

6
servers/navigation/navigation_path_query_parameters_3d.cpp
View File

@ -83,7 +83,7 @@ void NavigationPathQueryParameters3D::set_map(const RID &p_map) {
parameters.map = p_map; parameters.map = p_map;
} }
const RID &NavigationPathQueryParameters3D::get_map() const { const RID NavigationPathQueryParameters3D::get_map() const {
return parameters.map; return parameters.map;
} }
@ -91,7 +91,7 @@ void NavigationPathQueryParameters3D::set_start_position(const Vector3 &p_start_
parameters.start_position = p_start_position; parameters.start_position = p_start_position;
} }
const Vector3 &NavigationPathQueryParameters3D::get_start_position() const { const Vector3 NavigationPathQueryParameters3D::get_start_position() const {
return parameters.start_position; return parameters.start_position;
} }
@ -99,7 +99,7 @@ void NavigationPathQueryParameters3D::set_target_position(const Vector3 &p_targe
parameters.target_position = p_target_position; parameters.target_position = p_target_position;
} }
const Vector3 &NavigationPathQueryParameters3D::get_target_position() const { const Vector3 NavigationPathQueryParameters3D::get_target_position() const {
return parameters.target_position; return parameters.target_position;
} }

6
servers/navigation/navigation_path_query_parameters_3d.h
View File

@ -69,13 +69,13 @@ public:
PathPostProcessing get_path_postprocessing() const; PathPostProcessing get_path_postprocessing() const;
void set_map(const RID &p_map); void set_map(const RID &p_map);
const RID &get_map() const; const RID get_map() const;
void set_start_position(const Vector3 &p_start_position); void set_start_position(const Vector3 &p_start_position);
const Vector3 &get_start_position() const; const Vector3 get_start_position() const;
void set_target_position(const Vector3 &p_target_position); void set_target_position(const Vector3 &p_target_position);
const Vector3 &get_target_position() const; const Vector3 get_target_position() const;
void set_navigation_layers(uint32_t p_navigation_layers); void set_navigation_layers(uint32_t p_navigation_layers);
uint32_t get_navigation_layers() const; uint32_t get_navigation_layers() const;