|
@@ -84,13 +84,13 @@ class BodySW : public CollisionObjectSW {
|
|
|
struct AreaCMP {
|
|
|
|
|
|
AreaSW *area;
|
|
|
- _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_self() == p_cmp.area->get_self();}
|
|
|
+ _FORCE_INLINE_ bool operator<(const AreaCMP a) const { return area->get_priority() < a.area->get_priority();}
|
|
|
_FORCE_INLINE_ AreaCMP() {}
|
|
|
_FORCE_INLINE_ AreaCMP(AreaSW *p_area) { area=p_area;}
|
|
|
};
|
|
|
|
|
|
-
|
|
|
- VSet<AreaCMP> areas;
|
|
|
+ Vector<AreaCMP> areas;
|
|
|
|
|
|
struct Contact {
|
|
|
|
|
@@ -134,8 +134,7 @@ 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.insert(AreaCMP(p_area)); }
|
|
|
+ _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 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);}
|