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

Normal fix.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-11-17 18:30:21 -08:00
parent 4308a45028
commit ba50beab91
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/metavoxels/src/Spanner.cpp
View file

@ -2002,6 +2002,9 @@ bool Heightfield::intersects(const glm::vec3& start, const glm::vec3& end, float
}
}
glm::vec3 normalScale(1.0f / (inverseScale.y * inverseScale.z), 1.0f / (inverseScale.x * inverseScale.z),
1.0f / (inverseScale.x * inverseScale.y));
bool withinBounds = true;
float accumulatedDistance = boundsDistance;
while (withinBounds && accumulatedDistance <= 1.0f) {
@ -2081,7 +2084,7 @@ bool Heightfield::intersects(const glm::vec3& start, const glm::vec3& end, float
if (intersection.x >= 0.0f && intersection.x <= 1.0f && intersection.z >= 0.0f && intersection.z <= 1.0f &&
intersection.z >= intersection.x) {
distance = accumulatedDistance + planeDistance;
normal = glm::normalize(getRotation() * (lowerNormal / inverseScale));
normal = glm::normalize(getRotation() * (lowerNormal * normalScale));
return true;
}
}
@ -2095,7 +2098,7 @@ bool Heightfield::intersects(const glm::vec3& start, const glm::vec3& end, float
if (intersection.x >= 0.0f && intersection.x <= 1.0f && intersection.z >= 0.0f && intersection.z <= 1.0f &&
intersection.x >= intersection.z) {
distance = accumulatedDistance + planeDistance;
normal = glm::normalize(getRotation() * (upperNormal / inverseScale));
normal = glm::normalize(getRotation() * (upperNormal * normalScale));
return true;
}
}