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

Type renames:

Browse Source 
Matrix32 -> Transform2D
	Matrix3 -> Basis
	AABB -> Rect3
	RawArray -> PoolByteArray
	IntArray -> PoolIntArray
	FloatArray -> PoolFloatArray
	Vector2Array -> PoolVector2Array
	Vector3Array -> PoolVector3Array
	ColorArray -> PoolColorArray
This commit is contained in:
Juan Linietsky
2017-01-11 00:52:51 -03:00
parent 710692278d
commit bc26f90581
266 changed files with 2466 additions and 2468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/physics_2d/collision_object_2d_sw.cpp
View File

@ -29,7 +29,7 @@
#include "collision_object_2d_sw.h"
#include "space_2d_sw.h"
void CollisionObject2DSW::add_shape(Shape2DSW *p_shape,const Matrix32& p_transform) {
void CollisionObject2DSW::add_shape(Shape2DSW *p_shape,const Transform2D& p_transform) {
Shape s;
s.shape=p_shape;
@ -63,7 +63,7 @@ void CollisionObject2DSW::set_shape_metadata(int p_index,const Variant& p_metada
}
void CollisionObject2DSW::set_shape_transform(int p_index,const Matrix32& p_transform){
void CollisionObject2DSW::set_shape_transform(int p_index,const Transform2D& p_transform){
ERR_FAIL_INDEX(p_index,shapes.size());
@ -149,7 +149,7 @@ void CollisionObject2DSW::_update_shapes() {
//not quite correct, should compute the next matrix..
Rect2 shape_aabb=s.shape->get_aabb();
Matrix32 xform = transform * s.xform;
Transform2D 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 );
@ -176,7 +176,7 @@ void CollisionObject2DSW::_update_shapes_with_motion(const Vector2& p_motion) {
//not quite correct, should compute the next matrix..
Rect2 shape_aabb=s.shape->get_aabb();
Matrix32 xform = transform * s.xform;
Transform2D xform = transform * s.xform;
shape_aabb=xform.xform(shape_aabb);
shape_aabb=shape_aabb.merge(Rect2( shape_aabb.pos+p_motion,shape_aabb.size)); //use motion
s.aabb_cache=shape_aabb;