godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17151 from ShyRed/disabled_shapes_2d 

Remove disabled shapes from physics 2D calculations
This commit is contained in:
Juan Linietsky 2018-04-08 11:16:55 -03:00 committed by GitHub
parent e9e5aa617e 4d6bb43931
commit 20e68fef85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
servers/physics_2d/collision_object_2d_sw.cpp
View File

@ -73,6 +73,27 @@ void CollisionObject2DSW::set_shape_transform(int p_index, const Transform2D &p_
_shapes_changed(); _shapes_changed();
} }
void CollisionObject2DSW::set_shape_as_disabled(int p_idx, bool p_disabled) {
ERR_FAIL_INDEX(p_idx, shapes.size());
CollisionObject2DSW::Shape &shape = shapes[p_idx];
if (shape.disabled == p_disabled)
return;
shape.disabled = p_disabled;
if (!space)
return;
if (p_disabled && shape.bpid != 0) {
space->get_broadphase()->remove(shape.bpid);
shape.bpid = 0;
_update_shapes();
} else if (!p_disabled && shape.bpid == 0) {
_update_shapes(); // automatically adds shape with bpid == 0
}
}
void CollisionObject2DSW::remove_shape(Shape2DSW *p_shape) { void CollisionObject2DSW::remove_shape(Shape2DSW *p_shape) {
//remove a shape, all the times it appears //remove a shape, all the times it appears
@ -139,6 +160,10 @@ void CollisionObject2DSW::_update_shapes() {
for (int i = 0; i < shapes.size(); i++) { for (int i = 0; i < shapes.size(); i++) {
Shape &s = shapes[i]; Shape &s = shapes[i];
if (s.disabled)
continue;
if (s.bpid == 0) { if (s.bpid == 0) {
s.bpid = space->get_broadphase()->create(this, i); s.bpid = space->get_broadphase()->create(this, i);
space->get_broadphase()->set_static(s.bpid, _static); space->get_broadphase()->set_static(s.bpid, _static);
@ -163,6 +188,9 @@ void CollisionObject2DSW::_update_shapes_with_motion(const Vector2 &p_motion) {
for (int i = 0; i < shapes.size(); i++) { for (int i = 0; i < shapes.size(); i++) {
Shape &s = shapes[i]; Shape &s = shapes[i];
if (s.disabled)
continue;
if (s.bpid == 0) { if (s.bpid == 0) {
s.bpid = space->get_broadphase()->create(this, i); s.bpid = space->get_broadphase()->create(this, i);
space->get_broadphase()->set_static(s.bpid, _static); space->get_broadphase()->set_static(s.bpid, _static);

5
servers/physics_2d/collision_object_2d_sw.h
View File

@ -136,10 +136,7 @@ public:
_FORCE_INLINE_ Transform2D get_inv_transform() const { return inv_transform; } _FORCE_INLINE_ Transform2D get_inv_transform() const { return inv_transform; }
_FORCE_INLINE_ Space2DSW *get_space() const { return space; } _FORCE_INLINE_ Space2DSW *get_space() const { return space; }
_FORCE_INLINE_ void set_shape_as_disabled(int p_idx, bool p_disabled) { void set_shape_as_disabled(int p_idx, bool p_disabled);
ERR_FAIL_INDEX(p_idx, shapes.size());
shapes[p_idx].disabled = p_disabled;
}
_FORCE_INLINE_ bool is_shape_set_as_disabled(int p_idx) const { _FORCE_INLINE_ bool is_shape_set_as_disabled(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, shapes.size(), false); ERR_FAIL_INDEX_V(p_idx, shapes.size(), false);
return shapes[p_idx].disabled; return shapes[p_idx].disabled;