diff --git a/glm/gtx/euler_angles.inl b/glm/gtx/euler_angles.inl index 68c50124..3f13df68 100644 --- a/glm/gtx/euler_angles.inl +++ b/glm/gtx/euler_angles.inl @@ -665,13 +665,13 @@ namespace glm mat<3, 3, T, defaultp> Result; Result[0][0] = c; Result[0][1] = s; - Result[0][2] = 0.0f; + Result[0][2] = T(0.0); Result[1][0] = -s; Result[1][1] = c; - Result[1][2] = 0.0f; - Result[2][0] = 0.0f; - Result[2][1] = 0.0f; - Result[2][2] = 1.0f; + Result[1][2] = T(0.0); + Result[2][0] = T(0.0); + Result[2][1] = T(0.0); + Result[2][2] = T(1.0); return Result; } diff --git a/glm/gtx/fast_exponential.inl b/glm/gtx/fast_exponential.inl index f139e505..5b117424 100644 --- a/glm/gtx/fast_exponential.inl +++ b/glm/gtx/fast_exponential.inl @@ -112,7 +112,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType fastExp2(genType x) { - return fastExp(0.69314718055994530941723212145818f * x); + return fastExp(static_cast(0.69314718055994530941723212145818) * x); } template @@ -125,7 +125,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType fastLog2(genType x) { - return fastLog(x) / 0.69314718055994530941723212145818f; + return fastLog(x) / static_cast(0.69314718055994530941723212145818); } template diff --git a/glm/gtx/intersect.inl b/glm/gtx/intersect.inl index 54ecb4d9..95e81e8b 100644 --- a/glm/gtx/intersect.inl +++ b/glm/gtx/intersect.inl @@ -108,7 +108,7 @@ namespace glm genType Perpendicular = cross(dir, edge2); - float det = dot(edge1, Perpendicular); + typename genType::value_type det = dot(edge1, Perpendicular); if (det > -Epsilon && det < Epsilon) return false;