mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-09 13:12:40 +02:00
change x.f to be x.0f as per the coding standard
This commit is contained in:
Andrew Meadows
parent
f46a5dc966
commit
fe42f66cc9
1 changed files with 47 additions and 65 deletions
|
|
@ -23,18 +23,18 @@
|
|||
|
||||
#include "ShapeColliderTests.h"
|
||||
|
||||
const glm::vec3 origin(0.f);
|
||||
static const glm::vec3 xAxis(1.f, 0.f, 0.f);
|
||||
static const glm::vec3 yAxis(0.f, 1.f, 0.f);
|
||||
static const glm::vec3 zAxis(0.f, 0.f, 1.f);
|
||||
const glm::vec3 origin(0.0f);
|
||||
static const glm::vec3 xAxis(1.0f, 0.0f, 0.0f);
|
||||
static const glm::vec3 yAxis(0.0f, 1.0f, 0.0f);
|
||||
static const glm::vec3 zAxis(0.0f, 0.0f, 1.0f);
|
||||
|
||||
void ShapeColliderTests::sphereMissesSphere() {
|
||||
// non-overlapping spheres of unequal size
|
||||
float radiusA = 7.f;
|
||||
float radiusB = 3.f;
|
||||
float radiusA = 7.0f;
|
||||
float radiusB = 3.0f;
|
||||
float alpha = 1.2f;
|
||||
float beta = 1.3f;
|
||||
glm::vec3 offsetDirection = glm::normalize(glm::vec3(1.f, 2.f, 3.f));
|
||||
glm::vec3 offsetDirection = glm::normalize(glm::vec3(1.0f, 2.0f, 3.0f));
|
||||
float offsetDistance = alpha * radiusA + beta * radiusB;
|
||||
|
||||
SphereShape sphereA(radiusA, origin);
|
||||
|
|
@ -77,13 +77,13 @@ void ShapeColliderTests::sphereMissesSphere() {
|
|||
|
||||
void ShapeColliderTests::sphereTouchesSphere() {
|
||||
// overlapping spheres of unequal size
|
||||
float radiusA = 7.f;
|
||||
float radiusB = 3.f;
|
||||
float radiusA = 7.0f;
|
||||
float radiusB = 3.0f;
|
||||
float alpha = 0.2f;
|
||||
float beta = 0.3f;
|
||||
glm::vec3 offsetDirection = glm::normalize(glm::vec3(1.f, 2.f, 3.f));
|
||||
glm::vec3 offsetDirection = glm::normalize(glm::vec3(1.0f, 2.0f, 3.0f));
|
||||
float offsetDistance = alpha * radiusA + beta * radiusB;
|
||||
float expectedPenetrationDistance = (1.f - alpha) * radiusA + (1.f - beta) * radiusB;
|
||||
float expectedPenetrationDistance = (1.0f - alpha) * radiusA + (1.0f - beta) * radiusB;
|
||||
glm::vec3 expectedPenetration = expectedPenetrationDistance * offsetDirection;
|
||||
|
||||
SphereShape sphereA(radiusA, origin);
|
||||
|
|
@ -118,8 +118,7 @@ void ShapeColliderTests::sphereTouchesSphere() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of sphereA
|
||||
|
|
@ -129,8 +128,7 @@ void ShapeColliderTests::sphereTouchesSphere() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -150,8 +148,7 @@ void ShapeColliderTests::sphereTouchesSphere() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of sphereA
|
||||
|
|
@ -161,8 +158,7 @@ void ShapeColliderTests::sphereTouchesSphere() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -181,7 +177,7 @@ void ShapeColliderTests::sphereMissesCapsule() {
|
|||
|
||||
// give the capsule some arbirary transform
|
||||
float angle = 37.8f;
|
||||
glm::vec3 axis = glm::normalize( glm::vec3(-7.f, 2.8f, 9.3f) );
|
||||
glm::vec3 axis = glm::normalize( glm::vec3(-7.0f, 2.8f, 9.3f) );
|
||||
glm::quat rotation = glm::angleAxis(angle, axis);
|
||||
glm::vec3 translation(15.1f, -27.1f, -38.6f);
|
||||
capsuleB.setRotation(rotation);
|
||||
|
|
@ -190,7 +186,7 @@ void ShapeColliderTests::sphereMissesCapsule() {
|
|||
CollisionList collisions(16);
|
||||
|
||||
// walk sphereA along the local yAxis next to, but not touching, capsuleB
|
||||
glm::vec3 localStartPosition(radialOffset, axialOffset, 0.f);
|
||||
glm::vec3 localStartPosition(radialOffset, axialOffset, 0.0f);
|
||||
int numberOfSteps = 10;
|
||||
float delta = 1.3f * (totalRadius + halfHeightB) / (numberOfSteps - 1);
|
||||
for (int i = 0; i < numberOfSteps; ++i) {
|
||||
|
|
@ -224,10 +220,10 @@ void ShapeColliderTests::sphereMissesCapsule() {
|
|||
|
||||
void ShapeColliderTests::sphereTouchesCapsule() {
|
||||
// overlapping sphere and capsule
|
||||
float radiusA = 2.f;
|
||||
float radiusB = 1.f;
|
||||
float radiusA = 2.0f;
|
||||
float radiusB = 1.0f;
|
||||
float totalRadius = radiusA + radiusB;
|
||||
float halfHeightB = 2.f;
|
||||
float halfHeightB = 2.0f;
|
||||
float alpha = 0.5f;
|
||||
float beta = 0.5f;
|
||||
float radialOffset = alpha * radiusA + beta * radiusB;
|
||||
|
|
@ -257,8 +253,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of sphereA
|
||||
|
|
@ -267,8 +262,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
|
||||
// capsuleB collides with sphereA
|
||||
|
|
@ -288,8 +282,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of capsuleB
|
||||
|
|
@ -300,8 +293,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
}
|
||||
{ // sphereA hits end cap at axis
|
||||
|
|
@ -319,13 +311,12 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
|
||||
// penetration points from sphereA into capsuleB
|
||||
CollisionInfo* collision = collisions.getCollision(numCollisions - 1);
|
||||
glm::vec3 expectedPenetration = - ((1.f - alpha) * radiusA + (1.f - beta) * radiusB) * yAxis;
|
||||
glm::vec3 expectedPenetration = - ((1.0f - alpha) * radiusA + (1.0f - beta) * radiusB) * yAxis;
|
||||
float inaccuracy = glm::length(collision->_penetration - expectedPenetration);
|
||||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of sphereA
|
||||
|
|
@ -334,8 +325,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
|
||||
// capsuleB collides with sphereA
|
||||
|
|
@ -350,13 +340,12 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
|
||||
// penetration points from sphereA into capsuleB
|
||||
collision = collisions.getCollision(numCollisions - 1);
|
||||
expectedPenetration = ((1.f - alpha) * radiusA + (1.f - beta) * radiusB) * yAxis;
|
||||
expectedPenetration = ((1.0f - alpha) * radiusA + (1.0f - beta) * radiusB) * yAxis;
|
||||
inaccuracy = glm::length(collision->_penetration - expectedPenetration);
|
||||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of capsuleB
|
||||
|
|
@ -367,8 +356,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
}
|
||||
{ // sphereA hits start cap at axis
|
||||
|
|
@ -386,13 +374,12 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
|
||||
// penetration points from sphereA into capsuleB
|
||||
CollisionInfo* collision = collisions.getCollision(numCollisions - 1);
|
||||
glm::vec3 expectedPenetration = ((1.f - alpha) * radiusA + (1.f - beta) * radiusB) * yAxis;
|
||||
glm::vec3 expectedPenetration = ((1.0f - alpha) * radiusA + (1.0f - beta) * radiusB) * yAxis;
|
||||
float inaccuracy = glm::length(collision->_penetration - expectedPenetration);
|
||||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of sphereA
|
||||
|
|
@ -401,8 +388,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
|
||||
// capsuleB collides with sphereA
|
||||
|
|
@ -417,13 +403,12 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
|
||||
// penetration points from sphereA into capsuleB
|
||||
collision = collisions.getCollision(numCollisions - 1);
|
||||
expectedPenetration = - ((1.f - alpha) * radiusA + (1.f - beta) * radiusB) * yAxis;
|
||||
expectedPenetration = - ((1.0f - alpha) * radiusA + (1.0f - beta) * radiusB) * yAxis;
|
||||
inaccuracy = glm::length(collision->_penetration - expectedPenetration);
|
||||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
// contactPoint is on surface of capsuleB
|
||||
|
|
@ -434,8 +419,7 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
}
|
||||
if (collisions.size() != numCollisions) {
|
||||
|
|
@ -447,10 +431,10 @@ void ShapeColliderTests::sphereTouchesCapsule() {
|
|||
|
||||
void ShapeColliderTests::capsuleMissesCapsule() {
|
||||
// non-overlapping capsules
|
||||
float radiusA = 2.f;
|
||||
float halfHeightA = 3.f;
|
||||
float radiusB = 3.f;
|
||||
float halfHeightB = 4.f;
|
||||
float radiusA = 2.0f;
|
||||
float halfHeightA = 3.0f;
|
||||
float radiusB = 3.0f;
|
||||
float halfHeightB = 4.0f;
|
||||
|
||||
float totalRadius = radiusA + radiusB;
|
||||
float totalHalfLength = totalRadius + halfHeightA + halfHeightB;
|
||||
|
|
@ -516,10 +500,10 @@ void ShapeColliderTests::capsuleMissesCapsule() {
|
|||
|
||||
void ShapeColliderTests::capsuleTouchesCapsule() {
|
||||
// overlapping capsules
|
||||
float radiusA = 2.f;
|
||||
float halfHeightA = 3.f;
|
||||
float radiusB = 3.f;
|
||||
float halfHeightB = 4.f;
|
||||
float radiusA = 2.0f;
|
||||
float halfHeightA = 3.0f;
|
||||
float radiusB = 3.0f;
|
||||
float halfHeightB = 4.0f;
|
||||
|
||||
float totalRadius = radiusA + radiusB;
|
||||
float totalHalfLength = totalRadius + halfHeightA + halfHeightB;
|
||||
|
|
@ -617,8 +601,7 @@ void ShapeColliderTests::capsuleTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad penetration: expected = " << expectedPenetration
|
||||
<< " actual = " << collision->_penetration
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_penetration;
|
||||
}
|
||||
|
||||
glm::vec3 expectedContactPoint = capsuleA.getPosition() + radiusA * xAxis;
|
||||
|
|
@ -626,8 +609,7 @@ void ShapeColliderTests::capsuleTouchesCapsule() {
|
|||
if (fabs(inaccuracy) > EPSILON) {
|
||||
std::cout << __FILE__ << ":" << __LINE__
|
||||
<< " ERROR: bad contactPoint: expected = " << expectedContactPoint
|
||||
<< " actual = " << collision->_contactPoint
|
||||
<< std::endl;
|
||||
<< " actual = " << collision->_contactPoint;
|
||||
}
|
||||
|
||||
// capsuleB vs capsuleA
|
||||
|
|
@ -706,7 +688,7 @@ void ShapeColliderTests::sphereTouchesAACube() {
|
|||
float cubeSide = 2.0f;
|
||||
|
||||
float sphereRadius = 1.0f;
|
||||
glm::vec3 sphereCenter(0.f);
|
||||
glm::vec3 sphereCenter(0.0f);
|
||||
SphereShape sphere(sphereRadius, sphereCenter);
|
||||
|
||||
float sphereOffset = (0.5f * cubeSide + sphereRadius - 0.25f);
|
||||
|
|
|
|||
Loading…
Reference in a new issue