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

Merge pull request #39895 from madmiraal/fix-39768-3.2

Browse source 
[3.2] Trigger broadphase update when changing collision layer/mask.
This commit is contained in:
Rémi Verschelde 2020-06-29 21:34:56 +02:00 committed by GitHub
commit 63fd0d37ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/physics/collision_object_sw.h
View file

@ -141,10 +141,16 @@ public:
return shapes[p_idx].disabled; return shapes[p_idx].disabled;
} }
_FORCE_INLINE_ void set_collision_layer(uint32_t p_layer) { collision_layer = p_layer; } _FORCE_INLINE_ void set_collision_layer(uint32_t p_layer) {
collision_layer = p_layer;
_shape_changed();
}
_FORCE_INLINE_ uint32_t get_collision_layer() const { return collision_layer; } _FORCE_INLINE_ uint32_t get_collision_layer() const { return collision_layer; }
_FORCE_INLINE_ void set_collision_mask(uint32_t p_mask) { collision_mask = p_mask; } _FORCE_INLINE_ void set_collision_mask(uint32_t p_mask) {
collision_mask = p_mask;
_shape_changed();
}
_FORCE_INLINE_ uint32_t get_collision_mask() const { return collision_mask; } _FORCE_INLINE_ uint32_t get_collision_mask() const { return collision_mask; }
_FORCE_INLINE_ bool test_collision_mask(CollisionObjectSW *p_other) const { _FORCE_INLINE_ bool test_collision_mask(CollisionObjectSW *p_other) const {

31
servers/physics_2d/broad_phase_2d_hash_grid.cpp
View file

@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "broad_phase_2d_hash_grid.h" #include "broad_phase_2d_hash_grid.h"
#include "collision_object_2d_sw.h"
#include "core/project_settings.h" #include "core/project_settings.h"
#define LARGE_ELEMENT_FI 1.01239812 #define LARGE_ELEMENT_FI 1.01239812
@ -76,23 +77,22 @@ void BroadPhase2DHashGrid::_check_motion(Element *p_elem) {
for (Map<Element *, PairData *>::Element *E = p_elem->paired.front(); E; E = E->next()) { for (Map<Element *, PairData *>::Element *E = p_elem->paired.front(); E; E = E->next()) {
bool pairing = p_elem->aabb.intersects(E->key()->aabb); bool physical_collision = p_elem->aabb.intersects(E->key()->aabb);
bool logical_collision = p_elem->owner->test_collision_mask(E->key()->owner);
if (pairing != E->get()->colliding) { if (physical_collision) {
if (!E->get()->colliding || (logical_collision && !E->get()->ud && pair_callback)) {
if (pairing) {
if (pair_callback) {
E->get()->ud = pair_callback(p_elem->owner, p_elem->subindex, E->key()->owner, E->key()->subindex, pair_userdata); E->get()->ud = pair_callback(p_elem->owner, p_elem->subindex, E->key()->owner, E->key()->subindex, pair_userdata);
} else if (E->get()->colliding && !logical_collision && E->get()->ud && unpair_callback) {
unpair_callback(p_elem->owner, p_elem->subindex, E->key()->owner, E->key()->subindex, E->get()->ud, unpair_userdata);
E->get()->ud = nullptr;
} }
} else { E->get()->colliding = true;
} else { // No physcial_collision
if (unpair_callback) { if (E->get()->colliding && unpair_callback) {
unpair_callback(p_elem->owner, p_elem->subindex, E->key()->owner, E->key()->subindex, E->get()->ud, unpair_userdata); unpair_callback(p_elem->owner, p_elem->subindex, E->key()->owner, E->key()->subindex, E->get()->ud, unpair_userdata);
} }
} E->get()->colliding = false;
E->get()->colliding = pairing;
} }
} }
} }
@ -339,8 +339,7 @@ void BroadPhase2DHashGrid::move(ID p_id, const Rect2 &p_aabb) {
Element &e = E->get(); Element &e = E->get();
if (p_aabb == e.aabb) if (p_aabb != e.aabb) {
return;
if (p_aabb != Rect2()) { if (p_aabb != Rect2()) {
@ -353,11 +352,11 @@ void BroadPhase2DHashGrid::move(ID p_id, const Rect2 &p_aabb) {
} }
e.aabb = p_aabb; e.aabb = p_aabb;
}
_check_motion(&e); _check_motion(&e);
e.aabb = p_aabb;
} }
void BroadPhase2DHashGrid::set_static(ID p_id, bool p_static) { void BroadPhase2DHashGrid::set_static(ID p_id, bool p_static) {
Map<ID, Element>::Element *E = element_map.find(p_id); Map<ID, Element>::Element *E = element_map.find(p_id);

10
servers/physics_2d/collision_object_2d_sw.h
View file

@ -169,10 +169,16 @@ public:
return shapes[p_idx].one_way_collision_margin; return shapes[p_idx].one_way_collision_margin;
} }
void set_collision_mask(uint32_t p_mask) { collision_mask = p_mask; } void set_collision_mask(uint32_t p_mask) {
collision_mask = p_mask;
_shape_changed();
}
_FORCE_INLINE_ uint32_t get_collision_mask() const { return collision_mask; } _FORCE_INLINE_ uint32_t get_collision_mask() const { return collision_mask; }
void set_collision_layer(uint32_t p_layer) { collision_layer = p_layer; } void set_collision_layer(uint32_t p_layer) {
collision_layer = p_layer;
_shape_changed();
}
_FORCE_INLINE_ uint32_t get_collision_layer() const { return collision_layer; } _FORCE_INLINE_ uint32_t get_collision_layer() const { return collision_layer; }
void remove_shape(Shape2DSW *p_shape); void remove_shape(Shape2DSW *p_shape);