Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix broken build for using unititialized const float

Browse source
This commit is contained in:
Andrew Meadows 2014-08-27 12:21:15 -07:00
parent f1ae0ce992
commit 921c8cfec3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/shared/src/ShapeCollider.cpp
View file

@ -624,6 +624,8 @@ glm::vec3 cubeNormals[3] = { glm::vec3(1.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f,
// hence the first pair is (1, 2) because the OTHER faces for xFace are (yFace, zFace) = (1, 2)
int wallIndices[] = { 1, 2, 0, 2, 0, 1 };
const float INV_SQRT_TWO = 1.0f / SQUARE_ROOT_OF_2;
bool capsuleVsAACube(const Shape* shapeA, const Shape* shapeB, CollisionList& collisions) {
const CapsuleShape* capsuleA = static_cast<const CapsuleShape*>(shapeA);
const AACubeShape* cubeB = static_cast<const AACubeShape*>(shapeB);
@ -699,7 +701,7 @@ bool capsuleVsAACube(const Shape* shapeA, const Shape* shapeB, CollisionList& co
if (depth > 0.0f) {
if (depth < capsuleRadius) {
// need to recast against the diagonal plane: wall rotated away from the face
glm::vec3 diagonalNormal = INV_SQUARE_ROOT_OF_2 * (wallNormal - faceNormal);
glm::vec3 diagonalNormal = INV_SQRT_TWO * (wallNormal - faceNormal);
distances[i] = glm::min(glm::dot(capsuleStart, diagonalNormal), 0.0f);
} else {
// capsule misses this wall by more than capsuleRadius