Added 2D functions to AStar

core/math/a_star.cpp

@@ -440,13 +440,12 @@ void AStar::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_point_weight_scale", "id", "weight_scale"), &AStar::set_point_weight_scale);
 	ClassDB::bind_method(D_METHOD("remove_point", "id"), &AStar::remove_point);
 	ClassDB::bind_method(D_METHOD("has_point", "id"), &AStar::has_point);
+	ClassDB::bind_method(D_METHOD("get_point_connections", "id"), &AStar::get_point_connections);
 	ClassDB::bind_method(D_METHOD("get_points"), &AStar::get_points);
 
 	ClassDB::bind_method(D_METHOD("set_point_disabled", "id", "disabled"), &AStar::set_point_disabled, DEFVAL(true));
 	ClassDB::bind_method(D_METHOD("is_point_disabled", "id"), &AStar::is_point_disabled);
 
-	ClassDB::bind_method(D_METHOD("get_point_connections", "id"), &AStar::get_point_connections);
-
 	ClassDB::bind_method(D_METHOD("connect_points", "id", "to_id", "bidirectional"), &AStar::connect_points, DEFVAL(true));
 	ClassDB::bind_method(D_METHOD("disconnect_points", "id", "to_id"), &AStar::disconnect_points);
 	ClassDB::bind_method(D_METHOD("are_points_connected", "id", "to_id"), &AStar::are_points_connected);
@@ -473,3 +472,135 @@ AStar::~AStar() {
 	pass = 1;
 	clear();
 }
