godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +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

134
servers/physics/collision_object_sw.cpp
View File

@@ -29,37 +29,35 @@
#include "collision_object_sw.h"
#include "space_sw.h"
void CollisionObjectSW::add_shape(ShapeSW *p_shape,const Transform& p_transform) {
void CollisionObjectSW::add_shape(ShapeSW *p_shape, const Transform &p_transform) {
Shape s;
s.shape=p_shape;
s.xform=p_transform;
s.xform_inv=s.xform.affine_inverse();
s.bpid=0; //needs update
s.shape = p_shape;
s.xform = p_transform;
s.xform_inv = s.xform.affine_inverse();
s.bpid = 0; //needs update
shapes.push_back(s);
p_shape->add_owner(this);
_update_shapes();
_shapes_changed();
}
void CollisionObjectSW::set_shape(int p_index,ShapeSW *p_shape){
void CollisionObjectSW::set_shape(int p_index, ShapeSW *p_shape) {
ERR_FAIL_INDEX(p_index,shapes.size());
ERR_FAIL_INDEX(p_index, shapes.size());
shapes[p_index].shape->remove_owner(this);
shapes[p_index].shape=p_shape;
shapes[p_index].shape = p_shape;
p_shape->add_owner(this);
_update_shapes();
_shapes_changed();
}
void CollisionObjectSW::set_shape_transform(int p_index,const Transform& p_transform){
void CollisionObjectSW::set_shape_transform(int p_index, const Transform &p_transform) {
ERR_FAIL_INDEX(p_index,shapes.size());
ERR_FAIL_INDEX(p_index, shapes.size());
shapes[p_index].xform=p_transform;
shapes[p_index].xform_inv=p_transform.affine_inverse();
shapes[p_index].xform = p_transform;
shapes[p_index].xform_inv = p_transform.affine_inverse();
_update_shapes();
_shapes_changed();
}
@@ -67,61 +65,58 @@ void CollisionObjectSW::set_shape_transform(int p_index,const Transform& p_trans
void CollisionObjectSW::remove_shape(ShapeSW *p_shape) {
//remove a shape, all the times it appears
for(int i=0;i<shapes.size();i++) {
for (int i = 0; i < shapes.size(); i++) {
if (shapes[i].shape==p_shape) {
if (shapes[i].shape == p_shape) {
remove_shape(i);
i--;
}
}
}
void CollisionObjectSW::remove_shape(int p_index){
void CollisionObjectSW::remove_shape(int p_index) {
//remove anything from shape to be erased to end, so subindices don't change
ERR_FAIL_INDEX(p_index,shapes.size());
for(int i=p_index;i<shapes.size();i++) {
ERR_FAIL_INDEX(p_index, shapes.size());
for (int i = p_index; i < shapes.size(); i++) {
if (shapes[i].bpid==0)
if (shapes[i].bpid == 0)
continue;
//should never get here with a null owner
space->get_broadphase()->remove(shapes[i].bpid);
shapes[i].bpid=0;
shapes[i].bpid = 0;
}
shapes[p_index].shape->remove_owner(this);
shapes.remove(p_index);
_shapes_changed();
}
void CollisionObjectSW::_set_static(bool p_static) {
if (_static==p_static)
if (_static == p_static)
return;
_static=p_static;
_static = p_static;
if (!space)
return;
for(int i=0;i<get_shape_count();i++) {
Shape &s=shapes[i];
if (s.bpid>0) {
space->get_broadphase()->set_static(s.bpid,_static);
for (int i = 0; i < get_shape_count(); i++) {
Shape &s = shapes[i];
if (s.bpid > 0) {
space->get_broadphase()->set_static(s.bpid, _static);
}
}
}
void CollisionObjectSW::_unregister_shapes() {
for(int i=0;i<shapes.size();i++) {
for (int i = 0; i < shapes.size(); i++) {
Shape &s=shapes[i];
if (s.bpid>0) {
Shape &s = shapes[i];
if (s.bpid > 0) {
space->get_broadphase()->remove(s.bpid);
s.bpid=0;
s.bpid = 0;
}
}
}
void CollisionObjectSW::_update_shapes() {
@@ -129,52 +124,47 @@ void CollisionObjectSW::_update_shapes() {
if (!space)
return;
for(int i=0;i<shapes.size();i++) {
for (int i = 0; i < shapes.size(); i++) {
Shape &s=shapes[i];
if (s.bpid==0) {
s.bpid=space->get_broadphase()->create(this,i);
space->get_broadphase()->set_static(s.bpid,_static);
Shape &s = shapes[i];
if (s.bpid == 0) {
s.bpid = space->get_broadphase()->create(this, i);
space->get_broadphase()->set_static(s.bpid, _static);
}
//not quite correct, should compute the next matrix..
AABB shape_aabb=s.shape->get_aabb();
AABB shape_aabb = s.shape->get_aabb();
Transform xform = transform * s.xform;
shape_aabb=xform.xform(shape_aabb);
s.aabb_cache=shape_aabb;
s.aabb_cache=s.aabb_cache.grow( (s.aabb_cache.size.x + s.aabb_cache.size.y)*0.5*0.05 );
shape_aabb = xform.xform(shape_aabb);
s.aabb_cache = shape_aabb;
s.aabb_cache = s.aabb_cache.grow((s.aabb_cache.size.x + s.aabb_cache.size.y) * 0.5 * 0.05);
space->get_broadphase()->move(s.bpid,s.aabb_cache);
space->get_broadphase()->move(s.bpid, s.aabb_cache);
}
}
void CollisionObjectSW::_update_shapes_with_motion(const Vector3& p_motion) {
void CollisionObjectSW::_update_shapes_with_motion(const Vector3 &p_motion) {
if (!space)
return;
for(int i=0;i<shapes.size();i++) {
for (int i = 0; i < shapes.size(); i++) {
Shape &s=shapes[i];
if (s.bpid==0) {
s.bpid=space->get_broadphase()->create(this,i);
space->get_broadphase()->set_static(s.bpid,_static);
Shape &s = shapes[i];
if (s.bpid == 0) {
s.bpid = space->get_broadphase()->create(this, i);
space->get_broadphase()->set_static(s.bpid, _static);
}
//not quite correct, should compute the next matrix..
AABB shape_aabb=s.shape->get_aabb();
AABB shape_aabb = s.shape->get_aabb();
Transform xform = transform * s.xform;
shape_aabb=xform.xform(shape_aabb);
shape_aabb=shape_aabb.merge(AABB( shape_aabb.pos+p_motion,shape_aabb.size)); //use motion
s.aabb_cache=shape_aabb;
shape_aabb = xform.xform(shape_aabb);
shape_aabb = shape_aabb.merge(AABB(shape_aabb.pos + p_motion, shape_aabb.size)); //use motion
s.aabb_cache = shape_aabb;
space->get_broadphase()->move(s.bpid,shape_aabb);
space->get_broadphase()->move(s.bpid, shape_aabb);
}
}
void CollisionObjectSW::_set_space(SpaceSW *p_space) {
@@ -183,25 +173,23 @@ void CollisionObjectSW::_set_space(SpaceSW *p_space) {
space->remove_object(this);
for(int i=0;i<shapes.size();i++) {
for (int i = 0; i < shapes.size(); i++) {
Shape &s=shapes[i];
Shape &s = shapes[i];
if (s.bpid) {
space->get_broadphase()->remove(s.bpid);
s.bpid=0;
s.bpid = 0;
}
}
}
space=p_space;
space = p_space;
if (space) {
space->add_object(this);
_update_shapes();
}
}
void CollisionObjectSW::_shape_changed() {
@@ -212,11 +200,11 @@ void CollisionObjectSW::_shape_changed() {
CollisionObjectSW::CollisionObjectSW(Type p_type) {
_static=true;
type=p_type;
space=NULL;
instance_id=0;
layer_mask=1;
collision_mask=1;
ray_pickable=true;
_static = true;
type = p_type;
space = NULL;
instance_id = 0;
layer_mask = 1;
collision_mask = 1;
ray_pickable = true;
}