diff options
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics/body_sw.h | 22 | ||||
| -rw-r--r-- | servers/physics_2d/body_2d_sw.h | 22 |
2 files changed, 38 insertions, 6 deletions
diff --git a/servers/physics/body_sw.h b/servers/physics/body_sw.h index 66d814bfd1..1a45a02744 100644 --- a/servers/physics/body_sw.h +++ b/servers/physics/body_sw.h @@ -91,10 +91,11 @@ class BodySW : public CollisionObjectSW { struct AreaCMP { AreaSW *area; + int refCount; _FORCE_INLINE_ bool operator==(const AreaCMP& p_cmp) const { return area->get_self() == p_cmp.area->get_self();} _FORCE_INLINE_ bool operator<(const AreaCMP& p_cmp) const { return area->get_priority() < p_cmp.area->get_priority();} _FORCE_INLINE_ AreaCMP() {} - _FORCE_INLINE_ AreaCMP(AreaSW *p_area) { area=p_area;} + _FORCE_INLINE_ AreaCMP(AreaSW *p_area) { area=p_area; refCount=1;} }; Vector<AreaCMP> areas; @@ -141,8 +142,23 @@ public: void set_force_integration_callback(ObjectID p_id,const StringName& p_method,const Variant& p_udata=Variant()); - _FORCE_INLINE_ void add_area(AreaSW *p_area) { areas.ordered_insert(AreaCMP(p_area)); } - _FORCE_INLINE_ void remove_area(AreaSW *p_area) { areas.erase(AreaCMP(p_area)); } + _FORCE_INLINE_ void add_area(AreaSW *p_area) { + int index = areas.find(AreaCMP(p_area)); + if( index > -1 ) { + areas[index].refCount += 1; + } else { + areas.ordered_insert(AreaCMP(p_area)); + } + } + + _FORCE_INLINE_ void remove_area(AreaSW *p_area) { + int index = areas.find(AreaCMP(p_area)); + if( index > -1 ) { + areas[index].refCount -= 1; + if( areas[index].refCount < 1 ) + areas.remove(index); + } + } _FORCE_INLINE_ void set_max_contacts_reported(int p_size) { contacts.resize(p_size); contact_count=0; if (mode==PhysicsServer::BODY_MODE_KINEMATIC && p_size) set_active(true);} _FORCE_INLINE_ int get_max_contacts_reported() const { return contacts.size(); } diff --git a/servers/physics_2d/body_2d_sw.h b/servers/physics_2d/body_2d_sw.h index 2fbfcaca60..9720b265dc 100644 --- a/servers/physics_2d/body_2d_sw.h +++ b/servers/physics_2d/body_2d_sw.h @@ -92,10 +92,11 @@ class Body2DSW : public CollisionObject2DSW { struct AreaCMP { Area2DSW *area; + int refCount; _FORCE_INLINE_ bool operator==(const AreaCMP& p_cmp) const { return area->get_self() == p_cmp.area->get_self();} _FORCE_INLINE_ bool operator<(const AreaCMP& p_cmp) const { return area->get_priority() < p_cmp.area->get_priority();} _FORCE_INLINE_ AreaCMP() {} - _FORCE_INLINE_ AreaCMP(Area2DSW *p_area) { area=p_area;} + _FORCE_INLINE_ AreaCMP(Area2DSW *p_area) { area=p_area; refCount=1;} }; @@ -142,8 +143,23 @@ public: void set_force_integration_callback(ObjectID p_id, const StringName& p_method, const Variant &p_udata=Variant()); - _FORCE_INLINE_ void add_area(Area2DSW *p_area) { areas.ordered_insert(AreaCMP(p_area)); } - _FORCE_INLINE_ void remove_area(Area2DSW *p_area) { areas.erase(AreaCMP(p_area)); } + _FORCE_INLINE_ void add_area(Area2DSW *p_area) { + int index = areas.find(AreaCMP(p_area)); + if( index > -1 ) { + areas[index].refCount += 1; + } else { + areas.ordered_insert(AreaCMP(p_area)); + } + } + + _FORCE_INLINE_ void remove_area(Area2DSW *p_area) { + int index = areas.find(AreaCMP(p_area)); + if( index > -1 ) { + areas[index].refCount -= 1; + if( areas[index].refCount < 1 ) + areas.remove(index); + } + } _FORCE_INLINE_ void set_max_contacts_reported(int p_size) { contacts.resize(p_size); contact_count=0; if (mode==Physics2DServer::BODY_MODE_KINEMATIC && p_size) set_active(true);} |