godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

This commit is contained in:
Juan Linietsky 2016-01-24 00:47:22 -03:00
parent 2fce78ad10 d01f55a78e
commit e3ca1c5c13
4 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/2d/collision_object_2d.cpp
View File

@ -32,14 +32,14 @@
void CollisionObject2D::_update_shapes_from_children() { void CollisionObject2D::_update_shapes_from_children() {
shapes.resize(0); shapes.clear();
for(int i=0;i<get_child_count();i++) { for(int i=0;i<get_child_count();i++) {
Node* n = get_child(i); Node* n = get_child(i);
n->call("_add_to_collision_object",this); n->call("_add_to_collision_object",this);
} }
// _update_shapes(); _update_shapes();
} }
void CollisionObject2D::_notification(int p_what) { void CollisionObject2D::_notification(int p_what) {

4
scene/3d/collision_object.cpp
View File

@ -31,14 +31,14 @@
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
void CollisionObject::_update_shapes_from_children() { void CollisionObject::_update_shapes_from_children() {
shapes.resize(0); shapes.clear();
for(int i=0;i<get_child_count();i++) { for(int i=0;i<get_child_count();i++) {
Node* n = get_child(i); Node* n = get_child(i);
n->call("_add_to_collision_object",this); n->call("_add_to_collision_object",this);
} }
// _update_shapes(); _update_shapes();
} }
void CollisionObject::_notification(int p_what) { void CollisionObject::_notification(int p_what) {

22
servers/physics/body_sw.h
View File

@ -93,10 +93,11 @@ class BodySW : public CollisionObjectSW {
struct AreaCMP { struct AreaCMP {
AreaSW *area; 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_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_ bool operator<(const AreaCMP& p_cmp) const { return area->get_priority() < p_cmp.area->get_priority();}
_FORCE_INLINE_ AreaCMP() {} _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; Vector<AreaCMP> areas;
@ -143,8 +144,23 @@ public:
void set_force_integration_callback(ObjectID p_id,const StringName& p_method,const Variant& p_udata=Variant()); 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 add_area(AreaSW *p_area) {
_FORCE_INLINE_ void remove_area(AreaSW *p_area) { areas.erase(AreaCMP(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_ 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(); } _FORCE_INLINE_ int get_max_contacts_reported() const { return contacts.size(); }

22
servers/physics_2d/body_2d_sw.h
View File

@ -93,10 +93,11 @@ class Body2DSW : public CollisionObject2DSW {
struct AreaCMP { struct AreaCMP {
Area2DSW *area; 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_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_ bool operator<(const AreaCMP& p_cmp) const { return area->get_priority() < p_cmp.area->get_priority();}
_FORCE_INLINE_ AreaCMP() {} _FORCE_INLINE_ AreaCMP() {}
_FORCE_INLINE_ AreaCMP(Area2DSW *p_area) { area=p_area;} _FORCE_INLINE_ AreaCMP(Area2DSW *p_area) { area=p_area; refCount=1;}
}; };
@ -143,8 +144,23 @@ public:
void set_force_integration_callback(ObjectID p_id, const StringName& p_method, const Variant &p_udata=Variant()); 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 add_area(Area2DSW *p_area) {
_FORCE_INLINE_ void remove_area(Area2DSW *p_area) { areas.erase(AreaCMP(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);} _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);}