Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Bullet Area overlaps when Area properties or shapes change. #42306

Merged
merged 1 commit into from
Nov 18, 2021
+12 −7
Merged

Update Bullet Area overlaps when Area properties or shapes change. #42306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/bullet/area_bullet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ int AreaBullet::find_overlapping_object(CollisionObjectBullet *p_colObj) {

void AreaBullet::set_monitorable(bool p_monitorable) {
monitorable = p_monitorable;
updated = true;
}

bool AreaBullet::is_monitoring() const {
Expand All @@ -162,6 +163,7 @@ bool AreaBullet::is_monitoring() const {
void AreaBullet::main_shape_changed() {
CRASH_COND(!get_main_shape());
btGhost->setCollisionShape(get_main_shape());
updated = true;
}

void AreaBullet::reload_body() {
Expand Down Expand Up @@ -192,6 +194,7 @@ void AreaBullet::on_collision_filters_change() {
if (space) {
space->reload_collision_filters(this);
}
updated = true;
}

void AreaBullet::add_overlap(CollisionObjectBullet *p_otherObject) {
Expand Down Expand Up @@ -277,6 +280,7 @@ void AreaBullet::set_event_callback(Type p_callbackObjectType, ObjectID p_id, co
set_godot_object_flags(get_godot_object_flags() | GOF_IS_MONITORING_AREA);
} else {
set_godot_object_flags(get_godot_object_flags() & (~GOF_IS_MONITORING_AREA));
clear_overlaps(true);
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/bullet/area_bullet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class AreaBullet : public RigidCollisionObjectBullet {

virtual void on_collision_filters_change();
virtual void on_collision_checker_start() {}
virtual void on_collision_checker_end() { isTransformChanged = false; }
virtual void on_collision_checker_end() { updated = false; }

void add_overlap(CollisionObjectBullet *p_otherObject);
void put_overlap_as_exit(int p_index);
Expand Down
3 changes: 2 additions & 1 deletion modules/bullet/collision_object_bullet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ void CollisionObjectBullet::on_exit_area(AreaBullet *p_area) {

void CollisionObjectBullet::set_godot_object_flags(int flags) {
bt_collision_object->setUserIndex2(flags);
updated = true;
}

int CollisionObjectBullet::get_godot_object_flags() const {
Expand Down Expand Up @@ -214,7 +215,7 @@ const btTransform &CollisionObjectBullet::get_transform__bullet() const {
}

void CollisionObjectBullet::notify_transform_changed() {
isTransformChanged = true;
updated = true;
}

RigidCollisionObjectBullet::~RigidCollisionObjectBullet() {
Expand Down
6 changes: 3 additions & 3 deletions modules/bullet/collision_object_bullet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class CollisionObjectBullet : public RIDBullet {
/// New area is added when overlap with new area (AreaBullet::addOverlap), then is removed when it exit (CollisionObjectBullet::onExitArea)
/// This array is used mainly to know which area hold the pointer of this object
Vector<AreaBullet *> areasOverlapped;
bool isTransformChanged = false;
bool updated = false;

public:
CollisionObjectBullet(Type p_type);
Expand Down Expand Up @@ -206,9 +206,9 @@ class CollisionObjectBullet : public RIDBullet {
Transform get_transform() const;
virtual void set_transform__bullet(const btTransform &p_global_transform);
virtual const btTransform &get_transform__bullet() const;

bool is_transform_changed() const { return isTransformChanged; }
virtual void notify_transform_changed();

bool is_updated() const { return updated; }
};

class RigidCollisionObjectBullet : public CollisionObjectBullet, public ShapeOwnerBullet {
Expand Down
2 changes: 1 addition & 1 deletion modules/bullet/rigid_body_bullet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ void RigidBodyBullet::on_collision_checker_start() {

void RigidBodyBullet::on_collision_checker_end() {
// Always true if active and not a static or kinematic body
isTransformChanged = btBody->isActive() && !btBody->isStaticOrKinematicObject();
updated = btBody->isActive() && !btBody->isStaticOrKinematicObject();
}

bool RigidBodyBullet::add_collision_object(RigidBodyBullet *p_otherObject, const Vector3 &p_hitWorldLocation, const Vector3 &p_hitLocalLocation, const Vector3 &p_hitNormal, const float &p_appliedImpulse, int p_other_shape_index, int p_local_shape_index) {
Expand Down
2 changes: 1 addition & 1 deletion modules/bullet/space_bullet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ void SpaceBullet::check_ghost_overlaps() {
RigidCollisionObjectBullet *otherObject = static_cast<RigidCollisionObjectBullet *>(overlapped_bt_co->getUserPointer());
btVector3 other_body_scale(otherObject->get_bt_body_scale());

if (!area->is_transform_changed() && !otherObject->is_transform_changed()) {
if (!area->is_updated() && !otherObject->is_updated()) {
hasOverlap = -1 != area->find_overlapping_object(otherObject);
goto collision_found;
}
Expand Down