diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-18 14:44:59 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-18 14:44:59 -0300 |
| commit | f92a1fd6460ac7ad8c37737edd03a56c584a0ad3 (patch) | |
| tree | bdb4ca42e9b93bdba3155faacba659080cd104b6 /servers/physics_2d/body_2d_sw.h | |
| parent | fdaa2920eb21fff3320a17e9239e04dfadecdb00 (diff) | |
| parent | e1bfbcfd4230b3224d5700914f6457ea869214f0 (diff) | |
| download | redot-engine-f92a1fd6460ac7ad8c37737edd03a56c584a0ad3.tar.gz | |
Merge pull request #1691 from Faless/area_combine_2d
Implement Area2D space_override_mode = COMBINE
Diffstat (limited to 'servers/physics_2d/body_2d_sw.h')
| -rw-r--r-- | servers/physics_2d/body_2d_sw.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/servers/physics_2d/body_2d_sw.h b/servers/physics_2d/body_2d_sw.h index a6fc6fc97f..3b07401dd7 100644 --- a/servers/physics_2d/body_2d_sw.h +++ b/servers/physics_2d/body_2d_sw.h @@ -91,13 +91,14 @@ class Body2DSW : public CollisionObject2DSW { struct AreaCMP { Area2DSW *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& p_cmp) const { return area->get_priority() < p_cmp.area->get_priority();} _FORCE_INLINE_ AreaCMP() {} _FORCE_INLINE_ AreaCMP(Area2DSW *p_area) { area=p_area;} }; - VSet<AreaCMP> areas; + Vector<AreaCMP> areas; struct Contact { @@ -140,7 +141,7 @@ 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.insert(AreaCMP(p_area)); } + _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 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);} |