Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 20:54:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6942 from ctrlaltdavid/20792

Browse source 
Fix Quat.equal()
This commit is contained in:
Anthony Thibault 2016-01-26 11:28:23 -08:00
commit 81b04f2e75
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/script-engine/src/Quat.cpp
View file

@ -113,11 +113,11 @@ float Quat::dot(const glm::quat& q1, const glm::quat& q2) {
return glm::dot(q1, q2);
}
void Quat::print(const QString& lable, const glm::quat& q) {
qCDebug(scriptengine) << qPrintable(lable) << q.x << "," << q.y << "," << q.z << "," << q.w;
void Quat::print(const QString& label, const glm::quat& q) {
qCDebug(scriptengine) << qPrintable(label) << q.x << "," << q.y << "," << q.z << "," << q.w;
}
bool Quat::equal(const glm::vec3& q1, const glm::vec3& q2) {
bool Quat::equal(const glm::quat& q1, const glm::quat& q2) {
return q1 == q2;
}

4
libraries/script-engine/src/Quat.h
View file

@ -46,8 +46,8 @@ public slots:
glm::quat slerp(const glm::quat& q1, const glm::quat& q2, float alpha);
glm::quat squad(const glm::quat& q1, const glm::quat& q2, const glm::quat& s1, const glm::quat& s2, float h);
float dot(const glm::quat& q1, const glm::quat& q2);
void print(const QString& lable, const glm::quat& q);
bool equal(const glm::vec3& q1, const glm::vec3& q2);
void print(const QString& label, const glm::quat& q);
bool equal(const glm::quat& q1, const glm::quat& q2);
};
#endif // hifi_Quat_h