Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 20:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify isEqual computation for vectors used in Rig

Browse source
This commit is contained in:
Anthony Thibault 2019-02-05 15:06:29 -08:00
parent 569bef50fd
commit d8644a2745
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/animation/src/Rig.cpp
View file

@ -39,14 +39,13 @@ static int nextRigId = 1;
static std::map<int, Rig*> rigRegistry; static std::map<int, Rig*> rigRegistry;
static std::mutex rigRegistryMutex; static std::mutex rigRegistryMutex;
static bool isEqual(const float p, float q) {
const float EPSILON = 0.00001f;
return fabsf(p - q) <= EPSILON;
}
static bool isEqual(const glm::vec3& u, const glm::vec3& v) { static bool isEqual(const glm::vec3& u, const glm::vec3& v) {
const float EPSILON = 0.0001f; return isEqual(u.x, v.x) && isEqual(u.y, v.y) && isEqual(u.z, v.z);
float uLen = glm::length(u);
if (uLen == 0.0f) {
return glm::length(v) <= EPSILON;
} else {
return (glm::length(u - v) / uLen) <= EPSILON;
}
} }
static bool isEqual(const glm::quat& p, const glm::quat& q) { static bool isEqual(const glm::quat& p, const glm::quat& q) {
@ -54,11 +53,6 @@ static bool isEqual(const glm::quat& p, const glm::quat& q) {
return 1.0f - fabsf(glm::dot(p, q)) <= EPSILON; return 1.0f - fabsf(glm::dot(p, q)) <= EPSILON;
} }
static bool isEqual(const float p, float q) {
const float EPSILON = 0.00001f;
return fabsf(p - q) <= EPSILON;
}
#define ASSERT(cond) assert(cond) #define ASSERT(cond) assert(cond)
// 2 meter tall dude // 2 meter tall dude