mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-22 08:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1091 from yknishidate/bugfix

Browse Source 
Fix tengant typo #1091
This commit is contained in:
Christophe 2022-04-20 12:27:40 +02:00 committed by GitHub
commit f08ee17957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glm/gtx/intersect.inl
View File

@ -114,19 +114,19 @@ namespace glm
return false; return false;
typename genType::value_type inv_det = typename genType::value_type(1) / det; typename genType::value_type inv_det = typename genType::value_type(1) / det;
genType Tengant = orig - vert0; genType Tangent = orig - vert0;
position.y = dot(Tengant, Perpendicular) * inv_det; position.y = dot(Tangent, Perpendicular) * inv_det;
if (position.y < typename genType::value_type(0) || position.y > typename genType::value_type(1)) if (position.y < typename genType::value_type(0) || position.y > typename genType::value_type(1))
return false; return false;
genType Cotengant = cross(Tengant, edge1); genType Cotangent = cross(Tangent, edge1);
position.z = dot(dir, Cotengant) * inv_det; position.z = dot(dir, Cotangent) * inv_det;
if (position.z < typename genType::value_type(0) || position.y + position.z > typename genType::value_type(1)) if (position.z < typename genType::value_type(0) || position.y + position.z > typename genType::value_type(1))
return false; return false;
position.x = dot(edge2, Cotengant) * inv_det; position.x = dot(edge2, Cotangent) * inv_det;
return true; return true;
} }