asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement combine mode for area

Browse source
This commit is contained in:
Fabio Alessandrelli 2015-03-20 03:38:12 +00:00
parent 4b3b5eba86
commit 18a1403fcf
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
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()) { 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 { } else {
gravity = p_area->get_gravity_vector() * p_area->get_gravity(); gravity += p_area->get_gravity_vector() * p_area->get_gravity();
} }
} }
@ -371,23 +371,28 @@ void BodySW::integrate_forces(real_t p_step) {
if (mode==PhysicsServer::BODY_MODE_STATIC) if (mode==PhysicsServer::BODY_MODE_STATIC)
return; return;
AreaSW *current_area = get_space()->get_default_area(); AreaSW *def_area = get_space()->get_default_area();
ERR_FAIL_COND(!current_area); ERR_FAIL_COND(!def_area);
int prio = current_area->get_priority();
int ac = areas.size(); int ac = areas.size();
bool replace = false;
gravity=Vector3(0,0,0);
if (ac) { if (ac) {
const AreaCMP *aa = &areas[0]; const AreaCMP *aa = &areas[0];
for(int i=0;i<ac;i++) { density = aa[ac-1].area->get_density();
if (aa[i].area->get_priority() > prio) { for(int i=ac-1;i>=0;i--) {
current_area=aa[i].area; _compute_area_gravity(aa[i].area);
prio=current_area->get_priority(); 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; Vector3 motion;
bool do_motion=false; bool do_motion=false;
@ -455,7 +460,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; contact_count=0;
} }