diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 08:57:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 08:57:20 +0400 |
| commit | fddc655aec15510b5bb7adfa4cc66d14070576df (patch) | |
| tree | 13c53b94183caedc7625d23db8b4b0b06414a34b /source/blender/blenkernel/intern/collision.c | |
| parent | 2fa642b6e9f4e40aa3a2b90c49374ba91d15a14a (diff) | |
| parent | 9a1f3c587e366fb555696b27c77ed456ffc15f7d (diff) | |
svn merge -r40140:r40148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 59ef6526d3a..03405c28074 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -105,11 +105,11 @@ BVHTree *bvhtree_build_from_mvert ( MFace *mfaces, unsigned int numfaces, MVert // fill tree for ( i = 0; i < numfaces; i++, tface++ ) { - VECCOPY ( &co[0*3], x[tface->v1].co ); - VECCOPY ( &co[1*3], x[tface->v2].co ); - VECCOPY ( &co[2*3], x[tface->v3].co ); + copy_v3_v3 ( &co[0*3], x[tface->v1].co ); + copy_v3_v3 ( &co[1*3], x[tface->v2].co ); + copy_v3_v3 ( &co[2*3], x[tface->v3].co ); if ( tface->v4 ) - VECCOPY ( &co[3*3], x[tface->v4].co ); + copy_v3_v3 ( &co[3*3], x[tface->v4].co ); BLI_bvhtree_insert ( tree, i, co, ( mfaces->v4 ? 4 : 3 ) ); } @@ -134,21 +134,21 @@ void bvhtree_update_from_mvert ( BVHTree * bvhtree, MFace *faces, int numfaces, { for ( i = 0; i < numfaces; i++, mfaces++ ) { - VECCOPY ( &co[0*3], x[mfaces->v1].co ); - VECCOPY ( &co[1*3], x[mfaces->v2].co ); - VECCOPY ( &co[2*3], x[mfaces->v3].co ); + copy_v3_v3 ( &co[0*3], x[mfaces->v1].co ); + copy_v3_v3 ( &co[1*3], x[mfaces->v2].co ); + copy_v3_v3 ( &co[2*3], x[mfaces->v3].co ); if ( mfaces->v4 ) - VECCOPY ( &co[3*3], x[mfaces->v4].co ); + copy_v3_v3 ( &co[3*3], x[mfaces->v4].co ); // copy new locations into array if ( moving && xnew ) { // update moving positions - VECCOPY ( &co_moving[0*3], xnew[mfaces->v1].co ); - VECCOPY ( &co_moving[1*3], xnew[mfaces->v2].co ); - VECCOPY ( &co_moving[2*3], xnew[mfaces->v3].co ); + copy_v3_v3 ( &co_moving[0*3], xnew[mfaces->v1].co ); + copy_v3_v3 ( &co_moving[1*3], xnew[mfaces->v2].co ); + copy_v3_v3 ( &co_moving[2*3], xnew[mfaces->v3].co ); if ( mfaces->v4 ) - VECCOPY ( &co_moving[3*3], xnew[mfaces->v4].co ); + copy_v3_v3 ( &co_moving[3*3], xnew[mfaces->v4].co ); ret = BLI_bvhtree_update_node ( bvhtree, i, co, co_moving, ( mfaces->v4 ? 4 : 3 ) ); } @@ -551,7 +551,7 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM float temp[3], spf; // calculate tangential velocity - VECCOPY ( temp, collpair->normal ); + copy_v3_v3 ( temp, collpair->normal ); mul_v3_fl( temp, magrelVel ); VECSUB ( vrel_t_pre, relativeVelocity, temp ); @@ -2347,7 +2347,7 @@ static int cloth_bvh_objcollisions_resolve ( ClothModifierData * clmd, Collision if ( verts[i].impulse_count ) { VECADDMUL ( verts[i].tv, verts[i].impulse, 1.0f / verts[i].impulse_count ); - VECCOPY ( verts[i].impulse, tnull ); + copy_v3_v3 ( verts[i].impulse, tnull ); verts[i].impulse_count = 0; ret++; |