diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-27 07:20:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-27 07:21:03 +0400 |
| commit | d09a8ea9e7a8ad208326b99a0631e9efc7119fbd (patch) | |
| tree | 509b7420925e137a4bcde7d401007f8bbcaf5bcd /intern/rigidbody/rb_bullet_api.cpp | |
| parent | 81b64e506f26de58ffaff5b61a92179ae8015aec (diff) | |
Code Cleanup: style
Diffstat (limited to 'intern/rigidbody/rb_bullet_api.cpp')
| -rw-r--r-- | intern/rigidbody/rb_bullet_api.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp index ef35d3b257b..ab7b851911a 100644 --- a/intern/rigidbody/rb_bullet_api.cpp +++ b/intern/rigidbody/rb_bullet_api.cpp @@ -265,7 +265,10 @@ void RB_dworld_remove_body(rbDynamicsWorld *world, rbRigidBody *object) /* Collision detection */ -void RB_world_convex_sweep_test(rbDynamicsWorld *world, rbRigidBody *object, const float loc_start[3], const float loc_end[3], float v_location[3], float v_hitpoint[3], float v_normal[3], int *r_hit) +void RB_world_convex_sweep_test( + rbDynamicsWorld *world, rbRigidBody *object, + const float loc_start[3], const float loc_end[3], + float v_location[3], float v_hitpoint[3], float v_normal[3], int *r_hit) { btRigidBody *body = object->body; btCollisionShape *collisionShape = body->getCollisionShape(); @@ -285,14 +288,14 @@ void RB_world_convex_sweep_test(rbDynamicsWorld *world, rbRigidBody *object, con rayToTrans.setRotation(obRot); rayToTrans.setOrigin(btVector3(loc_end[0], loc_end[1], loc_end[2])); - world->dynamicsWorld->convexSweepTest((btConvexShape*) collisionShape, rayFromTrans, rayToTrans, result, 0); + world->dynamicsWorld->convexSweepTest((btConvexShape *)collisionShape, rayFromTrans, rayToTrans, result, 0); if (result.hasHit()) { *r_hit = 1; - v_location[0] = result.m_convexFromWorld[0]+(result.m_convexToWorld[0]-result.m_convexFromWorld[0])*result.m_closestHitFraction; - v_location[1] = result.m_convexFromWorld[1]+(result.m_convexToWorld[1]-result.m_convexFromWorld[1])*result.m_closestHitFraction; - v_location[2] = result.m_convexFromWorld[2]+(result.m_convexToWorld[2]-result.m_convexFromWorld[2])*result.m_closestHitFraction; + v_location[0] = result.m_convexFromWorld[0] + (result.m_convexToWorld[0] - result.m_convexFromWorld[0]) * result.m_closestHitFraction; + v_location[1] = result.m_convexFromWorld[1] + (result.m_convexToWorld[1] - result.m_convexFromWorld[1]) * result.m_closestHitFraction; + v_location[2] = result.m_convexFromWorld[2] + (result.m_convexToWorld[2] - result.m_convexFromWorld[2]) * result.m_closestHitFraction; v_hitpoint[0] = result.m_hitPointWorld[0]; v_hitpoint[1] = result.m_hitPointWorld[1]; @@ -307,7 +310,7 @@ void RB_world_convex_sweep_test(rbDynamicsWorld *world, rbRigidBody *object, con *r_hit = 0; } } - else{ + else { /* we need to return a value if user passes non convex body, to report */ *r_hit = -2; } @@ -972,7 +975,7 @@ rbConstraint *RB_constraint_new_motor(float pivot[3], float orn[4], rbRigidBody /* unlock motor axes */ con->getTranslationalLimitMotor()->m_upperLimit.setValue(-1.0f, -1.0f, -1.0f); - return (rbConstraint*)con; + return (rbConstraint *)con; } /* Cleanup ----------------------------- */ |