+
+/////////////////////////////////////////////////////////////
+
+int AStar2D::get_available_point_id() const {
+	return astar.get_available_point_id();
+}
+
+void AStar2D::add_point(int p_id, const Vector2 &p_pos, real_t p_weight_scale) {
+	astar.add_point(p_id, Vector3(p_pos.x, p_pos.y, 0), p_weight_scale);
+}
+
+Vector2 AStar2D::get_point_position(int p_id) const {
+	Vector3 p = astar.get_point_position(p_id);
+	return Vector2(p.x, p.y);
+}
+
+void AStar2D::set_point_position(int p_id, const Vector2 &p_pos) {
+	astar.set_point_position(p_id, Vector3(p_pos.x, p_pos.y, 0));
+}
+
+real_t AStar2D::get_point_weight_scale(int p_id) const {
+	return astar.get_point_weight_scale(p_id);
+}
+
+void AStar2D::set_point_weight_scale(int p_id, real_t p_weight_scale) {
+	astar.set_point_weight_scale(p_id, p_weight_scale);
+}
+
+void AStar2D::remove_point(int p_id) {
+	astar.remove_point(p_id);
+}
+
+bool AStar2D::has_point(int p_id) const {
+	return astar.has_point(p_id);
+}
+
+PoolVector<int> AStar2D::get_point_connections(int p_id) {
+	return astar.get_point_connections(p_id);
+}
+
+Array AStar2D::get_points() {
+	return astar.get_points();
+}
+
+void AStar2D::set_point_disabled(int p_id, bool p_disabled) {
+	astar.set_point_disabled(p_id, p_disabled);
+}
+
+bool AStar2D::is_point_disabled(int p_id) const {
+	return astar.is_point_disabled(p_id);
+}
+
+void AStar2D::connect_points(int p_id, int p_with_id, bool p_bidirectional) {
+	astar.connect_points(p_id, p_with_id, p_bidirectional);
+}
+
+void AStar2D::disconnect_points(int p_id, int p_with_id) {
+	astar.disconnect_points(p_id, p_with_id);
+}
+
+bool AStar2D::are_points_connected(int p_id, int p_with_id) const {
+	return astar.are_points_connected(p_id, p_with_id);
+}
+
+void AStar2D::clear() {
+	astar.clear();
+}
+
+int AStar2D::get_closest_point(const Vector2 &p_point) const {
+	return astar.get_closest_point(Vector3(p_point.x, p_point.y, 0));
+}
+
+Vector2 AStar2D::get_closest_position_in_segment(const Vector2 &p_point) const {
+	Vector3 p = astar.get_closest_position_in_segment(Vector3(p_point.x, p_point.y, 0));
+	return Vector2(p.x, p.y);
+}
+
+PoolVector<Vector2> AStar2D::get_point_path(int p_from_id, int p_to_id) {
+
+	PoolVector3Array pv = astar.get_point_path(p_from_id, p_to_id);
+	int size = pv.size();
+	PoolVector2Array path;
+	path.resize(size);
+	{
+		PoolVector<Vector3>::Read r = pv.read();
+		PoolVector<Vector2>::Write w = path.write();
+		for (int i = 0; i < size; i++) {
+			Vector3 p = r[i];
+			w[i] = Vector2(p.x, p.y);
+		}
+	}
+	return path;
+}
+
+PoolVector<int> AStar2D::get_id_path(int p_from_id, int p_to_id) {
+	return astar.get_id_path(p_from_id, p_to_id);
+}
+
+void AStar2D::_bind_methods() {
+
+	ClassDB::bind_method(D_METHOD("get_available_point_id"), &AStar2D::get_available_point_id);
+	ClassDB::bind_method(D_METHOD("add_point", "id", "position", "weight_scale"), &AStar2D::add_point, DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("get_point_position", "id"), &AStar2D::get_point_position);
+	ClassDB::bind_method(D_METHOD("set_point_position", "id", "position"), &AStar2D::set_point_position);
+	ClassDB::bind_method(D_METHOD("get_point_weight_scale", "id"), &AStar2D::get_point_weight_scale);
+	ClassDB::bind_method(D_METHOD("set_point_weight_scale", "id", "weight_scale"), &AStar2D::set_point_weight_scale);
+	ClassDB::bind_method(D_METHOD("remove_point", "id"), &AStar2D::remove_point);
+	ClassDB::bind_method(D_METHOD("has_point", "id"), &AStar2D::has_point);
+	ClassDB::bind_method(D_METHOD("get_point_connections", "id"), &AStar2D::get_point_connections);
+	ClassDB::bind_method(D_METHOD("get_points"), &AStar2D::get_points);
+
+	ClassDB::bind_method(D_METHOD("set_point_disabled", "id", "disabled"), &AStar2D::set_point_disabled, DEFVAL(true));
+	ClassDB::bind_method(D_METHOD("is_point_disabled", "id"), &AStar2D::is_point_disabled);
+
+	ClassDB::bind_method(D_METHOD("connect_points", "id", "to_id", "bidirectional"), &AStar2D::connect_points, DEFVAL(true));
+	ClassDB::bind_method(D_METHOD("disconnect_points", "id", "to_id"), &AStar2D::disconnect_points);
+	ClassDB::bind_method(D_METHOD("are_points_connected", "id", "to_id"), &AStar2D::are_points_connected);
+
+	ClassDB::bind_method(D_METHOD("clear"), &AStar2D::clear);
+
+	ClassDB::bind_method(D_METHOD("get_closest_point", "to_position"), &AStar2D::get_closest_point);
+	ClassDB::bind_method(D_METHOD("get_closest_position_in_segment", "to_position"), &AStar2D::get_closest_position_in_segment);
+
+	ClassDB::bind_method(D_METHOD("get_point_path", "from_id", "to_id"), &AStar2D::get_point_path);
+	ClassDB::bind_method(D_METHOD("get_id_path", "from_id", "to_id"), &AStar2D::get_id_path);
+}
+
+AStar2D::AStar2D() {
+}
+
+AStar2D::~AStar2D() {
+}

core/math/a_star.h

@@ -142,4 +142,43 @@ public:
 	~AStar();
 };
 
+class AStar2D : public Reference {
+	GDCLASS(AStar2D, Reference);
+	AStar astar;
+
+protected:
+	static void _bind_methods();
+
+public:
+	int get_available_point_id() const;
+
+	void add_point(int p_id, const Vector2 &p_pos, real_t p_weight_scale = 1);
+	Vector2 get_point_position(int p_id) const;
+	void set_point_position(int p_id, const Vector2 &p_pos);
+	real_t get_point_weight_scale(int p_id) const;
+	void set_point_weight_scale(int p_id, real_t p_weight_scale);
+	void remove_point(int p_id);
+	bool has_point(int p_id) const;
+	PoolVector<int> get_point_connections(int p_id);
+	Array get_points();
+
+	void set_point_disabled(int p_id, bool p_disabled = true);
+	bool is_point_disabled(int p_id) const;
+
+	void connect_points(int p_id, int p_with_id, bool p_bidirectional = true);
+	void disconnect_points(int p_id, int p_with_id);
+	bool are_points_connected(int p_id, int p_with_id) const;
+
+	void clear();
+
+	int get_closest_point(const Vector2 &p_point) const;
+	Vector2 get_closest_position_in_segment(const Vector2 &p_point) const;
+
+	PoolVector<Vector2> get_point_path(int p_from_id, int p_to_id);
+	PoolVector<int> get_id_path(int p_from_id, int p_to_id);
+
+	AStar2D();
+	~AStar2D();
+};
+
 #endif // ASTAR_H

