sascha
/
godot
mirror of https://github.com/godotengine/godot.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix can_move_to and rename it for more clarity 

Fixes #2416.
The KinematicBody::can_move_to function was likely designed for two behaviours:
 - discrete: check if the body can "teleport" to the destination
 - continuous: check if the direct path to the destination is valid
The continuous behaviour was however not implemented, and the discrete behaviour was broken too due to a wrong call to intersect_shape.

The discrete behaviour has thus been fixed and the function renamed to can_teleport_to for more clarity.
pull/2868/head
Rémi Verschelde 2015-11-22 14:14:07 +07:00
parent bcf4aded9a
commit f33d9dab5b
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/3d/physics_body.cpp
Unescape Escape View File

@ -1073,7 +1073,7 @@ Vector3 KinematicBody::move_to(const Vector3& p_position) {
return move(p_position-get_global_transform().origin); return move(p_position-get_global_transform().origin);
} }
bool KinematicBody::can_move_to(const Vector3& p_position, bool p_discrete) { bool KinematicBody::can_teleport_to(const Vector3& p_position) {
ERR_FAIL_COND_V(!is_inside_tree(),false); ERR_FAIL_COND_V(!is_inside_tree(),false);
PhysicsDirectSpaceState *dss = PhysicsServer::get_singleton()->space_get_direct_state(get_world()->get_space()); PhysicsDirectSpaceState *dss = PhysicsServer::get_singleton()->space_get_direct_state(get_world()->get_space());
@ -1089,25 +1089,18 @@ bool KinematicBody::can_move_to(const Vector3& p_position, bool p_discrete) {
if (collide_character) if (collide_character)
mask|=PhysicsDirectSpaceState::TYPE_MASK_CHARACTER_BODY; mask|=PhysicsDirectSpaceState::TYPE_MASK_CHARACTER_BODY;
Vector3 motion = p_position-get_global_transform().origin;
Transform xform=get_global_transform(); Transform xform=get_global_transform();
xform.origin=p_position;
if (true || p_discrete) {
xform.origin+=motion;
motion=Vector3();
}
Set<RID> exclude; Set<RID> exclude;
exclude.insert(get_rid()); exclude.insert(get_rid());
//fill exclude list..
for(int i=0;i<get_shape_count();i++) { for(int i=0;i<get_shape_count();i++) {
if (is_shape_set_as_trigger(i)) if (is_shape_set_as_trigger(i))
continue; continue;
bool col = dss->intersect_shape(get_shape(i)->get_rid(), xform * get_shape_transform(i),0,NULL,0,exclude,get_layer_mask(),mask); bool col = dss->intersect_shape(get_shape(i)->get_rid(), xform * get_shape_transform(i),0,NULL,1,exclude,get_layer_mask(),mask);
if (col) if (col)
return false; return false;
} }
@ -1205,7 +1198,7 @@ void KinematicBody::_bind_methods() {
ObjectTypeDB::bind_method(_MD("move","rel_vec"),&KinematicBody::move); ObjectTypeDB::bind_method(_MD("move","rel_vec"),&KinematicBody::move);
ObjectTypeDB::bind_method(_MD("move_to","position"),&KinematicBody::move_to); ObjectTypeDB::bind_method(_MD("move_to","position"),&KinematicBody::move_to);
ObjectTypeDB::bind_method(_MD("can_move_to","position"),&KinematicBody::can_move_to); ObjectTypeDB::bind_method(_MD("can_teleport_to","position"),&KinematicBody::can_teleport_to);
ObjectTypeDB::bind_method(_MD("is_colliding"),&KinematicBody::is_colliding); ObjectTypeDB::bind_method(_MD("is_colliding"),&KinematicBody::is_colliding);

2
scene/3d/physics_body.h
Unescape Escape View File

@ -304,7 +304,7 @@ public:
Vector3 move(const Vector3& p_motion); Vector3 move(const Vector3& p_motion);
Vector3 move_to(const Vector3& p_position); Vector3 move_to(const Vector3& p_position);
bool can_move_to(const Vector3& p_position,bool p_discrete=false); bool can_teleport_to(const Vector3& p_position);
bool is_colliding() const; bool is_colliding() const;
Vector3 get_collision_pos() const; Vector3 get_collision_pos() const;
Vector3 get_collision_normal() const; Vector3 get_collision_normal() const;

6
servers/physics/space_sw.cpp
Unescape Escape View File

@ -175,6 +175,10 @@ int PhysicsDirectSpaceStateSW::intersect_shape(const RID& p_shape, const Transfo
if (!CollisionSolverSW::solve_static(shape,p_xform,col_obj->get_shape(shape_idx),col_obj->get_transform() * col_obj->get_shape_transform(shape_idx), NULL,NULL,NULL,p_margin,0)) if (!CollisionSolverSW::solve_static(shape,p_xform,col_obj->get_shape(shape_idx),col_obj->get_transform() * col_obj->get_shape_transform(shape_idx), NULL,NULL,NULL,p_margin,0))
continue; continue;
cc++;
if (!r_results)
continue;
r_results[cc].collider_id=col_obj->get_instance_id(); r_results[cc].collider_id=col_obj->get_instance_id();
if (r_results[cc].collider_id!=0) if (r_results[cc].collider_id!=0)
r_results[cc].collider=ObjectDB::get_instance(r_results[cc].collider_id); r_results[cc].collider=ObjectDB::get_instance(r_results[cc].collider_id);
@ -183,8 +187,6 @@ int PhysicsDirectSpaceStateSW::intersect_shape(const RID& p_shape, const Transfo
r_results[cc].rid=col_obj->get_self(); r_results[cc].rid=col_obj->get_self();
r_results[cc].shape=shape_idx; r_results[cc].shape=shape_idx;
cc++;
} }
return cc; return cc;