Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test/collision/SphereSphereCollision.h
View File

@@ -16,15 +16,15 @@ subject to the following restrictions:
#ifndef SPHERE_SPHERE_COLLISION_H
#define SPHERE_SPHERE_COLLISION_H
#include "LinearMath/btTransform.h" // Note that btVector3 might be double precision...
#include "LinearMath/btTransform.h" // Note that btVector3 might be double precision...
#include "btDistanceInfo.h"
struct btSphereSphereCollisionDescription
{
btTransform m_sphereTransformA;
btTransform m_sphereTransformB;
btScalar m_radiusA;
btScalar m_radiusB;
btTransform m_sphereTransformA;
btTransform m_sphereTransformB;
btScalar m_radiusA;
btScalar m_radiusB;
};
///compute the distance between two spheres, where the distance is zero when the spheres are touching
@@ -32,26 +32,23 @@ struct btSphereSphereCollisionDescription
///point A and pointB are witness points, and normalOnB points from sphere B to sphere A
inline int btComputeSphereSphereCollision(const btSphereSphereCollisionDescription& input, btDistanceInfo* distInfo)
{
btVector3 diff = input.m_sphereTransformA.getOrigin() - input.m_sphereTransformB.getOrigin();
btScalar len = diff.length();
btScalar radiusA = input.m_radiusA;
btScalar radiusB = input.m_radiusB;
btVector3 diff = input.m_sphereTransformA.getOrigin()- input.m_sphereTransformB.getOrigin();
btScalar len = diff.length();
btScalar radiusA = input.m_radiusA;
btScalar radiusB = input.m_radiusB;
///distance (negative means penetration)
btScalar dist = len - (radiusA+radiusB);
btVector3 normalOnSurfaceB(1,0,0);
if (len > SIMD_EPSILON)
{
normalOnSurfaceB = diff / len;
}
distInfo->m_distance = dist;
distInfo->m_normalBtoA = normalOnSurfaceB;
distInfo->m_pointOnA = input.m_sphereTransformA.getOrigin()-input.m_radiusA*normalOnSurfaceB;
distInfo->m_pointOnB = input.m_sphereTransformB.getOrigin()+input.m_radiusB*normalOnSurfaceB;
return 0;//sphere-sphere cannot fail
///distance (negative means penetration)
btScalar dist = len - (radiusA + radiusB);
btVector3 normalOnSurfaceB(1, 0, 0);
if (len > SIMD_EPSILON)
{
normalOnSurfaceB = diff / len;
}
distInfo->m_distance = dist;
distInfo->m_normalBtoA = normalOnSurfaceB;
distInfo->m_pointOnA = input.m_sphereTransformA.getOrigin() - input.m_radiusA * normalOnSurfaceB;
distInfo->m_pointOnB = input.m_sphereTransformB.getOrigin() + input.m_radiusB * normalOnSurfaceB;
return 0; //sphere-sphere cannot fail
}
#endif //SPHERE_SPHERE_COLLISION_H
#endif //SPHERE_SPHERE_COLLISION_H