core/register_core_types.cpp

@@ -184,6 +184,7 @@ void register_core_types() {
 	ClassDB::register_class<PackedDataContainer>();
 	ClassDB::register_virtual_class<PackedDataContainerRef>();
 	ClassDB::register_class<AStar>();
+	ClassDB::register_class<AStar2D>();
 	ClassDB::register_class<EncodedObjectAsID>();
 	ClassDB::register_class<RandomNumberGenerator>();
 

doc/classes/AStar.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="AStar" inherits="Reference" category="Core" version="3.2">
 	<brief_description>
-		AStar class representation that uses vectors as edges.
+		AStar class representation that uses 3d-vectors as edges.
 	</brief_description>
 	<description>
 		A* (A star) is a computer algorithm that is widely used in pathfinding and graph traversal, the process of plotting an efficiently directed path between multiple points. It enjoys widespread use due to its performance and accuracy. Godot's A* implementation make use of vectors as points.

doc/classes/AStar2D.xml

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="AStar2D" inherits="Reference" category="Core" version="3.2">
+	<brief_description>
+		AStar class representation that uses 2d-vectors as edges.
+	</brief_description>
+	<description>
+		This is a wrapper for the [AStar] class which uses 2D vectors instead of 3D vectors.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="add_point">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="position" type="Vector2">
+			</argument>
+			<argument index="2" name="weight_scale" type="float" default="1.0">
+			</argument>
+			<description>
+				Adds a new point at the given position with the given identifier. The algorithm prefers points with lower [code]weight_scale[/code] to form a path. The [code]id[/code] must be 0 or larger, and the [code]weight_scale[/code] must be 1 or larger.
+				[codeblock]
+				var as = AStar2D.new()
+				as.add_point(1, Vector2(1, 0), 4) # Adds the point (1, 0) with weight_scale 4 and id 1
+				[/codeblock]
+				If there already exists a point for the given id, its position and weight scale are updated to the given values.
+			</description>
+		</method>
+		<method name="are_points_connected" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="to_id" type="int">
+			</argument>
+			<description>
+				Returns whether there is a connection/segment between the given points.
+			</description>
+		</method>
+		<method name="clear">
+			<return type="void">
+			</return>
+			<description>
+				Clears all the points and segments.
+			</description>
+		</method>
+		<method name="connect_points">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="to_id" type="int">
+			</argument>
+			<argument index="2" name="bidirectional" type="bool" default="true">
+			</argument>
+			<description>
+				Creates a segment between the given points. If [code]bidirectional[/code] is [code]false[/code], only movement from [code]id[/code] to [code]to_id[/code] is allowed, not the reverse direction.
+				[codeblock]
+				var as = AStar2D.new()
+				as.add_point(1, Vector2(1, 1))
+				as.add_point(2, Vector2(0, 5))
+				as.connect_points(1, 2, false)
+				[/codeblock]
+			</description>
+		</method>
+		<method name="disconnect_points">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="to_id" type="int">
+			</argument>
+			<description>
+				Deletes the segment between the given points.
+			</description>
+		</method>
+		<method name="get_available_point_id" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Returns the next available point id with no point associated to it.
+			</description>
+		</method>
+		<method name="get_closest_point" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="to_position" type="Vector2">
+			</argument>
+			<description>
+				Returns the id of the closest point to [code]to_position[/code]. Returns -1 if there are no points in the points pool.
+			</description>
+		</method>
+		<method name="get_closest_position_in_segment" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="to_position" type="Vector2">
+			</argument>
+			<description>
+				Returns the closest position to [code]to_position[/code] that resides inside a segment between two connected points.
+				[codeblock]
+				var as = AStar2D.new()
+				as.add_point(1, Vector2(0, 0))
+				as.add_point(2, Vector2(0, 5))
+				as.connect_points(1, 2)
+				var res = as.get_closest_position_in_segment(Vector2(3, 3)) # returns (0, 3)
+				[/codeblock]
+				The result is in the segment that goes from [code]y = 0[/code] to [code]y = 5[/code]. It's the closest position in the segment to the given point.
+			</description>
+		</method>
+		<method name="get_id_path">
+			<return type="PoolIntArray">
+			</return>
+			<argument index="0" name="from_id" type="int">
+			</argument>
+			<argument index="1" name="to_id" type="int">
+			</argument>
+			<description>
+				Returns an array with the ids of the points that form the path found by AStar2D between the given points. The array is ordered from the starting point to the ending point of the path.
+				[codeblock]
+				var as = AStar2D.new()
+				as.add_point(1, Vector2(0, 0))
+				as.add_point(2, Vector2(0, 1), 1) # default weight is 1
+				as.add_point(3, Vector2(1, 1))
+				as.add_point(4, Vector2(2, 0))
+
+				as.connect_points(1, 2, false)
+				as.connect_points(2, 3, false)
+				as.connect_points(4, 3, false)
+				as.connect_points(1, 4, false)
+				as.connect_points(5, 4, false)
+
+				var res = as.get_id_path(1, 3) # returns [1, 2, 3]
+				[/codeblock]
+				If you change the 2nd point's weight to 3, then the result will be [code][1, 4, 3][/code] instead, because now even though the distance is longer, it's "easier" to get through point 4 than through point 2.
+			</description>
+		</method>
+		<method name="get_point_connections">
+			<return type="PoolIntArray">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+				Returns an array with the ids of the points that form the connect with the given point.
+				[codeblock]
+				var as = AStar2D.new()
+				as.add_point(1, Vector2(0, 0))
+				as.add_point(2, Vector2(0, 1))
+				as.add_point(3, Vector2(1, 1))
+				as.add_point(4, Vector2(2, 0))
+
+				as.connect_points(1, 2, true)
+				as.connect_points(1, 3, true)
+
+				var neighbors = as.get_point_connections(1) # returns [2, 3]
+				[/codeblock]
+			</description>
+		</method>
+		<method name="get_point_path">
+			<return type="PoolVector2Array">
+			</return>
+			<argument index="0" name="from_id" type="int">
+			</argument>
+			<argument index="1" name="to_id" type="int">
+			</argument>
+			<description>
+				Returns an array with the points that are in the path found by AStar2D between the given points. The array is ordered from the starting point to the ending point of the path.
+			</description>
+		</method>
+		<method name="get_point_position" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+				Returns the position of the point associated with the given id.
+			</description>
+		</method>
+		<method name="get_point_weight_scale" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+				Returns the weight scale of the point associated with the given id.
+			</description>
+		</method>
+		<method name="get_points">
+			<return type="Array">
+			</return>
+			<description>
+				Returns an array of all points.
+			</description>
+		</method>
+		<method name="has_point" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+				Returns whether a point associated with the given id exists.
+			</description>
+		</method>
+		<method name="is_point_disabled" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+				Returns whether a point is disabled or not for pathfinding. By default, all points are enabled.
+			</description>
+		</method>
+		<method name="remove_point">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+				Removes the point associated with the given id from the points pool.
+			</description>
+		</method>
+		<method name="set_point_disabled">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="disabled" type="bool" default="true">
+			</argument>
+			<description>
+				Disables or enables the specified point for pathfinding. Useful for making a temporary obstacle.
+			</description>
+		</method>
+		<method name="set_point_position">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="position" type="Vector2">
+			</argument>
+			<description>
+				Sets the position for the point with the given id.
+			</description>
+		</method>
+		<method name="set_point_weight_scale">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="weight_scale" type="float">
+			</argument>
+			<description>
+				Sets the [code]weight_scale[/code] for the point with the given id.
+			</description>
+		</method>
+	</methods>
+	<constants>
+	</constants>
+</class>