Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 23:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Ubuntu compiler warnings.

Browse source
This commit is contained in:
r3tk0n 2019-02-26 19:16:34 -08:00
parent a093fe5c4f
commit 42b62ff2d5
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/avatar/MyAvatar.cpp
View file

@ -3371,12 +3371,11 @@ glm::vec3 MyAvatar::calculateScaledDirection(){
right = (handRotation * controllerRight);
break;
case MOVEMENT_HAND_RELATIVE_LEVELED:
handRotation = cancelOutRoll(handRotation);
forward = (handRotation * controllerForward);
forward.y = 0.0f;
forward /= forward.length();
//forward = glm::normalize(forward - (glm::dot(forward, Vectors::UNIT_Y) * Vectors::UNIT_Y));
right = (handRotation * controllerRight);
right.y = 0.0f;
right /= right.length();
//right = glm::normalize(right - (glm::dot(right, Vectors::UNIT_Y) * Vectors::UNIT_Y));
break;
case MOVEMENT_HMD_RELATIVE:
default:
@ -3987,7 +3986,7 @@ void MyAvatar::setDriveGear1(float shiftPoint) {
QMetaObject::invokeMethod(this, "setDriveGear1", Q_ARG(float, shiftPoint));
return;
}
if (shiftPoint > 1.0 || shiftPoint < 0) return;
if (shiftPoint > 1.0f || shiftPoint < 0.0f) return;
_driveGear1 = (shiftPoint <= _driveGear2) ? shiftPoint : _driveGear1;
}
@ -4000,7 +3999,7 @@ void MyAvatar::setDriveGear2(float shiftPoint) {
QMetaObject::invokeMethod(this, "setDriveGear2", Q_ARG(float, shiftPoint));
return;
}
if (shiftPoint > 1.0 || shiftPoint < 0) return;
if (shiftPoint > 1.0f || shiftPoint < 0.0f) return;
_driveGear2 = (shiftPoint <= _driveGear3 && shiftPoint >= _driveGear1) ? shiftPoint : _driveGear2;
}
@ -4013,7 +4012,7 @@ void MyAvatar::setDriveGear3(float shiftPoint) {
QMetaObject::invokeMethod(this, "setDriveGear3", Q_ARG(float, shiftPoint));
return;
}
if (shiftPoint > 1.0 || shiftPoint < 0) return;
if (shiftPoint > 1.0f || shiftPoint < 0.0f) return;
_driveGear3 = (shiftPoint <= _driveGear4 && shiftPoint >= _driveGear2) ? shiftPoint : _driveGear3;
}
@ -4026,7 +4025,7 @@ void MyAvatar::setDriveGear4(float shiftPoint) {
QMetaObject::invokeMethod(this, "setDriveGear4", Q_ARG(float, shiftPoint));
return;
}
if (shiftPoint > 1.0 || shiftPoint < 0) return;
if (shiftPoint > 1.0f || shiftPoint < 0.0f) return;
_driveGear4 = (shiftPoint <= _driveGear5 && shiftPoint >= _driveGear3) ? shiftPoint : _driveGear4;
}
@ -4039,7 +4038,7 @@ void MyAvatar::setDriveGear5(float shiftPoint) {
QMetaObject::invokeMethod(this, "setDriveGear5", Q_ARG(float, shiftPoint));
return;
}
if (shiftPoint > 1.0 || shiftPoint < 0) return;
if (shiftPoint > 1.0f || shiftPoint < 0.0f) return;
_driveGear5 = (shiftPoint >= _driveGear4) ? shiftPoint : _driveGear5;
}