Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 00:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix case where v not normalizable

Browse source
This commit is contained in:
bwent 2015-07-21 10:50:56 -07:00
parent 30d4b9f635
commit d688e5f915
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/script-engine/src/Vec3.cpp
View file

@ -76,7 +76,12 @@ bool Vec3::equal(const glm::vec3& v1, const glm::vec3& v2) {
} }
glm::vec3 Vec3::toPolar(const glm::vec3& v) { glm::vec3 Vec3::toPolar(const glm::vec3& v) {
glm::vec3 u = normalize(v); float radius = length(v);
if (glm::abs(radius) < EPSILON) {
return glm::vec3(0.0f, 0.0f, 0.0f);
}
glm::vec3 u = v / radius;
float azimuth, elevation; float azimuth, elevation;
azimuth = glm::asin(-u.y); azimuth = glm::asin(-u.y);
@ -109,7 +114,7 @@ glm::vec3 Vec3::fromPolar(const glm::vec3& polar) {
z = 0.0f; z = 0.0f;
} }
return multiply(polar.z, glm::vec3(x, y, z)); return polar.z * glm::vec3(x, y, z);
} }
glm::vec3 Vec3::fromPolar(float azimuth, float elevation) { glm::vec3 Vec3::fromPolar(float azimuth, float elevation) {