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

avatar app changes

Browse source
This commit is contained in:
amantley 2018-09-27 16:59:54 -07:00
parent 52355e53f1
commit 42cb8a7ef0
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -477,7 +477,7 @@ void MyAvatar::update(float deltaTime) {
auto sensorHeadPoseDebug = getControllerPoseInSensorFrame(controller::Action::HEAD);
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;
// 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;
}

1
scripts/system/avatarapp.js
View file

@ -140,6 +140,7 @@ function onCollisionsEnabledChanged(enabled) {
function onSittingEnabledChanged(isSitting) {
if (currentAvatarSettings.sittingEnabled !== isSitting) {
currentAvatarSettings.sittingEnabled = isSitting;
print("emit sitting changed");
sendToQml({ 'method': 'settingChanged', 'name': 'sittingEnabled', 'value': isSitting })
}
}