godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
servers/physics/area_pair_sw.cpp
View File

@@ -29,7 +29,6 @@
#include "area_pair_sw.h"
#include "collision_solver_sw.h"
bool AreaPairSW::setup(float p_step) {
if (!area->test_collision_mask(body)) {
@@ -37,63 +36,55 @@ bool AreaPairSW::setup(float p_step) {
return false;
}
bool result = CollisionSolverSW::solve_static(body->get_shape(body_shape),body->get_transform() * body->get_shape_transform(body_shape),area->get_shape(area_shape),area->get_transform() * area->get_shape_transform(area_shape),NULL,this);
bool result = CollisionSolverSW::solve_static(body->get_shape(body_shape), body->get_transform() * body->get_shape_transform(body_shape), area->get_shape(area_shape), area->get_transform() * area->get_shape_transform(area_shape), NULL, this);
if (result!=colliding) {
if (result != colliding) {
if (result) {
if (area->get_space_override_mode()!=PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED)
if (area->get_space_override_mode() != PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED)
body->add_area(area);
if (area->has_monitor_callback())
area->add_body_to_query(body,body_shape,area_shape);
area->add_body_to_query(body, body_shape, area_shape);
} else {
if (area->get_space_override_mode()!=PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED)
if (area->get_space_override_mode() != PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED)
body->remove_area(area);
if (area->has_monitor_callback())
area->remove_body_from_query(body,body_shape,area_shape);
area->remove_body_from_query(body, body_shape, area_shape);
}
colliding=result;
colliding = result;
}
return false; //never do any post solving
}
void AreaPairSW::solve(float p_step) {
}
AreaPairSW::AreaPairSW(BodySW *p_body, int p_body_shape, AreaSW *p_area, int p_area_shape) {
AreaPairSW::AreaPairSW(BodySW *p_body,int p_body_shape, AreaSW *p_area,int p_area_shape) {
body=p_body;
area=p_area;
body_shape=p_body_shape;
area_shape=p_area_shape;
colliding=false;
body->add_constraint(this,0);
body = p_body;
area = p_area;
body_shape = p_body_shape;
area_shape = p_area_shape;
colliding = false;
body->add_constraint(this, 0);
area->add_constraint(this);
if (p_body->get_mode()==PhysicsServer::BODY_MODE_KINEMATIC)
if (p_body->get_mode() == PhysicsServer::BODY_MODE_KINEMATIC)
p_body->set_active(true);
}
AreaPairSW::~AreaPairSW() {
if (colliding) {
if (area->get_space_override_mode()!=PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED)
if (area->get_space_override_mode() != PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED)
body->remove_area(area);
if (area->has_monitor_callback())
area->remove_body_from_query(body,body_shape,area_shape);
area->remove_body_from_query(body, body_shape, area_shape);
}
body->remove_constraint(this);
area->remove_constraint(this);
@@ -101,8 +92,6 @@ AreaPairSW::~AreaPairSW() {
////////////////////////////////////////////////////
bool Area2PairSW::setup(float p_step) {
if (!area_a->test_collision_mask(area_b)) {
@@ -110,52 +99,46 @@ bool Area2PairSW::setup(float p_step) {
return false;
}
// bool result = area_a->test_collision_mask(area_b) && CollisionSolverSW::solve(area_a->get_shape(shape_a),area_a->get_transform() * area_a->get_shape_transform(shape_a),Vector2(),area_b->get_shape(shape_b),area_b->get_transform() * area_b->get_shape_transform(shape_b),Vector2(),NULL,this);
bool result = CollisionSolverSW::solve_static(area_a->get_shape(shape_a),area_a->get_transform() * area_a->get_shape_transform(shape_a),area_b->get_shape(shape_b),area_b->get_transform() * area_b->get_shape_transform(shape_b),NULL,this);
// bool result = area_a->test_collision_mask(area_b) && CollisionSolverSW::solve(area_a->get_shape(shape_a),area_a->get_transform() * area_a->get_shape_transform(shape_a),Vector2(),area_b->get_shape(shape_b),area_b->get_transform() * area_b->get_shape_transform(shape_b),Vector2(),NULL,this);
bool result = CollisionSolverSW::solve_static(area_a->get_shape(shape_a), area_a->get_transform() * area_a->get_shape_transform(shape_a), area_b->get_shape(shape_b), area_b->get_transform() * area_b->get_shape_transform(shape_b), NULL, this);
if (result!=colliding) {
if (result != colliding) {
if (result) {
if (area_b->has_area_monitor_callback() && area_a->is_monitorable())
area_b->add_area_to_query(area_a,shape_a,shape_b);
area_b->add_area_to_query(area_a, shape_a, shape_b);
if (area_a->has_area_monitor_callback() && area_b->is_monitorable())
area_a->add_area_to_query(area_b,shape_b,shape_a);
area_a->add_area_to_query(area_b, shape_b, shape_a);
} else {
if (area_b->has_area_monitor_callback() && area_a->is_monitorable())
area_b->remove_area_from_query(area_a,shape_a,shape_b);
area_b->remove_area_from_query(area_a, shape_a, shape_b);
if (area_a->has_area_monitor_callback() && area_b->is_monitorable())
area_a->remove_area_from_query(area_b,shape_b,shape_a);
area_a->remove_area_from_query(area_b, shape_b, shape_a);
}
colliding=result;
colliding = result;
}
return false; //never do any post solving
}
void Area2PairSW::solve(float p_step) {
}
Area2PairSW::Area2PairSW(AreaSW *p_area_a, int p_shape_a, AreaSW *p_area_b, int p_shape_b) {
Area2PairSW::Area2PairSW(AreaSW *p_area_a,int p_shape_a, AreaSW *p_area_b,int p_shape_b) {
area_a=p_area_a;
area_b=p_area_b;
shape_a=p_shape_a;
shape_b=p_shape_b;
colliding=false;
area_a = p_area_a;
area_b = p_area_b;
shape_a = p_shape_a;
shape_b = p_shape_b;
colliding = false;
area_a->add_constraint(this);
area_b->add_constraint(this);
}
Area2PairSW::~Area2PairSW() {
@@ -163,10 +146,10 @@ Area2PairSW::~Area2PairSW() {
if (colliding) {
if (area_b->has_area_monitor_callback() && area_a->is_monitorable())
area_b->remove_area_from_query(area_a,shape_a,shape_b);
area_b->remove_area_from_query(area_a, shape_a, shape_b);
if (area_a->has_area_monitor_callback() && area_b->is_monitorable())
area_a->remove_area_from_query(area_b,shape_b,shape_a);
area_a->remove_area_from_query(area_b, shape_b, shape_a);
}
area_a->remove_constraint(this);