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

Merge branch 'RC-57' of https://github.com/highfidelity/hifi into wearItButton

Browse source
This commit is contained in:
Zach Fox 2017-10-19 14:37:47 -07:00
commit b3acdfa9d8
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -594,7 +594,9 @@ void MyAvatar::simulate(float deltaTime) {
if (success) { if (success) {
moveOperator.addEntityToMoveList(entity, newCube); moveOperator.addEntityToMoveList(entity, newCube);
} }
if (packetSender) { // send an edit packet to update the entity-server about the queryAABox. If it's an
// avatar-entity, don't.
if (packetSender && !entity->getClientOnly()) {
EntityItemProperties properties = entity->getProperties(); EntityItemProperties properties = entity->getProperties();
properties.setQueryAACubeDirty(); properties.setQueryAACubeDirty();
properties.setLastEdited(now); properties.setLastEdited(now);

4
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -994,10 +994,12 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
glm::mat4 finalMat = glm::inverse(avatarMatrix) * sensorToWorldMatrix; glm::mat4 finalMat = glm::inverse(avatarMatrix) * sensorToWorldMatrix;
return glmExtractRotation(finalMat); return glmExtractRotation(finalMat);
} }
case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX:
case CONTROLLER_LEFTHAND_INDEX: { case CONTROLLER_LEFTHAND_INDEX: {
Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix()); Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix());
return controllerLeftHandTransform.getRotation(); return controllerLeftHandTransform.getRotation();
} }
case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX:
case CONTROLLER_RIGHTHAND_INDEX: { case CONTROLLER_RIGHTHAND_INDEX: {
Transform controllerRightHandTransform = Transform(getControllerRightHandMatrix()); Transform controllerRightHandTransform = Transform(getControllerRightHandMatrix());
return controllerRightHandTransform.getRotation(); return controllerRightHandTransform.getRotation();
@ -1032,10 +1034,12 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
glm::mat4 finalMat = glm::inverse(avatarMatrix) * sensorToWorldMatrix; glm::mat4 finalMat = glm::inverse(avatarMatrix) * sensorToWorldMatrix;
return extractTranslation(finalMat); return extractTranslation(finalMat);
} }
case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX:
case CONTROLLER_LEFTHAND_INDEX: { case CONTROLLER_LEFTHAND_INDEX: {
Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix()); Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix());
return controllerLeftHandTransform.getTranslation(); return controllerLeftHandTransform.getTranslation();
} }
case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX:
case CONTROLLER_RIGHTHAND_INDEX: { case CONTROLLER_RIGHTHAND_INDEX: {
Transform controllerRightHandTransform = Transform(getControllerRightHandMatrix()); Transform controllerRightHandTransform = Transform(getControllerRightHandMatrix());
return controllerRightHandTransform.getTranslation(); return controllerRightHandTransform.getTranslation();