lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

spelling: squared

Browse Source 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref
2023-01-18 08:35:02 -05:00
parent eab8cfa373
commit 50e9709950
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/glm/gtx/intersect.hpp
View File

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

6
includes/glm/gtx/intersect.inl
View File

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