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

Merge pull request #1564 from Faless/area_combine-1 

Implement combine mode for area
This commit is contained in:
Juan Linietsky 2015-04-07 20:21:11 -03:00
parent 8619cb64ba 600bae34bd
commit 219fce737c
3 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/vector.h
View File

@ -149,7 +149,16 @@ public:
sort_custom<_DefaultComparator<T> >();
}
void ordered_insert(const T& p_val) {
int i;
for (i=0; i<size(); i++) {
if (p_val < operator[](i)) {
break;
};
};
insert(i, p_val);
}
void operator=(const Vector& p_from);
Vector(const Vector& p_from);

32
servers/physics/body_sw.cpp
View File

@ -358,10 +358,10 @@ void BodySW::_compute_area_gravity(const AreaSW *p_area) {
if (p_area->is_gravity_point()) {
gravity = (p_area->get_transform().xform(p_area->get_gravity_vector()) - get_transform().get_origin()).normalized() * p_area->get_gravity();
gravity += (p_area->get_transform().xform(p_area->get_gravity_vector()) - get_transform().get_origin()).normalized() * p_area->get_gravity();
} else {
gravity = p_area->get_gravity_vector() * p_area->get_gravity();
gravity += p_area->get_gravity_vector() * p_area->get_gravity();
}
}
@ -371,23 +371,29 @@ void BodySW::integrate_forces(real_t p_step) {
if (mode==PhysicsServer::BODY_MODE_STATIC)
return;
AreaSW *current_area = get_space()->get_default_area();
ERR_FAIL_COND(!current_area);
AreaSW *def_area = get_space()->get_default_area();
ERR_FAIL_COND(!def_area);
int prio = current_area->get_priority();
int ac = areas.size();
bool replace = false;
gravity=Vector3(0,0,0);
if (ac) {
areas.sort();
const AreaCMP *aa = &areas[0];
for(int i=0;i<ac;i++) {
if (aa[i].area->get_priority() > prio) {
current_area=aa[i].area;
prio=current_area->get_priority();
density = aa[ac-1].area->get_density();
for(int i=ac-1;i>=0;i--) {
_compute_area_gravity(aa[i].area);
if (aa[i].area->get_space_override_mode() == PhysicsServer::AREA_SPACE_OVERRIDE_REPLACE) {
replace = true;
break;
}
}
} else {
density=def_area->get_density();
}
if( !replace ) {
_compute_area_gravity(def_area);
}
_compute_area_gravity(current_area);
density=current_area->get_density();
Vector3 motion;
bool do_motion=false;
@ -455,7 +461,7 @@ void BodySW::integrate_forces(real_t p_step) {
}
current_area=NULL; // clear the area, so it is set in the next frame
def_area=NULL; // clear the area, so it is set in the next frame
contact_count=0;
}

9
servers/physics/body_sw.h
View File

@ -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);}