mirror of
https://github.com/godotengine/godot
synced 2024-09-05 11:08:26 +00:00
Added new API to get body direct state
This commit is contained in:
parent
dee1001390
commit
c56c67db39
|
@ -914,6 +914,21 @@ bool PhysicsServerSW::body_test_motion(RID p_body, const Transform &p_from, cons
|
|||
return body->get_space()->test_body_motion(body, p_from, p_motion, p_margin, r_result);
|
||||
}
|
||||
|
||||
PhysicsDirectBodyState *PhysicsServerSW::body_get_direct_state(RID p_body) {
|
||||
|
||||
BodySW *body = body_owner.get(p_body);
|
||||
ERR_FAIL_COND_V(!body, NULL);
|
||||
|
||||
if (!doing_sync || body->get_space()->is_locked()) {
|
||||
|
||||
ERR_EXPLAIN("Body state is inaccessible right now, wait for iteration or physics process notification.");
|
||||
ERR_FAIL_V(NULL);
|
||||
}
|
||||
|
||||
direct_state->body = body;
|
||||
return direct_state;
|
||||
}
|
||||
|
||||
/* JOINT API */
|
||||
|
||||
RID PhysicsServerSW::joint_create_pin(RID p_body_A, const Vector3 &p_local_A, RID p_body_B, const Vector3 &p_local_B) {
|
||||
|
|
|
@ -223,6 +223,9 @@ public:
|
|||
|
||||
virtual bool body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, float p_margin = 0.001, MotionResult *r_result = NULL);
|
||||
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
virtual PhysicsDirectBodyState *body_get_direct_state(RID p_body);
|
||||
|
||||
/* JOINT API */
|
||||
|
||||
virtual RID joint_create_pin(RID p_body_A, const Vector3 &p_local_A, RID p_body_B, const Vector3 &p_local_B);
|
||||
|
|
|
@ -954,6 +954,21 @@ bool Physics2DServerSW::body_test_motion(RID p_body, const Transform2D &p_from,
|
|||
return body->get_space()->test_body_motion(body, p_from, p_motion, p_margin, r_result);
|
||||
}
|
||||
|
||||
Physics2DDirectBodyState *Physics2DServerSW::body_get_direct_state(RID p_body) {
|
||||
|
||||
Body2DSW *body = body_owner.get(p_body);
|
||||
ERR_FAIL_COND_V(!body, NULL);
|
||||
|
||||
if ((using_threads && !doing_sync) || body->get_space()->is_locked()) {
|
||||
|
||||
ERR_EXPLAIN("Body state is inaccessible right now, wait for iteration or physics process notification.");
|
||||
ERR_FAIL_V(NULL);
|
||||
}
|
||||
|
||||
direct_state->body = body;
|
||||
return direct_state;
|
||||
}
|
||||
|
||||
/* JOINT API */
|
||||
|
||||
void Physics2DServerSW::joint_set_param(RID p_joint, JointParam p_param, real_t p_value) {
|
||||
|
|
|
@ -222,6 +222,9 @@ public:
|
|||
|
||||
virtual bool body_test_motion(RID p_body, const Transform2D &p_from, const Vector2 &p_motion, real_t p_margin = 0.001, MotionResult *r_result = NULL);
|
||||
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
virtual Physics2DDirectBodyState *body_get_direct_state(RID p_body);
|
||||
|
||||
/* JOINT API */
|
||||
|
||||
virtual void joint_set_param(RID p_joint, JointParam p_param, real_t p_value);
|
||||
|
|
|
@ -111,7 +111,7 @@ public:
|
|||
FUNC3(space_set_param, RID, SpaceParameter, real_t);
|
||||
FUNC2RC(real_t, space_get_param, RID, SpaceParameter);
|
||||
|
||||
// this function only works on fixed process, errors and returns null otherwise
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
Physics2DDirectSpaceState *space_get_direct_state(RID p_space) {
|
||||
|
||||
ERR_FAIL_COND_V(main_thread != Thread::get_caller_id(), NULL);
|
||||
|
@ -253,6 +253,13 @@ public:
|
|||
return physics_2d_server->body_test_motion(p_body, p_from, p_motion, p_margin, r_result);
|
||||
}
|
||||
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
Physics2DDirectBodyState *body_get_direct_state(RID p_body) {
|
||||
|
||||
ERR_FAIL_COND_V(main_thread != Thread::get_caller_id(), NULL);
|
||||
return physics_2d_server->body_get_direct_state(p_body);
|
||||
}
|
||||
|
||||
/* JOINT API */
|
||||
|
||||
FUNC3(joint_set_param, RID, JointParam, real_t);
|
||||
|
|
|
@ -579,6 +579,8 @@ void Physics2DServer::_bind_methods() {
|
|||
|
||||
ClassDB::bind_method(D_METHOD("body_test_motion", "body", "from", "motion", "margin", "result"), &Physics2DServer::_body_test_motion, DEFVAL(0.08), DEFVAL(Variant()));
|
||||
|
||||
ClassDB::bind_method(D_METHOD("body_get_direct_state", "body"), &Physics2DServer::body_get_direct_state);
|
||||
|
||||
/* JOINT API */
|
||||
|
||||
ClassDB::bind_method(D_METHOD("joint_set_param", "joint", "param", "value"), &Physics2DServer::joint_set_param);
|
||||
|
|
|
@ -283,7 +283,7 @@ public:
|
|||
virtual void space_set_param(RID p_space, SpaceParameter p_param, real_t p_value) = 0;
|
||||
virtual real_t space_get_param(RID p_space, SpaceParameter p_param) const = 0;
|
||||
|
||||
// this function only works on fixed process, errors and returns null otherwise
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
virtual Physics2DDirectSpaceState *space_get_direct_state(RID p_space) = 0;
|
||||
|
||||
virtual void space_set_debug_contacts(RID p_space, int p_max_contacts) = 0;
|
||||
|
@ -468,6 +468,9 @@ public:
|
|||
|
||||
virtual void body_set_pickable(RID p_body, bool p_pickable) = 0;
|
||||
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
virtual Physics2DDirectBodyState *body_get_direct_state(RID p_body) = 0;
|
||||
|
||||
struct MotionResult {
|
||||
|
||||
Vector2 motion;
|
||||
|
|
|
@ -504,6 +504,8 @@ void PhysicsServer::_bind_methods() {
|
|||
ClassDB::bind_method(D_METHOD("body_set_ray_pickable", "body", "enable"), &PhysicsServer::body_set_ray_pickable);
|
||||
ClassDB::bind_method(D_METHOD("body_is_ray_pickable", "body"), &PhysicsServer::body_is_ray_pickable);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("body_get_direct_state", "body"), &PhysicsServer::body_get_direct_state);
|
||||
|
||||
/* JOINT API */
|
||||
|
||||
BIND_ENUM_CONSTANT(JOINT_PIN);
|
||||
|
|
|
@ -276,7 +276,7 @@ public:
|
|||
virtual void space_set_param(RID p_space, SpaceParameter p_param, real_t p_value) = 0;
|
||||
virtual real_t space_get_param(RID p_space, SpaceParameter p_param) const = 0;
|
||||
|
||||
// this function only works on fixed process, errors and returns null otherwise
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
virtual PhysicsDirectSpaceState *space_get_direct_state(RID p_space) = 0;
|
||||
|
||||
virtual void space_set_debug_contacts(RID p_space, int p_max_contacts) = 0;
|
||||
|
@ -464,6 +464,9 @@ public:
|
|||
virtual void body_set_ray_pickable(RID p_body, bool p_enable) = 0;
|
||||
virtual bool body_is_ray_pickable(RID p_body) const = 0;
|
||||
|
||||
// this function only works on physics process, errors and returns null otherwise
|
||||
virtual PhysicsDirectBodyState *body_get_direct_state(RID p_body) = 0;
|
||||
|
||||
struct MotionResult {
|
||||
|
||||
Vector3 motion;
|
||||
|
|
Loading…
Reference in a new issue