Expose existing SoftBody3D methods in editor

LordDeatHunter · LordDeatHunter · commit 97e1f8ffa139 · 2025-09-08T20:17:36.000+02:00
diff --git a/doc/classes/PhysicsServer3D.xml b/doc/classes/PhysicsServer3D.xml
@@ -1150,6 +1150,20 @@
 				Returns the current position of the given soft body point in global coordinates.
 			</description>
 		</method>
+		<method name="soft_body_get_point_count" qualifiers="const">
+			<return type="int" />
+			<param index="0" name="body" type="RID" />
+			<description>
+				Returns total number of points on the given soft body.
+			</description>
+		</method>
+		<method name="soft_body_get_bounds" qualifiers="const">
+			<return type="AABB" />
+			<param index="0" name="body" type="RID" />
+			<description>
+				Returns the [AABB] of the given soft body.
+			</description>
+		</method>
 		<method name="soft_body_get_pressure_coefficient" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="body" type="RID" />
diff --git a/doc/classes/PhysicsServer3DExtension.xml b/doc/classes/PhysicsServer3DExtension.xml
@@ -1073,6 +1073,18 @@
 			<description>
 			</description>
 		</method>
+		<method name="_soft_body_get_point_count" qualifiers="virtual required const">
+			<return type="int" />
+			<param index="0" name="body" type="RID" />
+			<description>
+			</description>
+		</method>
+		<method name="_soft_body_get_bounds" qualifiers="virtual required const">
+			<return type="AABB" />
+			<param index="0" name="body" type="RID" />
+			<description>
+			</description>
+		</method>
 		<method name="_soft_body_get_pressure_coefficient" qualifiers="virtual required const">
 			<return type="float" />
 			<param index="0" name="body" type="RID" />
diff --git a/doc/classes/SoftBody3D.xml b/doc/classes/SoftBody3D.xml
@@ -84,6 +84,18 @@
 				Returns local translation of a vertex in the surface array.
 			</description>
 		</method>
+		<method name="get_point_count">
+			<return type="int" />
+			<description>
+				Returns total number of points on the given soft body.
+			</description>
+		</method>
+		<method name="get_bounds">
+			<return type="AABB" />
+			<description>
+				Returns the [AABB] of the given soft body.
+			</description>
+		</method>
 		<method name="is_point_pinned" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="point_index" type="int" />
diff --git a/modules/godot_physics_3d/godot_physics_server_3d.cpp b/modules/godot_physics_3d/godot_physics_server_3d.cpp
@@ -1216,6 +1216,13 @@ Vector3 GodotPhysicsServer3D::soft_body_get_point_global_position(RID p_body, in
 	return soft_body->get_vertex_position(p_point_index);
 }
 
