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

Revert "Attempt to add acceleration curve." (#23)

Browse source 
This reverts commit 9ea476ea89.
This commit is contained in:
Wayne Chen 2019-04-01 10:47:49 -07:00 committed by Jason Najera
parent 3ac42e69e3
commit 0d83e622ff
2 changed files with 252 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/tablet/ControllerSettings.qml
View file

@ -332,7 +332,7 @@ Item {
anchors.fill: stackView anchors.fill: stackView
id: controllerPrefereneces id: controllerPrefereneces
objectName: "TabletControllerPreferences" objectName: "TabletControllerPreferences"
showCategories: ["VR Movement", "Acceleration Step Function", "Game Controller", "Sixense Controllers", "Perception Neuron", "Leap Motion"] showCategories: ["VR Movement", "Game Controller", "Sixense Controllers", "Perception Neuron", "Leap Motion"]
categoryProperties: { categoryProperties: {
"VR Movement" : { "VR Movement" : {
"User real-world height (meters)" : { "anchors.right" : "undefined" }, "User real-world height (meters)" : { "anchors.right" : "undefined" },

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

@ -202,7 +202,7 @@ MyAvatar::MyAvatar(QThread* thread) :
qApp->loadAvatarScripts(hfmModel.scripts); qApp->loadAvatarScripts(hfmModel.scripts);
_shouldLoadScripts = false; _shouldLoadScripts = false;
} }
// Load and convert old attachments to avatar entities // Load and convert old attachments to avatar entities
if (_oldAttachmentData.size() > 0) { if (_oldAttachmentData.size() > 0) {
setAttachmentData(_oldAttachmentData); setAttachmentData(_oldAttachmentData);
_oldAttachmentData.clear(); _oldAttachmentData.clear();
@ -223,7 +223,7 @@ MyAvatar::MyAvatar(QThread* thread) :
// connect to AddressManager signal for location jumps // connect to AddressManager signal for location jumps
connect(DependencyManager::get<AddressManager>().data(), &AddressManager::locationChangeRequired, connect(DependencyManager::get<AddressManager>().data(), &AddressManager::locationChangeRequired,
this, static_cast<SlotType>(&MyAvatar::goToFeetLocation)); this, static_cast<SlotType>(&MyAvatar::goToFeetLocation));
// handle scale constraints imposed on us by the domain-server // handle scale constraints imposed on us by the domain-server
auto& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler(); auto& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
@ -458,7 +458,7 @@ void MyAvatar::centerBody() {
// derive the desired body orientation from the current hmd orientation, before the sensor reset. // derive the desired body orientation from the current hmd orientation, before the sensor reset.
auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
// transform this body into world space // transform this body into world space
auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix;
auto worldBodyPos = extractTranslation(worldBodyMatrix); auto worldBodyPos = extractTranslation(worldBodyMatrix);
auto worldBodyRot = glmExtractRotation(worldBodyMatrix); auto worldBodyRot = glmExtractRotation(worldBodyMatrix);
@ -511,7 +511,7 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) {
// derive the desired body orientation from the *old* hmd orientation, before the sensor reset. // derive the desired body orientation from the *old* hmd orientation, before the sensor reset.
auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
// transform this body into world space // transform this body into world space
auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix;
auto worldBodyPos = extractTranslation(worldBodyMatrix); auto worldBodyPos = extractTranslation(worldBodyMatrix);
auto worldBodyRot = glmExtractRotation(worldBodyMatrix); auto worldBodyRot = glmExtractRotation(worldBodyMatrix);
@ -760,16 +760,16 @@ void MyAvatar::updateEyeContactTarget(float deltaTime) {
float const FIFTY_FIFTY_CHANCE = 0.5f; float const FIFTY_FIFTY_CHANCE = 0.5f;
float const EYE_TO_MOUTH_CHANCE = 0.25f; float const EYE_TO_MOUTH_CHANCE = 0.25f;
switch (_eyeContactTarget) { switch (_eyeContactTarget) {
case LEFT_EYE: case LEFT_EYE:
_eyeContactTarget = (randFloat() < EYE_TO_MOUTH_CHANCE) ? MOUTH : RIGHT_EYE; _eyeContactTarget = (randFloat() < EYE_TO_MOUTH_CHANCE) ? MOUTH : RIGHT_EYE;
break; break;
case RIGHT_EYE: case RIGHT_EYE:
_eyeContactTarget = (randFloat() < EYE_TO_MOUTH_CHANCE) ? MOUTH : LEFT_EYE; _eyeContactTarget = (randFloat() < EYE_TO_MOUTH_CHANCE) ? MOUTH : LEFT_EYE;
break; break;
case MOUTH: case MOUTH:
default: default:
_eyeContactTarget = (randFloat() < FIFTY_FIFTY_CHANCE) ? RIGHT_EYE : LEFT_EYE; _eyeContactTarget = (randFloat() < FIFTY_FIFTY_CHANCE) ? RIGHT_EYE : LEFT_EYE;
break; break;
} }
const float EYE_TARGET_DELAY_TIME = 0.33f; const float EYE_TARGET_DELAY_TIME = 0.33f;
@ -1075,17 +1075,17 @@ void MyAvatar::updateSensorToWorldMatrix() {
if (_enableDebugDrawSensorToWorldMatrix) { if (_enableDebugDrawSensorToWorldMatrix) {
DebugDraw::getInstance().addMarker("sensorToWorldMatrix", glmExtractRotation(_sensorToWorldMatrix), DebugDraw::getInstance().addMarker("sensorToWorldMatrix", glmExtractRotation(_sensorToWorldMatrix),
extractTranslation(_sensorToWorldMatrix), glm::vec4(1)); extractTranslation(_sensorToWorldMatrix), glm::vec4(1));
} }
_sensorToWorldMatrixCache.set(_sensorToWorldMatrix); _sensorToWorldMatrixCache.set(_sensorToWorldMatrix);
updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache);
updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache);
if (hasSensorToWorldScaleChanged) { if (hasSensorToWorldScaleChanged) {
emit sensorToWorldScaleChanged(sensorToWorldScale); emit sensorToWorldScaleChanged(sensorToWorldScale);
} }
} }
// Update avatar head rotation with sensor data // Update avatar head rotation with sensor data
@ -1111,7 +1111,7 @@ void MyAvatar::updateFromTrackers(float deltaTime) {
const float TRACKER_MIN_YAW_TURN = 15.0f; const float TRACKER_MIN_YAW_TURN = 15.0f;
const float TRACKER_MAX_YAW_TURN = 50.0f; const float TRACKER_MAX_YAW_TURN = 50.0f;
if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) &&
(fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) { (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) {
if (estimatedRotation.y > 0.0f) { if (estimatedRotation.y > 0.0f) {
_bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY; _bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY;
} else { } else {
@ -1200,7 +1200,7 @@ void MyAvatar::render(RenderArgs* renderArgs) {
void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps),
Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame));
return; return;
} }
_skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame); _skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame);
@ -1224,10 +1224,10 @@ QStringList MyAvatar::getAnimationRoles() {
} }
void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop,
float firstFrame, float lastFrame) { float firstFrame, float lastFrame) {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url), QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url),
Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame));
return; return;
} }
_skeletonModel->getRig().overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame); _skeletonModel->getRig().overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame);
@ -1244,8 +1244,8 @@ void MyAvatar::restoreRoleAnimation(const QString& role) {
void MyAvatar::saveAvatarUrl() { void MyAvatar::saveAvatarUrl() {
if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) {
_fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ?
"" : "" :
_fullAvatarURLFromPreferences.toString()); _fullAvatarURLFromPreferences.toString());
} }
} }
@ -1262,10 +1262,10 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) {
uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1;
while (settingsIndex <= maxIndex) { while (settingsIndex <= maxIndex) {
Setting::Handle<QUuid> idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" Setting::Handle<QUuid> idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData"
<< QString::number(settingsIndex) << "id", QUuid()); << QString::number(settingsIndex) << "id", QUuid());
_avatarEntityIDSettings.push_back(idHandle); _avatarEntityIDSettings.push_back(idHandle);
Setting::Handle<QByteArray> dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" Setting::Handle<QByteArray> dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData"
<< QString::number(settingsIndex) << "properties", QByteArray()); << QString::number(settingsIndex) << "properties", QByteArray());
_avatarEntityDataSettings.push_back(dataHandle); _avatarEntityDataSettings.push_back(dataHandle);
settingsIndex++; settingsIndex++;
} }
@ -1285,8 +1285,8 @@ void MyAvatar::saveData() {
// --replaceAvatarURL (so _saveAvatarOverrideUrl is true) // --replaceAvatarURL (so _saveAvatarOverrideUrl is true)
if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) {
_fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ?
"" : "" :
_fullAvatarURLFromPreferences.toString()); _fullAvatarURLFromPreferences.toString());
} }
_fullAvatarModelNameSetting.set(_fullAvatarModelName); _fullAvatarModelNameSetting.set(_fullAvatarModelName);
@ -2022,7 +2022,7 @@ ScriptAvatarData* MyAvatar::getTargetAvatar() const {
} }
static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition, static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition,
bool otherIsTalking, bool lookingAtOtherAlready) { bool otherIsTalking, bool lookingAtOtherAlready) {
const float DISTANCE_FACTOR = 3.14f; const float DISTANCE_FACTOR = 3.14f;
const float MY_ANGLE_FACTOR = 1.0f; const float MY_ANGLE_FACTOR = 1.0f;
const float OTHER_ANGLE_FACTOR = 1.0f; const float OTHER_ANGLE_FACTOR = 1.0f;
@ -2043,10 +2043,10 @@ static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myP
return FLT_MAX; return FLT_MAX;
} else { } else {
return (DISTANCE_FACTOR * distance + return (DISTANCE_FACTOR * distance +
MY_ANGLE_FACTOR * myAngle + MY_ANGLE_FACTOR * myAngle +
OTHER_ANGLE_FACTOR * otherAngle + OTHER_ANGLE_FACTOR * otherAngle +
OTHER_IS_TALKING_TERM + OTHER_IS_TALKING_TERM +
LOOKING_AT_OTHER_ALREADY_TERM); LOOKING_AT_OTHER_ALREADY_TERM);
} }
} }
@ -2094,8 +2094,8 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) {
// Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face. // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face.
glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar.
// The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.) // The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.)
// Let's get everything to world space: // Let's get everything to world space:
glm::vec3 avatarLeftEye = getHead()->getLeftEyePosition(); glm::vec3 avatarLeftEye = getHead()->getLeftEyePosition();
glm::vec3 avatarRightEye = getHead()->getRightEyePosition(); glm::vec3 avatarRightEye = getHead()->getRightEyePosition();
@ -2103,12 +2103,12 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) {
// (We will be adding that offset to the camera position, after making some other adjustments.) // (We will be adding that offset to the camera position, after making some other adjustments.)
glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition(); glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition();
ViewFrustum viewFrustum; ViewFrustum viewFrustum;
qApp->copyViewFrustum(viewFrustum); qApp->copyViewFrustum(viewFrustum);
glm::vec3 viewPosition = viewFrustum.getPosition(); glm::vec3 viewPosition = viewFrustum.getPosition();
#if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA #if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA
viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f;
#endif #endif
// scale gazeOffset by IPD, if wearing an HMD. // scale gazeOffset by IPD, if wearing an HMD.
if (qApp->isHMDMode()) { if (qApp->isHMDMode()) {
@ -2183,121 +2183,121 @@ void MyAvatar::setJointRotations(const QVector<glm::quat>& jointRotations) {
void MyAvatar::setJointData(int index, const glm::quat& rotation, const glm::vec3& translation) { void MyAvatar::setJointData(int index, const glm::quat& rotation, const glm::vec3& translation) {
switch (index) { switch (index) {
case FARGRAB_RIGHTHAND_INDEX: { case FARGRAB_RIGHTHAND_INDEX: {
_farGrabRightMatrixCache.set(createMatFromQuatAndPos(rotation, translation)); _farGrabRightMatrixCache.set(createMatFromQuatAndPos(rotation, translation));
break; break;
} }
case FARGRAB_LEFTHAND_INDEX: { case FARGRAB_LEFTHAND_INDEX: {
_farGrabLeftMatrixCache.set(createMatFromQuatAndPos(rotation, translation)); _farGrabLeftMatrixCache.set(createMatFromQuatAndPos(rotation, translation));
break; break;
} }
case FARGRAB_MOUSE_INDEX: { case FARGRAB_MOUSE_INDEX: {
_farGrabMouseMatrixCache.set(createMatFromQuatAndPos(rotation, translation)); _farGrabMouseMatrixCache.set(createMatFromQuatAndPos(rotation, translation));
break; break;
} }
default: { default: {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setJointData", Q_ARG(int, index), Q_ARG(const glm::quat&, rotation), QMetaObject::invokeMethod(this, "setJointData", Q_ARG(int, index), Q_ARG(const glm::quat&, rotation),
Q_ARG(const glm::vec3&, translation)); Q_ARG(const glm::vec3&, translation));
return; return;
}
// HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
_skeletonModel->getRig().setJointState(index, true, rotation, translation, SCRIPT_PRIORITY);
} }
// HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
_skeletonModel->getRig().setJointState(index, true, rotation, translation, SCRIPT_PRIORITY);
}
} }
} }
void MyAvatar::setJointRotation(int index, const glm::quat& rotation) { void MyAvatar::setJointRotation(int index, const glm::quat& rotation) {
switch (index) { switch (index) {
case FARGRAB_RIGHTHAND_INDEX: { case FARGRAB_RIGHTHAND_INDEX: {
glm::mat4 prevMat = _farGrabRightMatrixCache.get(); glm::mat4 prevMat = _farGrabRightMatrixCache.get();
glm::vec3 previousTranslation = extractTranslation(prevMat); glm::vec3 previousTranslation = extractTranslation(prevMat);
_farGrabRightMatrixCache.set(createMatFromQuatAndPos(rotation, previousTranslation)); _farGrabRightMatrixCache.set(createMatFromQuatAndPos(rotation, previousTranslation));
break; break;
} }
case FARGRAB_LEFTHAND_INDEX: { case FARGRAB_LEFTHAND_INDEX: {
glm::mat4 prevMat = _farGrabLeftMatrixCache.get(); glm::mat4 prevMat = _farGrabLeftMatrixCache.get();
glm::vec3 previousTranslation = extractTranslation(prevMat); glm::vec3 previousTranslation = extractTranslation(prevMat);
_farGrabLeftMatrixCache.set(createMatFromQuatAndPos(rotation, previousTranslation)); _farGrabLeftMatrixCache.set(createMatFromQuatAndPos(rotation, previousTranslation));
break; break;
} }
case FARGRAB_MOUSE_INDEX: { case FARGRAB_MOUSE_INDEX: {
glm::mat4 prevMat = _farGrabMouseMatrixCache.get(); glm::mat4 prevMat = _farGrabMouseMatrixCache.get();
glm::vec3 previousTranslation = extractTranslation(prevMat); glm::vec3 previousTranslation = extractTranslation(prevMat);
_farGrabMouseMatrixCache.set(createMatFromQuatAndPos(rotation, previousTranslation)); _farGrabMouseMatrixCache.set(createMatFromQuatAndPos(rotation, previousTranslation));
break; break;
} }
default: { default: {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(int, index), Q_ARG(const glm::quat&, rotation)); QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(int, index), Q_ARG(const glm::quat&, rotation));
return; return;
}
// HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
_skeletonModel->getRig().setJointRotation(index, true, rotation, SCRIPT_PRIORITY);
} }
// HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
_skeletonModel->getRig().setJointRotation(index, true, rotation, SCRIPT_PRIORITY);
}
} }
} }
void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) { void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) {
switch (index) { switch (index) {
case FARGRAB_RIGHTHAND_INDEX: { case FARGRAB_RIGHTHAND_INDEX: {
glm::mat4 prevMat = _farGrabRightMatrixCache.get(); glm::mat4 prevMat = _farGrabRightMatrixCache.get();
glm::quat previousRotation = extractRotation(prevMat); glm::quat previousRotation = extractRotation(prevMat);
_farGrabRightMatrixCache.set(createMatFromQuatAndPos(previousRotation, translation)); _farGrabRightMatrixCache.set(createMatFromQuatAndPos(previousRotation, translation));
break; break;
} }
case FARGRAB_LEFTHAND_INDEX: { case FARGRAB_LEFTHAND_INDEX: {
glm::mat4 prevMat = _farGrabLeftMatrixCache.get(); glm::mat4 prevMat = _farGrabLeftMatrixCache.get();
glm::quat previousRotation = extractRotation(prevMat); glm::quat previousRotation = extractRotation(prevMat);
_farGrabLeftMatrixCache.set(createMatFromQuatAndPos(previousRotation, translation)); _farGrabLeftMatrixCache.set(createMatFromQuatAndPos(previousRotation, translation));
break; break;
} }
case FARGRAB_MOUSE_INDEX: { case FARGRAB_MOUSE_INDEX: {
glm::mat4 prevMat = _farGrabMouseMatrixCache.get(); glm::mat4 prevMat = _farGrabMouseMatrixCache.get();
glm::quat previousRotation = extractRotation(prevMat); glm::quat previousRotation = extractRotation(prevMat);
_farGrabMouseMatrixCache.set(createMatFromQuatAndPos(previousRotation, translation)); _farGrabMouseMatrixCache.set(createMatFromQuatAndPos(previousRotation, translation));
break; break;
} }
default: { default: {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setJointTranslation", QMetaObject::invokeMethod(this, "setJointTranslation",
Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); Q_ARG(int, index), Q_ARG(const glm::vec3&, translation));
return; return;
}
// HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
_skeletonModel->getRig().setJointTranslation(index, true, translation, SCRIPT_PRIORITY);
} }
// HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
_skeletonModel->getRig().setJointTranslation(index, true, translation, SCRIPT_PRIORITY);
}
} }
} }
void MyAvatar::clearJointData(int index) { void MyAvatar::clearJointData(int index) {
switch (index) { switch (index) {
case FARGRAB_RIGHTHAND_INDEX: { case FARGRAB_RIGHTHAND_INDEX: {
_farGrabRightMatrixCache.invalidate(); _farGrabRightMatrixCache.invalidate();
break; break;
} }
case FARGRAB_LEFTHAND_INDEX: { case FARGRAB_LEFTHAND_INDEX: {
_farGrabLeftMatrixCache.invalidate(); _farGrabLeftMatrixCache.invalidate();
break; break;
} }
case FARGRAB_MOUSE_INDEX: { case FARGRAB_MOUSE_INDEX: {
_farGrabMouseMatrixCache.invalidate(); _farGrabMouseMatrixCache.invalidate();
break; break;
} }
default: { default: {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(int, index)); QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(int, index));
return; return;
}
_skeletonModel->getRig().clearJointAnimationPriority(index);
} }
_skeletonModel->getRig().clearJointAnimationPriority(index);
}
} }
} }
void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation) { void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation) {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setJointData", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation), QMetaObject::invokeMethod(this, "setJointData", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation),
Q_ARG(const glm::vec3&, translation)); Q_ARG(const glm::vec3&, translation));
return; return;
} }
writeLockWithNamedJointIndex(name, [&](int index) { writeLockWithNamedJointIndex(name, [&](int index) {
@ -2383,7 +2383,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
} }
QObject::disconnect(*skeletonConnection); QObject::disconnect(*skeletonConnection);
}); });
saveAvatarUrl(); saveAvatarUrl();
emit skeletonChanged(); emit skeletonChanged();
} }
@ -2432,7 +2432,7 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() {
if (entityTree) { if (entityTree) {
QList<QUuid> avatarEntityIDs; QList<QUuid> avatarEntityIDs;
_avatarEntitiesLock.withReadLock([&] { _avatarEntitiesLock.withReadLock([&] {
avatarEntityIDs = _packedAvatarEntityData.keys(); avatarEntityIDs = _packedAvatarEntityData.keys();
}); });
for (const auto& entityID : avatarEntityIDs) { for (const auto& entityID : avatarEntityIDs) {
auto entity = entityTree->findEntityByID(entityID); auto entity = entityTree->findEntityByID(entityID);
@ -2466,8 +2466,8 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL",
Q_ARG(const QUrl&, fullAvatarURL), Q_ARG(const QUrl&, fullAvatarURL),
Q_ARG(const QString&, modelName)); Q_ARG(const QString&, modelName));
return; return;
} }
@ -2713,7 +2713,7 @@ void MyAvatar::setScriptedMotorTimescale(float timescale) {
// we clamp the timescale on the large side (instead of just the low side) to prevent // we clamp the timescale on the large side (instead of just the low side) to prevent
// obnoxiously large values from introducing NaN into avatar's velocity // obnoxiously large values from introducing NaN into avatar's velocity
_scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE,
DEFAULT_SCRIPTED_MOTOR_TIMESCALE); DEFAULT_SCRIPTED_MOTOR_TIMESCALE);
} }
void MyAvatar::setScriptedMotorFrame(QString frame) { void MyAvatar::setScriptedMotorFrame(QString frame) {
@ -2755,9 +2755,9 @@ SharedSoundPointer MyAvatar::getCollisionSound() {
} }
void MyAvatar::attach(const QString& modelURL, const QString& jointName, void MyAvatar::attach(const QString& modelURL, const QString& jointName,
const glm::vec3& translation, const glm::quat& rotation, const glm::vec3& translation, const glm::quat& rotation,
float scale, bool isSoft, float scale, bool isSoft,
bool allowDuplicates, bool useSaved) { bool allowDuplicates, bool useSaved) {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
BLOCKING_INVOKE_METHOD(this, "attach", BLOCKING_INVOKE_METHOD(this, "attach",
Q_ARG(const QString&, modelURL), Q_ARG(const QString&, modelURL),
@ -2882,7 +2882,7 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) {
bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) {
QList<QUuid> avatarEntityIDs; QList<QUuid> avatarEntityIDs;
_avatarEntitiesLock.withReadLock([&] { _avatarEntitiesLock.withReadLock([&] {
avatarEntityIDs = _packedAvatarEntityData.keys(); avatarEntityIDs = _packedAvatarEntityData.keys();
}); });
for (const auto& entityID : avatarEntityIDs) { for (const auto& entityID : avatarEntityIDs) {
auto props = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(entityID); auto props = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(entityID);
@ -3549,7 +3549,7 @@ void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTim
} }
bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA, bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA,
const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) { const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) {
glm::vec3 positionBA = positionB - positionA; glm::vec3 positionBA = positionB - positionA;
float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z); float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z);
if (xzDistance < (radiusA + radiusB)) { if (xzDistance < (radiusA + radiusB)) {
@ -3692,7 +3692,7 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings
_targetScale = getDomainLimitedScale(); _targetScale = getDomainLimitedScale();
qCDebug(interfaceapp) << "This domain requires a minimum avatar scale of " << _domainMinimumHeight qCDebug(interfaceapp) << "This domain requires a minimum avatar scale of " << _domainMinimumHeight
<< " and a maximum avatar scale of " << _domainMaximumHeight; << " and a maximum avatar scale of " << _domainMaximumHeight;
_isAnimatingScale = true; _isAnimatingScale = true;
@ -3752,15 +3752,15 @@ void MyAvatar::goToLocation(const QVariant& propertiesVar) {
} }
void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, void MyAvatar::goToFeetLocation(const glm::vec3& newPosition,
bool hasOrientation, const glm::quat& newOrientation, bool hasOrientation, const glm::quat& newOrientation,
bool shouldFaceLocation) { bool shouldFaceLocation) {
_goToFeetAjustment = true; _goToFeetAjustment = true;
goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation); goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation);
} }
void MyAvatar::goToLocation(const glm::vec3& newPosition, void MyAvatar::goToLocation(const glm::vec3& newPosition,
bool hasOrientation, const glm::quat& newOrientation, bool hasOrientation, const glm::quat& newOrientation,
bool shouldFaceLocation, bool withSafeLanding) { bool shouldFaceLocation, bool withSafeLanding) {
// Most cases of going to a place or user go through this now. Some possible improvements to think about in the future: // Most cases of going to a place or user go through this now. Some possible improvements to think about in the future:
// - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it // - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it
@ -3784,7 +3784,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition,
_goToOrientation = getWorldOrientation(); _goToOrientation = getWorldOrientation();
if (hasOrientation) { if (hasOrientation) {
qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is "
<< newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w;
// orient the user to face the target // orient the user to face the target
glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation); glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation);
@ -3829,13 +3829,13 @@ bool MyAvatar::safeLanding(const glm::vec3& position) {
} }
if (!getCollisionsEnabled()) { if (!getCollisionsEnabled()) {
goToLocation(better); // recurses on next update goToLocation(better); // recurses on next update
} else { // If you try to go while stuck, physics will keep you stuck. } else { // If you try to go while stuck, physics will keep you stuck.
setCollisionsEnabled(false); setCollisionsEnabled(false);
// Don't goToLocation just yet. Yield so that physics can act on the above. // Don't goToLocation just yet. Yield so that physics can act on the above.
QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick
Q_ARG(glm::vec3, better)); Q_ARG(glm::vec3, better));
} }
return true; return true;
} }
// If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut. // If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut.
@ -4812,27 +4812,27 @@ void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) {
_userRecenterModel.set(modelName); _userRecenterModel.set(modelName);
switch (modelName) { switch (modelName) {
case MyAvatar::SitStandModelType::ForceSit: case MyAvatar::SitStandModelType::ForceSit:
setHMDLeanRecenterEnabled(true); setHMDLeanRecenterEnabled(true);
setIsInSittingState(true); setIsInSittingState(true);
setIsSitStandStateLocked(true); setIsSitStandStateLocked(true);
break; break;
case MyAvatar::SitStandModelType::ForceStand: case MyAvatar::SitStandModelType::ForceStand:
setHMDLeanRecenterEnabled(true); setHMDLeanRecenterEnabled(true);
setIsInSittingState(false); setIsInSittingState(false);
setIsSitStandStateLocked(true); setIsSitStandStateLocked(true);
break; break;
case MyAvatar::SitStandModelType::Auto: case MyAvatar::SitStandModelType::Auto:
default: default:
setHMDLeanRecenterEnabled(true); setHMDLeanRecenterEnabled(true);
setIsInSittingState(false); setIsInSittingState(false);
setIsSitStandStateLocked(false); setIsSitStandStateLocked(false);
break; break;
case MyAvatar::SitStandModelType::DisableHMDLean: case MyAvatar::SitStandModelType::DisableHMDLean:
setHMDLeanRecenterEnabled(false); setHMDLeanRecenterEnabled(false);
setIsInSittingState(false); setIsInSittingState(false);
setIsSitStandStateLocked(false); setIsSitStandStateLocked(false);
break; break;
} }
} }
@ -4960,15 +4960,15 @@ QVector<QString> MyAvatar::getScriptUrls() {
glm::vec3 MyAvatar::getPositionForAudio() { glm::vec3 MyAvatar::getPositionForAudio() {
glm::vec3 result; glm::vec3 result;
switch (_audioListenerMode) { switch (_audioListenerMode) {
case AudioListenerMode::FROM_HEAD: case AudioListenerMode::FROM_HEAD:
result = getHead()->getPosition(); result = getHead()->getPosition();
break; break;
case AudioListenerMode::FROM_CAMERA: case AudioListenerMode::FROM_CAMERA:
result = qApp->getCamera().getPosition(); result = qApp->getCamera().getPosition();
break; break;
case AudioListenerMode::CUSTOM: case AudioListenerMode::CUSTOM:
result = _customListenPosition; result = _customListenPosition;
break; break;
} }
if (isNaN(result)) { if (isNaN(result)) {
@ -4983,15 +4983,15 @@ glm::quat MyAvatar::getOrientationForAudio() {
glm::quat result; glm::quat result;
switch (_audioListenerMode) { switch (_audioListenerMode) {
case AudioListenerMode::FROM_HEAD: case AudioListenerMode::FROM_HEAD:
result = getHead()->getFinalOrientationInWorldFrame(); result = getHead()->getFinalOrientationInWorldFrame();
break; break;
case AudioListenerMode::FROM_CAMERA: case AudioListenerMode::FROM_CAMERA:
result = qApp->getCamera().getOrientation(); result = qApp->getCamera().getOrientation();
break; break;
case AudioListenerMode::CUSTOM: case AudioListenerMode::CUSTOM:
result = _customListenOrientation; result = _customListenOrientation;
break; break;
} }
if (isNaN(result)) { if (isNaN(result)) {
@ -5196,7 +5196,7 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co
} }
void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix,
const glm::mat4& currentBodyMatrix, bool hasDriveInput) { const glm::mat4& currentBodyMatrix, bool hasDriveInput) {
if (myAvatar.getHMDLeanRecenterEnabled() && if (myAvatar.getHMDLeanRecenterEnabled() &&
qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) {
@ -5260,8 +5260,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
followWorldPose.scale() = glm::vec3(1.0f); followWorldPose.scale() = glm::vec3(1.0f);
if (isActive(Rotation)) { if (isActive(Rotation)) {
//use the hmd reading for the hips follow //use the hmd reading for the hips follow
followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix);
} }
if (isActive(Horizontal)) { if (isActive(Horizontal)) {
glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix); glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix);
@ -5292,7 +5292,7 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(MyAvatar& myAvatar, const gl
glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix);
glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix), glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix),
sensorLinearDisplacement + extractTranslation(currentBodyMatrix)); sensorLinearDisplacement + extractTranslation(currentBodyMatrix));
if (myAvatar.getSitStandStateChange()) { if (myAvatar.getSitStandStateChange()) {
myAvatar.setSitStandStateChange(false); myAvatar.setSitStandStateChange(false);
deactivate(Vertical); deactivate(Vertical);
@ -5404,34 +5404,34 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const {
} }
switch (index) { switch (index) {
case CONTROLLER_LEFTHAND_INDEX: { case CONTROLLER_LEFTHAND_INDEX: {
return getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).getRotation(); return getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).getRotation();
} }
case CONTROLLER_RIGHTHAND_INDEX: { case CONTROLLER_RIGHTHAND_INDEX: {
return getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).getRotation(); return getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).getRotation();
} }
case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX: { case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX: {
auto pose = getControllerPoseInSensorFrame(controller::Action::LEFT_HAND); auto pose = getControllerPoseInSensorFrame(controller::Action::LEFT_HAND);
glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation); glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix); glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
return glmExtractRotation(result); return glmExtractRotation(result);
} }
case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX: { case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX: {
auto pose = getControllerPoseInSensorFrame(controller::Action::RIGHT_HAND); auto pose = getControllerPoseInSensorFrame(controller::Action::RIGHT_HAND);
glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation); glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix); glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
return glmExtractRotation(result); return glmExtractRotation(result);
} }
case CAMERA_MATRIX_INDEX: { case CAMERA_MATRIX_INDEX: {
bool success; bool success;
Transform avatarTransform; Transform avatarTransform;
Transform::mult(avatarTransform, getParentTransform(success), getLocalTransform()); Transform::mult(avatarTransform, getParentTransform(success), getLocalTransform());
glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix();
return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform()); return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform());
} }
default: { default: {
return Avatar::getAbsoluteJointRotationInObjectFrame(index); return Avatar::getAbsoluteJointRotationInObjectFrame(index);
} }
} }
} }
@ -5441,34 +5441,34 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
} }
switch (index) { switch (index) {
case CONTROLLER_LEFTHAND_INDEX: { case CONTROLLER_LEFTHAND_INDEX: {
return getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).getTranslation(); return getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).getTranslation();
} }
case CONTROLLER_RIGHTHAND_INDEX: { case CONTROLLER_RIGHTHAND_INDEX: {
return getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).getTranslation(); return getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).getTranslation();
} }
case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX: { case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX: {
auto pose = getControllerPoseInSensorFrame(controller::Action::LEFT_HAND); auto pose = getControllerPoseInSensorFrame(controller::Action::LEFT_HAND);
glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation); glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix); glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
return extractTranslation(result); return extractTranslation(result);
} }
case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX: { case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX: {
auto pose = getControllerPoseInSensorFrame(controller::Action::RIGHT_HAND); auto pose = getControllerPoseInSensorFrame(controller::Action::RIGHT_HAND);
glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation); glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix); glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
return extractTranslation(result); return extractTranslation(result);
} }
case CAMERA_MATRIX_INDEX: { case CAMERA_MATRIX_INDEX: {
bool success; bool success;
Transform avatarTransform; Transform avatarTransform;
Transform::mult(avatarTransform, getParentTransform(success), getLocalTransform()); Transform::mult(avatarTransform, getParentTransform(success), getLocalTransform());
glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix();
return extractTranslation(invAvatarMat * qApp->getCamera().getTransform()); return extractTranslation(invAvatarMat * qApp->getCamera().getTransform());
} }
default: { default: {
return Avatar::getAbsoluteJointTranslationInObjectFrame(index); return Avatar::getAbsoluteJointTranslationInObjectFrame(index);
} }
} }
} }
@ -5688,7 +5688,7 @@ SpatialParentTree* MyAvatar::getParentTree() const {
} }
const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex,
glm::vec3 positionalOffset, glm::quat rotationalOffset) { glm::vec3 positionalOffset, glm::quat rotationalOffset) {
auto grabID = QUuid::createUuid(); auto grabID = QUuid::createUuid();
// create a temporary grab object to get grabData // create a temporary grab object to get grabData
@ -5699,14 +5699,14 @@ const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex,
parentJointIndex == getJointIndex("RightHand")) { parentJointIndex == getJointIndex("RightHand")) {
hand = "right"; hand = "right";
} else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX ||
parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX ||
parentJointIndex == FARGRAB_LEFTHAND_INDEX || parentJointIndex == FARGRAB_LEFTHAND_INDEX ||
parentJointIndex == getJointIndex("LeftHand")) { parentJointIndex == getJointIndex("LeftHand")) {
hand = "left"; hand = "left";
} }
Grab tmpGrab(DependencyManager::get<NodeList>()->getSessionUUID(), Grab tmpGrab(DependencyManager::get<NodeList>()->getSessionUUID(),
targetID, parentJointIndex, hand, positionalOffset, rotationalOffset); targetID, parentJointIndex, hand, positionalOffset, rotationalOffset);
QByteArray grabData = tmpGrab.toByteArray(); QByteArray grabData = tmpGrab.toByteArray();
bool dataChanged = updateAvatarGrabData(grabID, grabData); bool dataChanged = updateAvatarGrabData(grabID, grabData);