You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-18 14:21:41 +00:00
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
@@ -27,18 +27,26 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
#include "area_sw.h"
|
||||
#include "space_sw.h"
|
||||
#include "body_sw.h"
|
||||
#include "space_sw.h"
|
||||
|
||||
AreaSW::BodyKey::BodyKey(BodySW *p_body, uint32_t p_body_shape,uint32_t p_area_shape) { rid=p_body->get_self(); instance_id=p_body->get_instance_id(); body_shape=p_body_shape; area_shape=p_area_shape; }
|
||||
AreaSW::BodyKey::BodyKey(AreaSW *p_body, uint32_t p_body_shape,uint32_t p_area_shape) { rid=p_body->get_self(); instance_id=p_body->get_instance_id(); body_shape=p_body_shape; area_shape=p_area_shape; }
|
||||
|
||||
void AreaSW::_shapes_changed() {
|
||||
|
||||
|
||||
AreaSW::BodyKey::BodyKey(BodySW *p_body, uint32_t p_body_shape, uint32_t p_area_shape) {
|
||||
rid = p_body->get_self();
|
||||
instance_id = p_body->get_instance_id();
|
||||
body_shape = p_body_shape;
|
||||
area_shape = p_area_shape;
|
||||
}
|
||||
AreaSW::BodyKey::BodyKey(AreaSW *p_body, uint32_t p_body_shape, uint32_t p_area_shape) {
|
||||
rid = p_body->get_self();
|
||||
instance_id = p_body->get_instance_id();
|
||||
body_shape = p_body_shape;
|
||||
area_shape = p_area_shape;
|
||||
}
|
||||
|
||||
void AreaSW::set_transform(const Transform& p_transform) {
|
||||
void AreaSW::_shapes_changed() {
|
||||
}
|
||||
|
||||
void AreaSW::set_transform(const Transform &p_transform) {
|
||||
|
||||
if (!moved_list.in_list() && get_space())
|
||||
get_space()->area_add_to_moved_list(&moved_list);
|
||||
@@ -54,7 +62,6 @@ void AreaSW::set_space(SpaceSW *p_space) {
|
||||
get_space()->area_remove_from_monitor_query_list(&monitor_query_list);
|
||||
if (moved_list.in_list())
|
||||
get_space()->area_remove_from_moved_list(&moved_list);
|
||||
|
||||
}
|
||||
|
||||
monitored_bodies.clear();
|
||||
@@ -63,44 +70,17 @@ void AreaSW::set_space(SpaceSW *p_space) {
|
||||
_set_space(p_space);
|
||||
}
|
||||
|
||||
void AreaSW::set_monitor_callback(ObjectID p_id, const StringName &p_method) {
|
||||
|
||||
void AreaSW::set_monitor_callback(ObjectID p_id, const StringName& p_method) {
|
||||
|
||||
|
||||
if (p_id==monitor_callback_id) {
|
||||
monitor_callback_method=p_method;
|
||||
if (p_id == monitor_callback_id) {
|
||||
monitor_callback_method = p_method;
|
||||
return;
|
||||
}
|
||||
|
||||
_unregister_shapes();
|
||||
|
||||
monitor_callback_id=p_id;
|
||||
monitor_callback_method=p_method;
|
||||
|
||||
monitored_bodies.clear();
|
||||
monitored_areas.clear();
|
||||
|
||||
|
||||
_shape_changed();
|
||||
|
||||
if (!moved_list.in_list() && get_space())
|
||||
get_space()->area_add_to_moved_list(&moved_list);
|
||||
|
||||
|
||||
}
|
||||
|
||||
void AreaSW::set_area_monitor_callback(ObjectID p_id, const StringName& p_method) {
|
||||
|
||||
|
||||
if (p_id==area_monitor_callback_id) {
|
||||
area_monitor_callback_method=p_method;
|
||||
return;
|
||||
}
|
||||
|
||||
_unregister_shapes();
|
||||
|
||||
area_monitor_callback_id=p_id;
|
||||
area_monitor_callback_method=p_method;
|
||||
monitor_callback_id = p_id;
|
||||
monitor_callback_method = p_method;
|
||||
|
||||
monitored_bodies.clear();
|
||||
monitored_areas.clear();
|
||||
@@ -109,45 +89,84 @@ void AreaSW::set_area_monitor_callback(ObjectID p_id, const StringName& p_method
|
||||
|
||||
if (!moved_list.in_list() && get_space())
|
||||
get_space()->area_add_to_moved_list(&moved_list);
|
||||
|
||||
|
||||
}
|
||||
|
||||
void AreaSW::set_area_monitor_callback(ObjectID p_id, const StringName &p_method) {
|
||||
|
||||
if (p_id == area_monitor_callback_id) {
|
||||
area_monitor_callback_method = p_method;
|
||||
return;
|
||||
}
|
||||
|
||||
_unregister_shapes();
|
||||
|
||||
area_monitor_callback_id = p_id;
|
||||
area_monitor_callback_method = p_method;
|
||||
|
||||
monitored_bodies.clear();
|
||||
monitored_areas.clear();
|
||||
|
||||
_shape_changed();
|
||||
|
||||
if (!moved_list.in_list() && get_space())
|
||||
get_space()->area_add_to_moved_list(&moved_list);
|
||||
}
|
||||
|
||||
void AreaSW::set_space_override_mode(PhysicsServer::AreaSpaceOverrideMode p_mode) {
|
||||
bool do_override=p_mode!=PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED;
|
||||
if (do_override==(space_override_mode!=PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED))
|
||||
bool do_override = p_mode != PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED;
|
||||
if (do_override == (space_override_mode != PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED))
|
||||
return;
|
||||
_unregister_shapes();
|
||||
space_override_mode=p_mode;
|
||||
space_override_mode = p_mode;
|
||||
_shape_changed();
|
||||
}
|
||||
|
||||
void AreaSW::set_param(PhysicsServer::AreaParameter p_param, const Variant& p_value) {
|
||||
void AreaSW::set_param(PhysicsServer::AreaParameter p_param, const Variant &p_value) {
|
||||
|
||||
switch(p_param) {
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY: gravity=p_value; ; break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR: gravity_vector=p_value; ; break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT: gravity_is_point=p_value; ; break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: gravity_distance_scale=p_value; ; break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: point_attenuation=p_value; ; break;
|
||||
case PhysicsServer::AREA_PARAM_LINEAR_DAMP: linear_damp=p_value; ; break;
|
||||
case PhysicsServer::AREA_PARAM_ANGULAR_DAMP: angular_damp=p_value; ; break;
|
||||
case PhysicsServer::AREA_PARAM_PRIORITY: priority=p_value; ; break;
|
||||
switch (p_param) {
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY:
|
||||
gravity = p_value;
|
||||
;
|
||||
break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR:
|
||||
gravity_vector = p_value;
|
||||
;
|
||||
break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT:
|
||||
gravity_is_point = p_value;
|
||||
;
|
||||
break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
|
||||
gravity_distance_scale = p_value;
|
||||
;
|
||||
break;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
|
||||
point_attenuation = p_value;
|
||||
;
|
||||
break;
|
||||
case PhysicsServer::AREA_PARAM_LINEAR_DAMP:
|
||||
linear_damp = p_value;
|
||||
;
|
||||
break;
|
||||
case PhysicsServer::AREA_PARAM_ANGULAR_DAMP:
|
||||
angular_damp = p_value;
|
||||
;
|
||||
break;
|
||||
case PhysicsServer::AREA_PARAM_PRIORITY:
|
||||
priority = p_value;
|
||||
;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Variant AreaSW::get_param(PhysicsServer::AreaParameter p_param) const {
|
||||
|
||||
|
||||
switch(p_param) {
|
||||
switch (p_param) {
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY: return gravity;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR: return gravity_vector;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT: return gravity_is_point;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: return gravity_distance_scale;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: return point_attenuation;
|
||||
case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: return point_attenuation;
|
||||
case PhysicsServer::AREA_PARAM_LINEAR_DAMP: return linear_damp;
|
||||
case PhysicsServer::AREA_PARAM_ANGULAR_DAMP: return angular_damp;
|
||||
case PhysicsServer::AREA_PARAM_PRIORITY: return priority;
|
||||
@@ -156,23 +175,20 @@ Variant AreaSW::get_param(PhysicsServer::AreaParameter p_param) const {
|
||||
return Variant();
|
||||
}
|
||||
|
||||
|
||||
void AreaSW::_queue_monitor_update() {
|
||||
|
||||
ERR_FAIL_COND(!get_space());
|
||||
|
||||
if (!monitor_query_list.in_list())
|
||||
get_space()->area_add_to_monitor_query_list(&monitor_query_list);
|
||||
|
||||
|
||||
}
|
||||
|
||||
void AreaSW::set_monitorable(bool p_monitorable) {
|
||||
|
||||
if (monitorable==p_monitorable)
|
||||
if (monitorable == p_monitorable)
|
||||
return;
|
||||
|
||||
monitorable=p_monitorable;
|
||||
monitorable = p_monitorable;
|
||||
_set_static(!monitorable);
|
||||
}
|
||||
|
||||
@@ -182,29 +198,29 @@ void AreaSW::call_queries() {
|
||||
|
||||
Variant res[5];
|
||||
Variant *resptr[5];
|
||||
for(int i=0;i<5;i++)
|
||||
resptr[i]=&res[i];
|
||||
for (int i = 0; i < 5; i++)
|
||||
resptr[i] = &res[i];
|
||||
|
||||
Object *obj = ObjectDB::get_instance(monitor_callback_id);
|
||||
if (!obj) {
|
||||
monitored_bodies.clear();
|
||||
monitor_callback_id=0;
|
||||
monitor_callback_id = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
for (Map<BodyKey,BodyState>::Element *E=monitored_bodies.front();E;E=E->next()) {
|
||||
for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E; E = E->next()) {
|
||||
|
||||
if (E->get().state==0)
|
||||
if (E->get().state == 0)
|
||||
continue; //nothing happened
|
||||
|
||||
res[0]=E->get().state>0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED;
|
||||
res[1]=E->key().rid;
|
||||
res[2]=E->key().instance_id;
|
||||
res[3]=E->key().body_shape;
|
||||
res[4]=E->key().area_shape;
|
||||
res[0] = E->get().state > 0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED;
|
||||
res[1] = E->key().rid;
|
||||
res[2] = E->key().instance_id;
|
||||
res[3] = E->key().body_shape;
|
||||
res[4] = E->key().area_shape;
|
||||
|
||||
Variant::CallError ce;
|
||||
obj->call(monitor_callback_method,(const Variant**)resptr,5,ce);
|
||||
obj->call(monitor_callback_method, (const Variant **)resptr, 5, ce);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -212,64 +228,56 @@ void AreaSW::call_queries() {
|
||||
|
||||
if (area_monitor_callback_id && !monitored_areas.empty()) {
|
||||
|
||||
|
||||
Variant res[5];
|
||||
Variant *resptr[5];
|
||||
for(int i=0;i<5;i++)
|
||||
resptr[i]=&res[i];
|
||||
for (int i = 0; i < 5; i++)
|
||||
resptr[i] = &res[i];
|
||||
|
||||
Object *obj = ObjectDB::get_instance(area_monitor_callback_id);
|
||||
if (!obj) {
|
||||
monitored_areas.clear();
|
||||
area_monitor_callback_id=0;
|
||||
area_monitor_callback_id = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E; E = E->next()) {
|
||||
|
||||
|
||||
for (Map<BodyKey,BodyState>::Element *E=monitored_areas.front();E;E=E->next()) {
|
||||
|
||||
if (E->get().state==0)
|
||||
if (E->get().state == 0)
|
||||
continue; //nothing happened
|
||||
|
||||
res[0]=E->get().state>0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED;
|
||||
res[1]=E->key().rid;
|
||||
res[2]=E->key().instance_id;
|
||||
res[3]=E->key().body_shape;
|
||||
res[4]=E->key().area_shape;
|
||||
|
||||
res[0] = E->get().state > 0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED;
|
||||
res[1] = E->key().rid;
|
||||
res[2] = E->key().instance_id;
|
||||
res[3] = E->key().body_shape;
|
||||
res[4] = E->key().area_shape;
|
||||
|
||||
Variant::CallError ce;
|
||||
obj->call(area_monitor_callback_method,(const Variant**)resptr,5,ce);
|
||||
obj->call(area_monitor_callback_method, (const Variant **)resptr, 5, ce);
|
||||
}
|
||||
}
|
||||
|
||||
monitored_areas.clear();
|
||||
//get_space()->area_remove_from_monitor_query_list(&monitor_query_list);
|
||||
|
||||
}
|
||||
|
||||
AreaSW::AreaSW() : CollisionObjectSW(TYPE_AREA), monitor_query_list(this), moved_list(this) {
|
||||
AreaSW::AreaSW()
|
||||
: CollisionObjectSW(TYPE_AREA), monitor_query_list(this), moved_list(this) {
|
||||
|
||||
_set_static(true); //areas are never active
|
||||
space_override_mode=PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED;
|
||||
gravity=9.80665;
|
||||
gravity_vector=Vector3(0,-1,0);
|
||||
gravity_is_point=false;
|
||||
gravity_distance_scale=0;
|
||||
point_attenuation=1;
|
||||
angular_damp=1.0;
|
||||
linear_damp=0.1;
|
||||
priority=0;
|
||||
space_override_mode = PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED;
|
||||
gravity = 9.80665;
|
||||
gravity_vector = Vector3(0, -1, 0);
|
||||
gravity_is_point = false;
|
||||
gravity_distance_scale = 0;
|
||||
point_attenuation = 1;
|
||||
angular_damp = 1.0;
|
||||
linear_damp = 0.1;
|
||||
priority = 0;
|
||||
set_ray_pickable(false);
|
||||
monitor_callback_id=0;
|
||||
area_monitor_callback_id=0;
|
||||
monitorable=false;
|
||||
|
||||
monitor_callback_id = 0;
|
||||
area_monitor_callback_id = 0;
|
||||
monitorable = false;
|
||||
}
|
||||
|
||||
AreaSW::~AreaSW() {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user