+uint32_t GodotPhysicsServer3D::soft_body_get_point_count(RID p_body) const {
+	GodotSoftBody3D *soft_body = soft_body_owner.get_or_null(p_body);
+	ERR_FAIL_NULL_V(soft_body, 0);
+
+	return soft_body->get_vertex_count();
+}
+
 void GodotPhysicsServer3D::soft_body_remove_all_pinned_points(RID p_body) {
 	GodotSoftBody3D *soft_body = soft_body_owner.get_or_null(p_body);
 	ERR_FAIL_NULL(soft_body);
diff --git a/modules/godot_physics_3d/godot_physics_server_3d.h b/modules/godot_physics_3d/godot_physics_server_3d.h
@@ -313,6 +313,8 @@ class GodotPhysicsServer3D : public PhysicsServer3D {
 	virtual void soft_body_move_point(RID p_body, int p_point_index, const Vector3 &p_global_position) override;
 	virtual Vector3 soft_body_get_point_global_position(RID p_body, int p_point_index) const override;
 
+	virtual uint32_t soft_body_get_point_count(RID p_body) const override;
+
 	virtual void soft_body_remove_all_pinned_points(RID p_body) override;
 	virtual void soft_body_pin_point(RID p_body, int p_point_index, bool p_pin) override;
 	virtual bool soft_body_is_point_pinned(RID p_body, int p_point_index) const override;
diff --git a/modules/godot_physics_3d/godot_soft_body_3d.cpp b/modules/godot_physics_3d/godot_soft_body_3d.cpp
@@ -426,6 +426,10 @@ uint32_t GodotSoftBody3D::get_node_count() const {
 	return nodes.size();
 }
 
+uint32_t GodotSoftBody3D::get_vertex_count() const {
+	return map_visual_to_physics.size();
+}
+
 real_t GodotSoftBody3D::get_node_inv_mass(uint32_t p_node_index) const {
 	ERR_FAIL_UNSIGNED_INDEX_V(p_node_index, nodes.size(), 0.0);
 	return nodes[p_node_index].im;
diff --git a/modules/godot_physics_3d/godot_soft_body_3d.h b/modules/godot_physics_3d/godot_soft_body_3d.h
@@ -168,6 +168,7 @@ class GodotSoftBody3D : public GodotCollisionObject3D {
 	bool is_vertex_pinned(int p_index) const;
 
 	uint32_t get_node_count() const;
+	uint32_t get_vertex_count() const;
 	real_t get_node_inv_mass(uint32_t p_node_index) const;
 	Vector3 get_node_position(uint32_t p_node_index) const;
 	Vector3 get_node_velocity(uint32_t p_node_index) const;
diff --git a/modules/jolt_physics/jolt_physics_server_3d.cpp b/modules/jolt_physics/jolt_physics_server_3d.cpp
@@ -1224,6 +1224,13 @@ Vector3 JoltPhysicsServer3D::soft_body_get_point_global_position(RID p_body, int
 	return body->get_vertex_position(p_point_index);
 }
 
+uint32_t JoltPhysicsServer3D::soft_body_get_point_count(RID p_body) const {
+	JoltSoftBody3D *body = soft_body_owner.get_or_null(p_body);
+	ERR_FAIL_NULL_V(body, 0);
+
+	return body->get_vertex_count();
+}
+
 void JoltPhysicsServer3D::soft_body_remove_all_pinned_points(RID p_body) {
 	JoltSoftBody3D *body = soft_body_owner.get_or_null(p_body);
 	ERR_FAIL_NULL(body);
diff --git a/modules/jolt_physics/jolt_physics_server_3d.h b/modules/jolt_physics/jolt_physics_server_3d.h
@@ -356,6 +356,8 @@ class JoltPhysicsServer3D final : public PhysicsServer3D {
 
 	virtual Vector3 soft_body_get_point_global_position(RID p_body, int p_point_index) const override;
 
+	virtual uint32_t soft_body_get_point_count(RID p_body) const override;
+
 	virtual void soft_body_remove_all_pinned_points(RID p_body) override;
 
 	virtual void soft_body_pin_point(RID p_body, int p_point_index, bool p_pin) override;
diff --git a/modules/jolt_physics/objects/jolt_soft_body_3d.cpp b/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
@@ -721,6 +721,13 @@ void JoltSoftBody3D::set_vertex_position(int p_index, const Vector3 &p_position)
 	_vertices_changed();
 }
 
+uint32_t JoltSoftBody3D::get_vertex_count() const {
+	ERR_FAIL_COND_V_MSG(!in_space(), false, vformat("Failed to retrieve vertex count for '%s'. Doing so without a physics space is not supported when using Jolt Physics. If this relates to a node, try adding the node to a scene tree first.", to_string()));
+	ERR_FAIL_NULL_V(shared, 0);
+
+	return shared->mesh_to_physics.size();
+}
+
 void JoltSoftBody3D::pin_vertex(int p_index) {
 	pinned_vertices.insert(p_index);
 
diff --git a/modules/jolt_physics/objects/jolt_soft_body_3d.h b/modules/jolt_physics/objects/jolt_soft_body_3d.h
@@ -164,6 +164,7 @@ class JoltSoftBody3D final : public JoltObject3D {
 
 	Vector3 get_vertex_position(int p_index);
 	void set_vertex_position(int p_index, const Vector3 &p_position);
+	uint32_t get_vertex_count() const;
 
 	void pin_vertex(int p_index);
 	void unpin_vertex(int p_index);
diff --git a/scene/3d/physics/soft_body_3d.cpp b/scene/3d/physics/soft_body_3d.cpp
@@ -374,6 +374,9 @@ void SoftBody3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_point_pinned", "point_index", "pinned", "attachment_path", "insert_at"), &SoftBody3D::pin_point, DEFVAL(NodePath()), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("is_point_pinned", "point_index"), &SoftBody3D::is_point_pinned);
 
+	ClassDB::bind_method(D_METHOD("get_point_count"), &SoftBody3D::get_vertex_count);
+	ClassDB::bind_method(D_METHOD("get_bounds"), &SoftBody3D::get_bounds);
+
 	ClassDB::bind_method(D_METHOD("set_ray_pickable", "ray_pickable"), &SoftBody3D::set_ray_pickable);
 	ClassDB::bind_method(D_METHOD("is_ray_pickable"), &SoftBody3D::is_ray_pickable);
 
@@ -688,6 +691,14 @@ Vector3 SoftBody3D::get_point_transform(int p_point_index) {
 	return PhysicsServer3D::get_singleton()->soft_body_get_point_global_position(physics_rid, p_point_index);
 }
 
+uint32_t SoftBody3D::get_vertex_count() const {
+	return PhysicsServer3D::get_singleton()->soft_body_get_point_count(physics_rid);
+}
+
+AABB SoftBody3D::get_bounds() const {
+	return PhysicsServer3D::get_singleton()->soft_body_get_bounds(physics_rid);
+}
+
 void SoftBody3D::apply_impulse(int p_point_index, const Vector3 &p_impulse) {
 	PhysicsServer3D::get_singleton()->soft_body_apply_point_impulse(physics_rid, p_point_index, p_impulse);
 }
diff --git a/scene/3d/physics/soft_body_3d.h b/scene/3d/physics/soft_body_3d.h
@@ -151,6 +151,8 @@ class SoftBody3D : public MeshInstance3D {
 
 	void set_parent_collision_ignore(const NodePath &p_parent_collision_ignore);
 	const NodePath &get_parent_collision_ignore() const;
+	uint32_t get_vertex_count() const;
+	AABB get_bounds() const;
 
 	void set_pinned_points_indices(Vector<PinnedPoint> p_pinned_points_indices);
 	Vector<PinnedPoint> get_pinned_points_indices();
diff --git a/servers/extensions/physics_server_3d_extension.cpp b/servers/extensions/physics_server_3d_extension.cpp
@@ -363,6 +363,8 @@ void PhysicsServer3DExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_soft_body_move_point, "body", "point_index", "global_position");
 	GDVIRTUAL_BIND(_soft_body_get_point_global_position, "body", "point_index");
 
+	GDVIRTUAL_BIND(_soft_body_get_point_count, "body");
+
 	GDVIRTUAL_BIND(_soft_body_remove_all_pinned_points, "body");
 	GDVIRTUAL_BIND(_soft_body_pin_point, "body", "point_index", "pin");
 	GDVIRTUAL_BIND(_soft_body_is_point_pinned, "body", "point_index");
diff --git a/servers/extensions/physics_server_3d_extension.h b/servers/extensions/physics_server_3d_extension.h
@@ -470,6 +470,8 @@ class PhysicsServer3DExtension : public PhysicsServer3D {
 	EXBIND3(soft_body_move_point, RID, int, const Vector3 &)
 	EXBIND2RC(Vector3, soft_body_get_point_global_position, RID, int)
 
+	EXBIND1RC(uint32_t, soft_body_get_point_count, RID)
+
 	EXBIND1(soft_body_remove_all_pinned_points, RID)
 	EXBIND3(soft_body_pin_point, RID, int, bool)
 	EXBIND2RC(bool, soft_body_is_point_pinned, RID, int)
diff --git a/servers/physics_server_3d.cpp b/servers/physics_server_3d.cpp
@@ -905,6 +905,8 @@ void PhysicsServer3D::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("soft_body_is_point_pinned", "body", "point_index"), &PhysicsServer3D::soft_body_is_point_pinned);
 
+	ClassDB::bind_method(D_METHOD("soft_body_get_point_count", "body"), &PhysicsServer3D::soft_body_get_point_count);
+
 	ClassDB::bind_method(D_METHOD("soft_body_apply_point_impulse", "body", "point_index", "impulse"), &PhysicsServer3D::soft_body_apply_point_impulse);
 	ClassDB::bind_method(D_METHOD("soft_body_apply_point_force", "body", "point_index", "force"), &PhysicsServer3D::soft_body_apply_point_force);
 	ClassDB::bind_method(D_METHOD("soft_body_apply_central_impulse", "body", "impulse"), &PhysicsServer3D::soft_body_apply_central_impulse);
diff --git a/servers/physics_server_3d.h b/servers/physics_server_3d.h
@@ -628,6 +628,8 @@ class PhysicsServer3D : public Object {
 	virtual void soft_body_move_point(RID p_body, int p_point_index, const Vector3 &p_global_position) = 0;
 	virtual Vector3 soft_body_get_point_global_position(RID p_body, int p_point_index) const = 0;
 
+	virtual uint32_t soft_body_get_point_count(RID p_body) const = 0;
+
 	virtual void soft_body_apply_point_impulse(RID p_body, int p_point_index, const Vector3 &p_impulse) = 0;
 	virtual void soft_body_apply_point_force(RID p_body, int p_point_index, const Vector3 &p_force) = 0;
 	virtual void soft_body_apply_central_impulse(RID p_body, const Vector3 &p_impulse) = 0;
diff --git a/servers/physics_server_3d_dummy.h b/servers/physics_server_3d_dummy.h
@@ -362,6 +362,8 @@ class PhysicsServer3DDummy : public PhysicsServer3D {
 	virtual void soft_body_move_point(RID p_body, int p_point_index, const Vector3 &p_global_position) override {}
 	virtual Vector3 soft_body_get_point_global_position(RID p_body, int p_point_index) const override { return Vector3(); }
 
+	virtual uint32_t soft_body_get_point_count(RID p_body) const override { return 0; }
+
 	virtual void soft_body_remove_all_pinned_points(RID p_body) override {}
 	virtual void soft_body_pin_point(RID p_body, int p_point_index, bool p_pin) override {}
 	virtual bool soft_body_is_point_pinned(RID p_body, int p_point_index) const override { return false; }
diff --git a/servers/physics_server_3d_wrap_mt.h b/servers/physics_server_3d_wrap_mt.h
@@ -327,6 +327,8 @@ class PhysicsServer3DWrapMT : public PhysicsServer3D {
 	FUNC2(soft_body_set_drag_coefficient, RID, real_t);
 	FUNC1RC(real_t, soft_body_get_drag_coefficient, RID);
 
+	FUNC1RC(uint32_t, soft_body_get_point_count, RID);
+
 	FUNC2(soft_body_set_mesh, RID, RID);
 
 	FUNC1RC(AABB, soft_body_get_bounds, RID);
