Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 22:15:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clang warning fixes

Browse source
This commit is contained in:
Anthony J. Thibault 2017-08-28 10:35:03 -07:00
parent 573985c7c9
commit 5230b03f4f
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2806,13 +2806,6 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
glm::mat4 desiredWorldMatrix = myAvatar.getSensorToWorldMatrix() * desiredBodyMatrix; glm::mat4 desiredWorldMatrix = myAvatar.getSensorToWorldMatrix() * desiredBodyMatrix;
glm::mat4 currentWorldMatrix = myAvatar.getSensorToWorldMatrix() * currentBodyMatrix; glm::mat4 currentWorldMatrix = myAvatar.getSensorToWorldMatrix() * currentBodyMatrix;
glm::vec4 RED(1.0f, 0.0f, 0.0f, 1.0f);
glm::vec4 GREEN(0.0f, 1.0f, 0.0f, 1.0f);
glm::vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f);
glm::vec4 WHITE(1.0f, 1.0f, 1.0f, 1.0f);
glm::vec4 desiredColor = glm::dot(Vectors::UNIT_Y, transformVectorFast(desiredBodyMatrix, Vectors::UNIT_Y)) < 0.9912f ? RED : GREEN;
glm::vec4 currentColor = glm::dot(Vectors::UNIT_Y, transformVectorFast(currentBodyMatrix, Vectors::UNIT_Y)) < 0.9912f ? BLUE : WHITE;
AnimPose followWorldPose(currentWorldMatrix); AnimPose followWorldPose(currentWorldMatrix);
// remove scale present from sensorToWorldMatrix // remove scale present from sensorToWorldMatrix