asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow kinematic bodies without shapes to still move, fixes #24775

Browse source
This commit is contained in:
Juan Linietsky 2019-02-16 11:06:17 -03:00
parent 9ae86e90f9
commit f439b786ea
4 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servers/physics/space_sw.cpp
View file

@ -717,6 +717,11 @@ bool SpaceSW::test_body_motion(BodySW *p_body, const Transform &p_from, const Ve
} }
if (!shapes_found) { if (!shapes_found) {
if (r_result) {
*r_result = PhysicsServer::MotionResult();
r_result->motion = p_motion;
}
return false; return false;
} }

4
servers/physics_2d/space_2d_sw.cpp
View file

@ -704,6 +704,10 @@ bool Space2DSW::test_body_motion(Body2DSW *p_body, const Transform2D &p_from, co
} }
if (!shapes_found) { if (!shapes_found) {
if (r_result) {
*r_result = Physics2DServer::MotionResult();
r_result->motion = p_motion;
}
return false; return false;
} }

6
servers/physics_2d_server.h
View file

@ -504,6 +504,12 @@ public:
RID collider; RID collider;
int collider_shape; int collider_shape;
Variant collider_metadata; Variant collider_metadata;
MotionResult() {
collision_local_shape = 0;
collider_shape = 0;
collider_id = 0;
}
}; };
virtual bool body_test_motion(RID p_body, const Transform2D &p_from, const Vector2 &p_motion, bool p_infinite_inertia, float p_margin = 0.001, MotionResult *r_result = NULL, bool p_exclude_raycast_shapes = true) = 0; virtual bool body_test_motion(RID p_body, const Transform2D &p_from, const Vector2 &p_motion, bool p_infinite_inertia, float p_margin = 0.001, MotionResult *r_result = NULL, bool p_exclude_raycast_shapes = true) = 0;

5
servers/physics_server.h
View file

@ -492,6 +492,11 @@ public:
RID collider; RID collider;
int collider_shape; int collider_shape;
Variant collider_metadata; Variant collider_metadata;
MotionResult() {
collision_local_shape = 0;
collider_id = 0;
collider_shape = 0;
}
}; };
virtual bool body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result = NULL, bool p_exclude_raycast_shapes = true) = 0; virtual bool body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result = NULL, bool p_exclude_raycast_shapes = true) = 0;