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

clean ups - coding standard

Browse source
This commit is contained in:
Al Bernstein 2017-04-06 11:23:33 -07:00
parent 4a17112478
commit 001c92416b
1 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
plugins/hifiKinect/src/KinectPlugin.cpp
View file

@ -248,7 +248,6 @@ void KinectPlugin::init() {
auto preference = new CheckPreference(KINECT_PLUGIN, "Extra Debugging", debugGetter, debugSetter); auto preference = new CheckPreference(KINECT_PLUGIN, "Extra Debugging", debugGetter, debugSetter);
preferences->addPreference(preference); preferences->addPreference(preference);
} }
} }
bool KinectPlugin::isSupported() const { bool KinectPlugin::isSupported() const {
@ -652,14 +651,14 @@ void KinectPlugin::InputDevice::clearState() {
glm::quat KinectPlugin::QMAL(glm::quat q) glm::quat KinectPlugin::QMAL(glm::quat q)
{ {
if (glm::dot(_q_barL, q) < 0) if (glm::dot(_q_barL, q) < 0) {
_q_barL = (1 - _deltaL)*_q_barL + -_deltaL*q; _q_barL = (1 - _deltaL) * _q_barL + -_deltaL * q;
else }
_q_barL = (1 - _deltaL)*_q_barL + _deltaL*q; else {
_q_barL = (1 - _deltaL) * _q_barL + _deltaL * q;
}
_q_barL = glm::normalize(_q_barL); _q_barL = glm::normalize(_q_barL);
if (_debug) if (_debug)
{ {
qDebug() << __FUNCTION__ << "q = " << q.x << "," << q.y << "," << q.z << "," << q.w; qDebug() << __FUNCTION__ << "q = " << q.x << "," << q.y << "," << q.z << "," << q.w;
@ -671,14 +670,14 @@ glm::quat KinectPlugin::QMAL(glm::quat q)
glm::quat KinectPlugin::QMAR(glm::quat q) glm::quat KinectPlugin::QMAR(glm::quat q)
{ {
if (glm::dot(_q_barR, q) < 0) if (glm::dot(_q_barR, q) < 0){
_q_barR = (1 - _deltaR)*_q_barR + -_deltaR*q; _q_barR = (1 - _deltaR)*_q_barR + -_deltaR*q;
else }
else {
_q_barR = (1 - _deltaR)*_q_barR + _deltaR*q; _q_barR = (1 - _deltaR)*_q_barR + _deltaR*q;
}
_q_barR = glm::normalize(_q_barR); _q_barR = glm::normalize(_q_barR);
_q_barR = -_q_barR; _q_barR = -_q_barR;
if (_debug) if (_debug)