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

-fixed silly bug in trigger check (#1051)

Browse source
This commit is contained in:
Juan Linietsky 2015-01-02 13:30:59 -03:00
parent aa36be3c9a
commit bbaddfa70f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/3d/physics_body.cpp
View file

@ -852,6 +852,8 @@ Vector3 KinematicBody::move(const Vector3& p_motion) {
//motion recover //motion recover
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))
continue;
if (dss->collide_shape(get_shape(i)->get_rid(), get_global_transform() * get_shape_transform(i),m,sr,max_shapes,res_shapes,exclude,get_layer_mask(),mask)) { if (dss->collide_shape(get_shape(i)->get_rid(), get_global_transform() * get_shape_transform(i),m,sr,max_shapes,res_shapes,exclude,get_layer_mask(),mask)) {
collided=true; collided=true;
@ -870,9 +872,6 @@ Vector3 KinematicBody::move(const Vector3& p_motion) {
for(int j=0;j<8;j++) { for(int j=0;j<8;j++) {
for(int i=0;i<res_shapes;i++) { for(int i=0;i<res_shapes;i++) {
if (is_shape_set_as_trigger(i))
continue;
Vector3 a = sr[i*2+0]; Vector3 a = sr[i*2+0];
Vector3 b = sr[i*2+1]; Vector3 b = sr[i*2+1];
//print_line(String()+a+" -> "+b); //print_line(String()+a+" -> "+b);