mewin/glm
1
0
Fork 0
Code Releases Activity

Fix squered typo

Browse Source 
Squered -> Squared
This commit is contained in:
Nick Dumas
2021-02-16 09:56:30 +08:00
parent 6347f62261
commit 2fc22e3f3e
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtx/intersect.hpp
View File

@@ -66,7 +66,7 @@ namespace glm
template<typename genType>
GLM_FUNC_DECL bool intersectRaySphere(
genType const& rayStarting, genType const& rayNormalizedDirection,
genType const& sphereCenter, typename genType::value_type const sphereRadiusSquered,
genType const& sphereCenter, typename genType::value_type const sphereRadiusSquared,
typename genType::value_type & intersectionDistance);
//! Compute the intersection of a ray and a sphere.

6
glm/gtx/intersect.inl
View File

@@ -135,7 +135,7 @@ namespace glm
GLM_FUNC_QUALIFIER bool intersectRaySphere
(
genType const& rayStarting, genType const& rayNormalizedDirection,
genType const& sphereCenter, const typename genType::value_type sphereRadiusSquered,
genType const& sphereCenter, const typename genType::value_type sphereRadiusSquared,
typename genType::value_type & intersectionDistance
)
{
@@ -143,11 +143,11 @@ namespace glm
genType diff = sphereCenter - rayStarting;
typename genType::value_type t0 = dot(diff, rayNormalizedDirection);
typename genType::value_type dSquared = dot(diff, diff) - t0 * t0;
if( dSquared > sphereRadiusSquered )
if( dSquared > sphereRadiusSquared )
{
return false;
}
typename genType::value_type t1 = sqrt( sphereRadiusSquered - dSquared );
typename genType::value_type t1 = sqrt( sphereRadiusSquared - dSquared );
intersectionDistance = t0 > t1 + Epsilon ? t0 - t1 : t0 + t1;
return intersectionDistance > Epsilon;
}