Merge pull request #711 from elect86/patch-4

Update intersect.hpp #711
master
Christophe ago%!(EXTRA string=7 years) committed by GitHub
commit 129fab1bd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      glm/gtx/intersect.hpp

@ -44,13 +44,13 @@ namespace glm
typename genType::value_type & intersectionDistance); typename genType::value_type & intersectionDistance);
//! Compute the intersection of a ray and a triangle. //! Compute the intersection of a ray and a triangle.
/// Based om Tomas Möller implementation http://fileadmin.cs.lth.se/cs/Personal/Tomas_Akenine-Moller/raytri/ /// Based om Tomas Möller implementation http://fileadmin.cs.lth.se/cs/Personal/Tomas_Akenine-Moller/raytri/
//! From GLM_GTX_intersect extension. //! From GLM_GTX_intersect extension.
template<typename T, qualifier Q> template<typename T, qualifier Q>
GLM_FUNC_DECL bool intersectRayTriangle( GLM_FUNC_DECL bool intersectRayTriangle(
vec<3, T, Q> const& orig, vec<3, T, Q> const& dir, vec<3, T, Q> const& orig, vec<3, T, Q> const& dir,
vec<3, T, Q> const& v0, vec<3, T, Q> const& v1, vec<3, T, Q> const& v2, vec<3, T, Q> const& v0, vec<3, T, Q> const& v1, vec<3, T, Q> const& v2,
vec<3, T, Q>& baryPosition, T& distance); vec<2, T, Q>& baryPosition, T& distance);
//! Compute the intersection of a line and a triangle. //! Compute the intersection of a line and a triangle.
//! From GLM_GTX_intersect extension. //! From GLM_GTX_intersect extension.

Loading…
Cancel
Save