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 up for pr

Browse source
This commit is contained in:
amantley 2018-10-01 08:30:51 -07:00
parent fe7c14e5cf
commit 1a0e2c6ea1
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -296,7 +296,6 @@ Rectangle {
text: "OFF"
boxSize: 20
}
// TextStyle9
@ -345,7 +344,7 @@ Rectangle {
boxSize: 20
}
}
ColumnLayout {
id: avatarAnimationLayout
anchors.top: handAndCollisions.bottom

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

@ -485,18 +485,6 @@ void MyAvatar::update(float deltaTime) {
glm::vec3 upHead = transformVectorFast(sensorHeadPoseDebug.getMatrix(), glm::vec3(0.0f, 1.0f, 0.0f));
float acosHead = glm::dot(upHead, glm::vec3(0.0f, 1.0f, 0.0f));
// qCDebug(interfaceapp) << "sensor space head pos " << sensorHeadPoseDebug.getTranslation().y;
if ((acosHead > 0.98f) && !getIsInSittingState() && (sensorHeadPoseDebug.getTranslation().y < -0.5f)) {
//qCDebug(interfaceapp) << "we are going to sitting state because it looks like we should" << sensorHeadPoseDebug.getTranslation().y;
}
if (!_lastFrameHMDMode && qApp->isHMDMode()) {
// we have entered hmd mode, so make the best guess about sitting or standing
if (sensorHeadPoseDebug.getTranslation().y < 1.3f) {
// then we are sitting.
// setIsInSittingState(true);
} else {
// setIsInSittingState(false);
}
}
// put the average hand azimuth into sensor space.
// then mix it with head facing direction to determine rotation recenter