maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #203 from marynate/PR-fix-collisionshape2d-del-not-update

Browse source 
Fixed #173 #157 Update parent when deleting CollisionShape2D
This commit is contained in:
reduz 2014-04-05 09:55:21 -03:00
parent 1278da71ea ad9bf69283
commit 35b84d2c85
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/2d/collision_shape_2d.cpp
View file

@ -39,6 +39,9 @@
void CollisionShape2D::_add_to_collision_object(Object *p_obj) {
if (unparenting)
return;
CollisionObject2D *co = p_obj->cast_to<CollisionObject2D>();
ERR_FAIL_COND(!co);
co->add_shape(shape,get_transform());
@ -189,7 +192,10 @@ void CollisionShape2D::_notification(int p_what) {
rect=rect.grow(3);
} break;
case NOTIFICATION_UNPARENTED: {
unparenting = true;
_update_parent();
} break;
}
}
@ -245,4 +251,5 @@ CollisionShape2D::CollisionShape2D() {
rect=Rect2(-Point2(10,10),Point2(20,20));
trigger=false;
unparenting = false;
}

2
scene/2d/collision_shape_2d.h
View file

@ -38,7 +38,7 @@ class CollisionShape2D : public Node2D {
Ref<Shape2D> shape;
Rect2 rect;
bool trigger;
bool unparenting;
void _shape_changed();
protected: