summaryrefslogtreecommitdiff
path: root/servers/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'servers/extensions')
-rw-r--r--servers/extensions/physics_server_2d_extension.cpp69
-rw-r--r--servers/extensions/physics_server_2d_extension.h26
-rw-r--r--servers/extensions/physics_server_3d_extension.cpp137
-rw-r--r--servers/extensions/physics_server_3d_extension.h32
4 files changed, 195 insertions, 69 deletions
diff --git a/servers/extensions/physics_server_2d_extension.cpp b/servers/extensions/physics_server_2d_extension.cpp
index 2ef4cd3352..e5920c78d4 100644
--- a/servers/extensions/physics_server_2d_extension.cpp
+++ b/servers/extensions/physics_server_2d_extension.cpp
@@ -123,6 +123,8 @@ bool PhysicsServer2DExtension::body_test_motion_is_excluding_object(ObjectID p_o
}
void PhysicsServer2DExtension::_bind_methods() {
+ /* SHAPE API */
+
GDVIRTUAL_BIND(_world_boundary_shape_create);
GDVIRTUAL_BIND(_separation_ray_shape_create);
GDVIRTUAL_BIND(_segment_shape_create);
@@ -133,18 +135,32 @@ void PhysicsServer2DExtension::_bind_methods() {
GDVIRTUAL_BIND(_concave_polygon_shape_create);
GDVIRTUAL_BIND(_shape_set_data, "shape", "data");
+ GDVIRTUAL_BIND(_shape_set_custom_solver_bias, "shape", "bias");
GDVIRTUAL_BIND(_shape_get_type, "shape");
GDVIRTUAL_BIND(_shape_get_data, "shape");
+ GDVIRTUAL_BIND(_shape_get_custom_solver_bias, "shape");
+ GDVIRTUAL_BIND(_shape_collide, "shape_A", "xform_A", "motion_A", "shape_B", "xform_B", "motion_B", "results", "result_max", "result_count");
+
+ /* SPACE API */
GDVIRTUAL_BIND(_space_create);
GDVIRTUAL_BIND(_space_set_active, "space", "active");
GDVIRTUAL_BIND(_space_is_active, "space");
+
GDVIRTUAL_BIND(_space_set_param, "space", "param", "value");
GDVIRTUAL_BIND(_space_get_param, "space", "param");
+
GDVIRTUAL_BIND(_space_get_direct_state, "space");
+ GDVIRTUAL_BIND(_space_set_debug_contacts, "space", "max_contacts");
+ GDVIRTUAL_BIND(_space_get_contacts, "space");
+ GDVIRTUAL_BIND(_space_get_contact_count, "space");
+
+ /* AREA API */
+
GDVIRTUAL_BIND(_area_create);
+
GDVIRTUAL_BIND(_area_set_space, "area", "space");
GDVIRTUAL_BIND(_area_get_space, "area");
@@ -160,8 +176,11 @@ void PhysicsServer2DExtension::_bind_methods() {
GDVIRTUAL_BIND(_area_remove_shape, "area", "shape_idx");
GDVIRTUAL_BIND(_area_clear_shapes, "area");
- GDVIRTUAL_BIND(_area_set_collision_layer, "area", "layer");
- GDVIRTUAL_BIND(_area_set_collision_mask, "area", "mask");
+ GDVIRTUAL_BIND(_area_attach_object_instance_id, "area", "id");
+ GDVIRTUAL_BIND(_area_get_object_instance_id, "area");
+
+ GDVIRTUAL_BIND(_area_attach_canvas_instance_id, "area", "id");
+ GDVIRTUAL_BIND(_area_get_canvas_instance_id, "area");
GDVIRTUAL_BIND(_area_set_param, "area", "param", "value");
GDVIRTUAL_BIND(_area_set_transform, "area", "transform");
@@ -169,15 +188,19 @@ void PhysicsServer2DExtension::_bind_methods() {
GDVIRTUAL_BIND(_area_get_param, "area", "param");
GDVIRTUAL_BIND(_area_get_transform, "area");
- GDVIRTUAL_BIND(_area_attach_object_instance_id, "area", "id");
- GDVIRTUAL_BIND(_area_get_object_instance_id, "area");
+ GDVIRTUAL_BIND(_area_set_collision_layer, "area", "layer");
+ GDVIRTUAL_BIND(_area_get_collision_layer, "area");
- GDVIRTUAL_BIND(_area_attach_canvas_instance_id, "area", "id");
- GDVIRTUAL_BIND(_area_get_canvas_instance_id, "area");
+ GDVIRTUAL_BIND(_area_set_collision_mask, "area", "mask");
+ GDVIRTUAL_BIND(_area_get_collision_mask, "area");
+
+ GDVIRTUAL_BIND(_area_set_monitorable, "area", "monitorable");
+ GDVIRTUAL_BIND(_area_set_pickable, "area", "pickable");
GDVIRTUAL_BIND(_area_set_monitor_callback, "area", "callback");
GDVIRTUAL_BIND(_area_set_area_monitor_callback, "area", "callback");
- GDVIRTUAL_BIND(_area_set_monitorable, "area", "monitorable");
+
+ /* BODY API */
GDVIRTUAL_BIND(_body_create);
@@ -195,12 +218,12 @@ void PhysicsServer2DExtension::_bind_methods() {
GDVIRTUAL_BIND(_body_get_shape, "body", "shape_idx");
GDVIRTUAL_BIND(_body_get_shape_transform, "body", "shape_idx");
- GDVIRTUAL_BIND(_body_remove_shape, "body", "shape_idx");
- GDVIRTUAL_BIND(_body_clear_shapes, "body");
-
GDVIRTUAL_BIND(_body_set_shape_disabled, "body", "shape_idx", "disabled");
GDVIRTUAL_BIND(_body_set_shape_as_one_way_collision, "body", "shape_idx", "enable", "margin");
+ GDVIRTUAL_BIND(_body_remove_shape, "body", "shape_idx");
+ GDVIRTUAL_BIND(_body_clear_shapes, "body");
+
GDVIRTUAL_BIND(_body_attach_object_instance_id, "body", "id");
GDVIRTUAL_BIND(_body_get_object_instance_id, "body");
@@ -249,25 +272,39 @@ void PhysicsServer2DExtension::_bind_methods() {
GDVIRTUAL_BIND(_body_add_collision_exception, "body", "excepted_body");
GDVIRTUAL_BIND(_body_remove_collision_exception, "body", "excepted_body");
+ GDVIRTUAL_BIND(_body_get_collision_exceptions, "body");
GDVIRTUAL_BIND(_body_set_max_contacts_reported, "body", "amount");
GDVIRTUAL_BIND(_body_get_max_contacts_reported, "body");
+ GDVIRTUAL_BIND(_body_set_contacts_reported_depth_threshold, "body", "threshold");
+ GDVIRTUAL_BIND(_body_get_contacts_reported_depth_threshold, "body");
+
GDVIRTUAL_BIND(_body_set_omit_force_integration, "body", "enable");
GDVIRTUAL_BIND(_body_is_omitting_force_integration, "body");
+ GDVIRTUAL_BIND(_body_set_state_sync_callback, "body", "callable");
GDVIRTUAL_BIND(_body_set_force_integration_callback, "body", "callable", "userdata");
- GDVIRTUAL_BIND(_body_test_motion, "body", "from", "motion", "margin", "collide_separation_ray", "recovery_as_collision", "result");
+ GDVIRTUAL_BIND(_body_collide_shape, "body", "body_shape", "shape", "shape_xform", "motion", "results", "result_max", "result_count");
+
+ GDVIRTUAL_BIND(_body_set_pickable, "body", "pickable");
GDVIRTUAL_BIND(_body_get_direct_state, "body");
+ GDVIRTUAL_BIND(_body_test_motion, "body", "from", "motion", "margin", "collide_separation_ray", "recovery_as_collision", "result");
+
+ /* JOINT API */
+
GDVIRTUAL_BIND(_joint_create);
GDVIRTUAL_BIND(_joint_clear, "joint");
GDVIRTUAL_BIND(_joint_set_param, "joint", "param", "value");
GDVIRTUAL_BIND(_joint_get_param, "joint", "param");
+ GDVIRTUAL_BIND(_joint_disable_collisions_between_bodies, "joint", "disable");
+ GDVIRTUAL_BIND(_joint_is_disabled_collisions_between_bodies, "joint");
+
GDVIRTUAL_BIND(_joint_make_pin, "joint", "anchor", "body_a", "body_b");
GDVIRTUAL_BIND(_joint_make_groove, "joint", "a_groove1", "a_groove2", "b_anchor", "body_a", "body_b");
GDVIRTUAL_BIND(_joint_make_damped_spring, "joint", "anchor_a", "anchor_b", "body_a", "body_b");
@@ -280,10 +317,20 @@ void PhysicsServer2DExtension::_bind_methods() {
GDVIRTUAL_BIND(_joint_get_type, "joint");
+ /* MISC */
+
GDVIRTUAL_BIND(_free_rid, "rid");
GDVIRTUAL_BIND(_set_active, "active");
+ GDVIRTUAL_BIND(_init);
+ GDVIRTUAL_BIND(_step, "step");
+ GDVIRTUAL_BIND(_sync);
+ GDVIRTUAL_BIND(_flush_queries);
+ GDVIRTUAL_BIND(_end_sync);
+ GDVIRTUAL_BIND(_finish);
+
+ GDVIRTUAL_BIND(_is_flushing_queries);
GDVIRTUAL_BIND(_get_process_info, "process_info");
}
diff --git a/servers/extensions/physics_server_2d_extension.h b/servers/extensions/physics_server_2d_extension.h
index 4c83664b14..573b51ee12 100644
--- a/servers/extensions/physics_server_2d_extension.h
+++ b/servers/extensions/physics_server_2d_extension.h
@@ -94,7 +94,6 @@ public:
EXBIND1RC(Vector2, get_contact_local_position, int)
EXBIND1RC(Vector2, get_contact_local_normal, int)
EXBIND1RC(int, get_contact_local_shape, int)
-
EXBIND1RC(RID, get_contact_collider, int)
EXBIND1RC(Vector2, get_contact_collider_position, int)
EXBIND1RC(ObjectID, get_contact_collider_id, int)
@@ -183,13 +182,7 @@ public:
typedef PhysicsServer2D::MotionResult PhysicsServer2DExtensionMotionResult;
-struct PhysicsServer2DExtensionStateCallback {
- void *instance = nullptr;
- void (*callback)(void *p_instance, PhysicsDirectBodyState2D *p_state);
-};
-
GDVIRTUAL_NATIVE_PTR(PhysicsServer2DExtensionMotionResult)
-GDVIRTUAL_NATIVE_PTR(PhysicsServer2DExtensionStateCallback)
class PhysicsServer2DExtension : public PhysicsServer2D {
GDCLASS(PhysicsServer2DExtension, PhysicsServer2D);
@@ -204,6 +197,8 @@ protected:
public:
// The warning is valid, but unavoidable. If the function is not overridden it will error anyway.
+ /* SHAPE API */
+
EXBIND0R(RID, world_boundary_shape_create)
EXBIND0R(RID, separation_ray_shape_create)
EXBIND0R(RID, segment_shape_create)
@@ -252,6 +247,7 @@ public:
EXBIND4(area_add_shape, RID, RID, const Transform2D &, bool)
EXBIND3(area_set_shape, RID, int, RID)
EXBIND3(area_set_shape_transform, RID, int, const Transform2D &)
+ EXBIND3(area_set_shape_disabled, RID, int, bool)
EXBIND1RC(int, area_get_shape_count, RID)
EXBIND2RC(RID, area_get_shape, RID, int)
@@ -260,8 +256,6 @@ public:
EXBIND2(area_remove_shape, RID, int)
EXBIND1(area_clear_shapes, RID)
- EXBIND3(area_set_shape_disabled, RID, int, bool)
-
EXBIND2(area_attach_object_instance_id, RID, ObjectID)
EXBIND1RC(ObjectID, area_get_object_instance_id, RID)
@@ -274,8 +268,11 @@ public:
EXBIND2RC(Variant, area_get_param, RID, AreaParameter)
EXBIND1RC(Transform2D, area_get_transform, RID)
- EXBIND2(area_set_collision_mask, RID, uint32_t)
EXBIND2(area_set_collision_layer, RID, uint32_t)
+ EXBIND1RC(uint32_t, area_get_collision_layer, RID)
+
+ EXBIND2(area_set_collision_mask, RID, uint32_t)
+ EXBIND1RC(uint32_t, area_get_collision_mask, RID)
EXBIND2(area_set_monitorable, RID, bool)
EXBIND2(area_set_pickable, RID, bool)
@@ -375,13 +372,7 @@ public:
EXBIND2(body_set_omit_force_integration, RID, bool)
EXBIND1RC(bool, body_is_omitting_force_integration, RID)
- GDVIRTUAL2(_body_set_state_sync_callback, RID, GDNativePtr<PhysicsServer2DExtensionStateCallback>)
- void body_set_state_sync_callback(RID p_body, void *p_instance, BodyStateCallback p_callback) override {
- PhysicsServer2DExtensionStateCallback callback;
- callback.callback = p_callback;
- callback.instance = p_instance;
- GDVIRTUAL_REQUIRED_CALL(_body_set_state_sync_callback, p_body, &callback);
- }
+ EXBIND2(body_set_state_sync_callback, RID, const Callable &)
EXBIND3(body_set_force_integration_callback, RID, const Callable &, const Variant &)
virtual bool body_collide_shape(RID p_body, int p_body_shape, RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, Vector2 *r_results, int p_result_max, int &r_result_count) override {
@@ -415,7 +406,6 @@ public:
/* JOINT API */
EXBIND0R(RID, joint_create)
-
EXBIND1(joint_clear, RID)
EXBIND3(joint_set_param, RID, JointParam, real_t)
diff --git a/servers/extensions/physics_server_3d_extension.cpp b/servers/extensions/physics_server_3d_extension.cpp
index 7d797bf611..811ff231fc 100644
--- a/servers/extensions/physics_server_3d_extension.cpp
+++ b/servers/extensions/physics_server_3d_extension.cpp
@@ -60,6 +60,7 @@ void PhysicsDirectBodyState3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_get_inverse_mass);
GDVIRTUAL_BIND(_get_inverse_inertia);
+ GDVIRTUAL_BIND(_get_inverse_inertia_tensor);
GDVIRTUAL_BIND(_set_linear_velocity, "velocity");
GDVIRTUAL_BIND(_get_linear_velocity);
@@ -125,6 +126,8 @@ bool PhysicsServer3DExtension::body_test_motion_is_excluding_object(ObjectID p_o
}
void PhysicsServer3DExtension::_bind_methods() {
+ /* SHAPE API */
+
GDVIRTUAL_BIND(_world_boundary_shape_create);
GDVIRTUAL_BIND(_separation_ray_shape_create);
GDVIRTUAL_BIND(_sphere_shape_create);
@@ -137,18 +140,34 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_custom_shape_create);
GDVIRTUAL_BIND(_shape_set_data, "shape", "data");
+ GDVIRTUAL_BIND(_shape_set_custom_solver_bias, "shape", "bias");
+
+ GDVIRTUAL_BIND(_shape_set_margin, "shape", "margin");
+ GDVIRTUAL_BIND(_shape_get_margin, "shape");
GDVIRTUAL_BIND(_shape_get_type, "shape");
GDVIRTUAL_BIND(_shape_get_data, "shape");
+ GDVIRTUAL_BIND(_shape_get_custom_solver_bias, "shape");
+
+ /* SPACE API */
GDVIRTUAL_BIND(_space_create);
GDVIRTUAL_BIND(_space_set_active, "space", "active");
GDVIRTUAL_BIND(_space_is_active, "space");
+
GDVIRTUAL_BIND(_space_set_param, "space", "param", "value");
GDVIRTUAL_BIND(_space_get_param, "space", "param");
+
GDVIRTUAL_BIND(_space_get_direct_state, "space");
+ GDVIRTUAL_BIND(_space_set_debug_contacts, "space", "max_contacts");
+ GDVIRTUAL_BIND(_space_get_contacts, "space");
+ GDVIRTUAL_BIND(_space_get_contact_count, "space");
+
+ /* AREA API */
+
GDVIRTUAL_BIND(_area_create);
+
GDVIRTUAL_BIND(_area_set_space, "area", "space");
GDVIRTUAL_BIND(_area_get_space, "area");
@@ -164,8 +183,8 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_area_remove_shape, "area", "shape_idx");
GDVIRTUAL_BIND(_area_clear_shapes, "area");
- GDVIRTUAL_BIND(_area_set_collision_layer, "area", "layer");
- GDVIRTUAL_BIND(_area_set_collision_mask, "area", "mask");
+ GDVIRTUAL_BIND(_area_attach_object_instance_id, "area", "id");
+ GDVIRTUAL_BIND(_area_get_object_instance_id, "area");
GDVIRTUAL_BIND(_area_set_param, "area", "param", "value");
GDVIRTUAL_BIND(_area_set_transform, "area", "transform");
@@ -173,14 +192,19 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_area_get_param, "area", "param");
GDVIRTUAL_BIND(_area_get_transform, "area");
- GDVIRTUAL_BIND(_area_attach_object_instance_id, "area", "id");
- GDVIRTUAL_BIND(_area_get_object_instance_id, "area");
+ GDVIRTUAL_BIND(_area_set_collision_layer, "area", "layer");
+ GDVIRTUAL_BIND(_area_get_collision_layer, "area");
+
+ GDVIRTUAL_BIND(_area_set_collision_mask, "area", "mask");
+ GDVIRTUAL_BIND(_area_get_collision_mask, "area");
+
+ GDVIRTUAL_BIND(_area_set_monitorable, "area", "monitorable");
+ GDVIRTUAL_BIND(_area_set_ray_pickable, "area", "enable");
GDVIRTUAL_BIND(_area_set_monitor_callback, "area", "callback");
GDVIRTUAL_BIND(_area_set_area_monitor_callback, "area", "callback");
- GDVIRTUAL_BIND(_area_set_monitorable, "area", "monitorable");
- GDVIRTUAL_BIND(_area_set_ray_pickable, "area", "enable");
+ /* BODY API */
GDVIRTUAL_BIND(_body_create);
@@ -190,15 +214,6 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_body_set_mode, "body", "mode");
GDVIRTUAL_BIND(_body_get_mode, "body");
- GDVIRTUAL_BIND(_body_set_collision_layer, "body", "layer");
- GDVIRTUAL_BIND(_body_get_collision_layer, "body");
-
- GDVIRTUAL_BIND(_body_set_collision_mask, "body", "mask");
- GDVIRTUAL_BIND(_body_get_collision_mask, "body");
-
- GDVIRTUAL_BIND(_body_set_collision_priority, "body", "priority");
- GDVIRTUAL_BIND(_body_get_collision_priority, "body");
-
GDVIRTUAL_BIND(_body_add_shape, "body", "shape", "transform", "disabled");
GDVIRTUAL_BIND(_body_set_shape, "body", "shape_idx", "shape");
GDVIRTUAL_BIND(_body_set_shape_transform, "body", "shape_idx", "transform");
@@ -217,6 +232,18 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_body_set_enable_continuous_collision_detection, "body", "enable");
GDVIRTUAL_BIND(_body_is_continuous_collision_detection_enabled, "body");
+ GDVIRTUAL_BIND(_body_set_collision_layer, "body", "layer");
+ GDVIRTUAL_BIND(_body_get_collision_layer, "body");
+
+ GDVIRTUAL_BIND(_body_set_collision_mask, "body", "mask");
+ GDVIRTUAL_BIND(_body_get_collision_mask, "body");
+
+ GDVIRTUAL_BIND(_body_set_collision_priority, "body", "priority");
+ GDVIRTUAL_BIND(_body_get_collision_priority, "body");
+
+ GDVIRTUAL_BIND(_body_set_user_flags, "body", "flags");
+ GDVIRTUAL_BIND(_body_get_user_flags, "body");
+
GDVIRTUAL_BIND(_body_set_param, "body", "param", "value");
GDVIRTUAL_BIND(_body_get_param, "body", "param");
@@ -250,13 +277,18 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_body_add_collision_exception, "body", "excepted_body");
GDVIRTUAL_BIND(_body_remove_collision_exception, "body", "excepted_body");
+ GDVIRTUAL_BIND(_body_get_collision_exceptions, "body");
GDVIRTUAL_BIND(_body_set_max_contacts_reported, "body", "amount");
GDVIRTUAL_BIND(_body_get_max_contacts_reported, "body");
+ GDVIRTUAL_BIND(_body_set_contacts_reported_depth_threshold, "body", "threshold");
+ GDVIRTUAL_BIND(_body_get_contacts_reported_depth_threshold, "body");
+
GDVIRTUAL_BIND(_body_set_omit_force_integration, "body", "enable");
GDVIRTUAL_BIND(_body_is_omitting_force_integration, "body");
+ GDVIRTUAL_BIND(_body_set_state_sync_callback, "body", "callable");
GDVIRTUAL_BIND(_body_set_force_integration_callback, "body", "callable", "userdata");
GDVIRTUAL_BIND(_body_set_ray_pickable, "body", "enable");
@@ -265,12 +297,68 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_body_get_direct_state, "body");
+ /* SOFT BODY API */
+
+ GDVIRTUAL_BIND(_soft_body_create);
+
+ GDVIRTUAL_BIND(_soft_body_update_rendering_server, "body", "rendering_server_handler");
+
+ GDVIRTUAL_BIND(_soft_body_set_space, "body", "space");
+ GDVIRTUAL_BIND(_soft_body_get_space, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_ray_pickable, "body", "enable");
+
+ GDVIRTUAL_BIND(_soft_body_set_collision_layer, "body", "layer");
+ GDVIRTUAL_BIND(_soft_body_get_collision_layer, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_collision_mask, "body", "mask");
+ GDVIRTUAL_BIND(_soft_body_get_collision_mask, "body");
+
+ GDVIRTUAL_BIND(_soft_body_add_collision_exception, "body", "body_b");
+ GDVIRTUAL_BIND(_soft_body_remove_collision_exception, "body", "body_b");
+ GDVIRTUAL_BIND(_soft_body_get_collision_exceptions, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_state, "body", "state", "variant");
+ GDVIRTUAL_BIND(_soft_body_get_state, "body", "state");
+
+ GDVIRTUAL_BIND(_soft_body_set_transform, "body", "transform");
+
+ GDVIRTUAL_BIND(_soft_body_set_simulation_precision, "body", "simulation_precision");
+ GDVIRTUAL_BIND(_soft_body_get_simulation_precision, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_total_mass, "body", "total_mass");
+ GDVIRTUAL_BIND(_soft_body_get_total_mass, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_linear_stiffness, "body", "linear_stiffness");
+ GDVIRTUAL_BIND(_soft_body_get_linear_stiffness, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_pressure_coefficient, "body", "pressure_coefficient");
+ GDVIRTUAL_BIND(_soft_body_get_pressure_coefficient, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_damping_coefficient, "body", "damping_coefficient");
+ GDVIRTUAL_BIND(_soft_body_get_damping_coefficient, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_drag_coefficient, "body", "drag_coefficient");
+ GDVIRTUAL_BIND(_soft_body_get_drag_coefficient, "body");
+
+ GDVIRTUAL_BIND(_soft_body_set_mesh, "body", "mesh");
+
GDVIRTUAL_BIND(_soft_body_get_bounds, "body");
+ 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_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");
+
+ /* JOINT API */
+
GDVIRTUAL_BIND(_joint_create);
GDVIRTUAL_BIND(_joint_clear, "joint");
GDVIRTUAL_BIND(_joint_make_pin, "joint", "body_A", "local_A", "body_B", "local_B");
+
GDVIRTUAL_BIND(_pin_joint_set_param, "joint", "param", "value");
GDVIRTUAL_BIND(_pin_joint_get_param, "joint", "param");
@@ -281,6 +369,7 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_pin_joint_get_local_b, "joint");
GDVIRTUAL_BIND(_joint_make_hinge, "joint", "body_A", "hinge_A", "body_B", "hinge_B");
+ GDVIRTUAL_BIND(_joint_make_hinge_simple, "joint", "body_A", "pivot_A", "axis_A", "body_B", "pivot_B", "axis_B");
GDVIRTUAL_BIND(_hinge_joint_set_param, "joint", "param", "value");
GDVIRTUAL_BIND(_hinge_joint_get_param, "joint", "param");
@@ -298,11 +387,6 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_cone_twist_joint_set_param, "joint", "param", "value");
GDVIRTUAL_BIND(_cone_twist_joint_get_param, "joint", "param");
- GDVIRTUAL_BIND(_joint_get_type, "joint");
-
- GDVIRTUAL_BIND(_joint_set_solver_priority, "joint", "priority");
- GDVIRTUAL_BIND(_joint_get_solver_priority, "joint");
-
GDVIRTUAL_BIND(_joint_make_generic_6dof, "joint", "body_A", "local_ref_A", "body_B", "local_ref_B");
GDVIRTUAL_BIND(_generic_6dof_joint_set_param, "joint", "axis", "param", "value");
@@ -311,10 +395,23 @@ void PhysicsServer3DExtension::_bind_methods() {
GDVIRTUAL_BIND(_generic_6dof_joint_set_flag, "joint", "axis", "flag", "enable");
GDVIRTUAL_BIND(_generic_6dof_joint_get_flag, "joint", "axis", "flag");
+ GDVIRTUAL_BIND(_joint_get_type, "joint");
+
+ GDVIRTUAL_BIND(_joint_set_solver_priority, "joint", "priority");
+ GDVIRTUAL_BIND(_joint_get_solver_priority, "joint");
+
GDVIRTUAL_BIND(_free_rid, "rid");
GDVIRTUAL_BIND(_set_active, "active");
+ GDVIRTUAL_BIND(_init);
+ GDVIRTUAL_BIND(_step, "step");
+ GDVIRTUAL_BIND(_sync);
+ GDVIRTUAL_BIND(_flush_queries);
+ GDVIRTUAL_BIND(_end_sync);
+ GDVIRTUAL_BIND(_finish);
+
+ GDVIRTUAL_BIND(_is_flushing_queries);
GDVIRTUAL_BIND(_get_process_info, "process_info");
}
diff --git a/servers/extensions/physics_server_3d_extension.h b/servers/extensions/physics_server_3d_extension.h
index 3200438253..57f2a2d790 100644
--- a/servers/extensions/physics_server_3d_extension.h
+++ b/servers/extensions/physics_server_3d_extension.h
@@ -192,14 +192,8 @@ public:
typedef PhysicsServer3D::MotionCollision PhysicsServer3DExtensionMotionCollision;
typedef PhysicsServer3D::MotionResult PhysicsServer3DExtensionMotionResult;
-struct PhysicsServer3DExtensionStateCallback {
- void *instance = nullptr;
- void (*callback)(void *p_instance, PhysicsDirectBodyState3D *p_state);
-};
-
GDVIRTUAL_NATIVE_PTR(PhysicsServer3DExtensionMotionCollision)
GDVIRTUAL_NATIVE_PTR(PhysicsServer3DExtensionMotionResult)
-GDVIRTUAL_NATIVE_PTR(PhysicsServer3DExtensionStateCallback)
class PhysicsServer3DExtension : public PhysicsServer3D {
GDCLASS(PhysicsServer3DExtension, PhysicsServer3D);
@@ -210,6 +204,8 @@ protected:
public:
// The warning is valid, but unavoidable. If the function is not overridden it will error anyway.
+ /* SHAPE API */
+
EXBIND0R(RID, world_boundary_shape_create)
EXBIND0R(RID, separation_ray_shape_create)
EXBIND0R(RID, sphere_shape_create)
@@ -262,6 +258,7 @@ public:
EXBIND1RC(int, area_get_shape_count, RID)
EXBIND2RC(RID, area_get_shape, RID, int)
EXBIND2RC(Transform3D, area_get_shape_transform, RID, int)
+
EXBIND2(area_remove_shape, RID, int)
EXBIND1(area_clear_shapes, RID)
@@ -274,8 +271,11 @@ public:
EXBIND2RC(Variant, area_get_param, RID, AreaParameter)
EXBIND1RC(Transform3D, area_get_transform, RID)
- EXBIND2(area_set_collision_mask, RID, uint32_t)
EXBIND2(area_set_collision_layer, RID, uint32_t)
+ EXBIND1RC(uint32_t, area_get_collision_layer, RID)
+
+ EXBIND2(area_set_collision_mask, RID, uint32_t)
+ EXBIND1RC(uint32_t, area_get_collision_mask, RID)
EXBIND2(area_set_monitorable, RID, bool)
EXBIND2(area_set_ray_pickable, RID, bool)
@@ -297,12 +297,11 @@ public:
EXBIND4(body_add_shape, RID, RID, const Transform3D &, bool)
EXBIND3(body_set_shape, RID, int, RID)
EXBIND3(body_set_shape_transform, RID, int, const Transform3D &)
+ EXBIND3(body_set_shape_disabled, RID, int, bool)
EXBIND1RC(int, body_get_shape_count, RID)
- EXBIND2RC(Transform3D, body_get_shape_transform, RID, int)
EXBIND2RC(RID, body_get_shape, RID, int)
-
- EXBIND3(body_set_shape_disabled, RID, int, bool)
+ EXBIND2RC(Transform3D, body_get_shape_transform, RID, int)
EXBIND2(body_remove_shape, RID, int)
EXBIND1(body_clear_shapes, RID)
@@ -333,9 +332,9 @@ public:
EXBIND3(body_set_state, RID, BodyState, const Variant &)
EXBIND2RC(Variant, body_get_state, RID, BodyState)
- EXBIND2(body_apply_torque_impulse, RID, const Vector3 &)
EXBIND2(body_apply_central_impulse, RID, const Vector3 &)
EXBIND3(body_apply_impulse, RID, const Vector3 &, const Vector3 &)
+ EXBIND2(body_apply_torque_impulse, RID, const Vector3 &)
EXBIND2(body_apply_central_force, RID, const Vector3 &)
EXBIND3(body_apply_force, RID, const Vector3 &, const Vector3 &)
@@ -378,13 +377,7 @@ public:
EXBIND2(body_set_omit_force_integration, RID, bool)
EXBIND1RC(bool, body_is_omitting_force_integration, RID)
- GDVIRTUAL2(_body_set_state_sync_callback, RID, GDNativePtr<PhysicsServer3DExtensionStateCallback>)
- void body_set_state_sync_callback(RID p_body, void *p_instance, BodyStateCallback p_callback) override {
- PhysicsServer3DExtensionStateCallback callback;
- callback.callback = p_callback;
- callback.instance = p_instance;
- GDVIRTUAL_REQUIRED_CALL(_body_set_state_sync_callback, p_body, &callback);
- }
+ EXBIND2(body_set_state_sync_callback, RID, const Callable &)
EXBIND3(body_set_force_integration_callback, RID, const Callable &, const Variant &)
EXBIND2(body_set_ray_pickable, RID, bool)
@@ -476,7 +469,6 @@ public:
/* JOINT API */
EXBIND0R(RID, joint_create)
-
EXBIND1(joint_clear, RID)
EXBIND5(joint_make_pin, RID, RID, const Vector3 &, RID, const Vector3 &)
@@ -537,8 +529,8 @@ public:
EXBIND0(init)
EXBIND1(step, real_t)
EXBIND0(sync)
- EXBIND0(end_sync)
EXBIND0(flush_queries)
+ EXBIND0(end_sync)
EXBIND0(finish)
EXBIND0RC(bool, is_flushing_queries)
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-31 20:21:41 +0000