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

removed some cruft

Browse source
This commit is contained in:
amantley 2018-10-15 18:12:27 -07:00
parent 49b869c5e3
commit 7d7fe8c089
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -510,6 +510,7 @@ void MyAvatar::update(float deltaTime) {
setCurrentStandingHeight(computeStandingHeightMode(newHeightReading)); setCurrentStandingHeight(computeStandingHeightMode(newHeightReading));
setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD))); setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD)));
} }
float averageSensorSpaceHeight = _sumUserHeightSensorSpace / _averageUserHeightCount;
// if the spine is straight and the head is below the default position by 5 cm then increment squatty count. // if the spine is straight and the head is below the default position by 5 cm then increment squatty count.
const float SQUAT_THRESHOLD = 0.05f; const float SQUAT_THRESHOLD = 0.05f;
@ -526,12 +527,6 @@ void MyAvatar::update(float deltaTime) {
_squatCount = 0; _squatCount = 0;
} }
float averageSensorSpaceHeight = _sumUserHeightSensorSpace / _averageUserHeightCount;
glm::vec3 avatarHips = getAbsoluteJointTranslationInObjectFrame(getJointIndex("Hips"));
glm::vec3 worldHips = transformPoint(getTransform().getMatrix(), avatarHips);
glm::vec3 sensorHips = transformPoint(glm::inverse(getSensorToWorldMatrix()), worldHips);
glm::vec3 headUp = newHeightReading.getRotation() * glm::vec3(0.0f, 1.0f, 0.0f); glm::vec3 headUp = newHeightReading.getRotation() * glm::vec3(0.0f, 1.0f, 0.0f);
if (glm::length(headUp) > 0.0f) { if (glm::length(headUp) > 0.0f) {
headUp = glm::normalize(headUp); headUp = glm::normalize(headUp);