Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01: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:27:58 -07:00
parent 001c92416b
commit e6e5224647
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -653,8 +653,7 @@ glm::quat KinectPlugin::QMAL(glm::quat q)
{
if (glm::dot(_q_barL, q) < 0) {
_q_barL = (1 - _deltaL) * _q_barL + -_deltaL * q;
}
else {
} else {
_q_barL = (1 - _deltaL) * _q_barL + _deltaL * q;
}
@ -670,15 +669,14 @@ glm::quat KinectPlugin::QMAL(glm::quat q)
glm::quat KinectPlugin::QMAR(glm::quat q)
{
if (glm::dot(_q_barR, q) < 0){
_q_barR = (1 - _deltaR)*_q_barR + -_deltaR*q;
}
else {
_q_barR = (1 - _deltaR)*_q_barR + _deltaR*q;
if (glm::dot(_q_barR, q) < 0) {
_q_barR = (1 - _deltaR) * _q_barR + -_deltaR*q;
} else {
_q_barR = (1 - _deltaR) * _q_barR + _deltaR * q;
}
_q_barR = glm::normalize(_q_barR);
_q_barR = -_q_barR;
_q_barR = -_q_barR;
if (_debug)
{

16
plugins/hifiKinect/src/KinectPlugin.h
View file

@ -16,12 +16,6 @@
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#endif
// glm files
#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>
// Windows Header Files
#include <windows.h>
@ -65,12 +59,12 @@ public:
virtual void loadSettings() override;
private:
// add variables for moving average
// add variables for moving average
glm::quat _q_barL;
glm::quat _q_barR;
float _deltaL = (float)0.5;
float _deltaR = (float)0.5;
glm::quat _q_barL;
glm::quat _q_barR;
float _deltaL = 0.5f;
float _deltaR = 0.5f;
protected: