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

Hooked up seated version of aim offset animation

Browse source
This commit is contained in:
Anthony J. Thibault 2019-10-31 16:23:29 -07:00
parent f99bb3ec77
commit 4b34311a0a
3 changed files with 1878 additions and 1682 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/avatar/animations/sitting_idle_aimoffsets.fbx Normal file
View file

Binary file not shown.

3530
interface/resources/avatar/avatar-animation.json
View file

File diff suppressed because it is too large Load diff

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

@ -100,7 +100,7 @@ static const QString USER_RECENTER_MODEL_DISABLE_HMD_LEAN = QStringLiteral("Disa
const QString HEAD_BLEND_DIRECTIONAL_ALPHA_NAME = "lookAroundAlpha"; const QString HEAD_BLEND_DIRECTIONAL_ALPHA_NAME = "lookAroundAlpha";
const QString HEAD_BLEND_LINEAR_ALPHA_NAME = "lookBlendAlpha"; const QString HEAD_BLEND_LINEAR_ALPHA_NAME = "lookBlendAlpha";
const float HEAD_ALPHA_BLENDING = 1.0f; const QString SEATED_HEAD_BLEND_LINEAR_ALPHA_NAME = "seatedLookBlendAlpha";
const QString POINT_REACTION_NAME = "point"; const QString POINT_REACTION_NAME = "point";
const QString POINT_BLEND_DIRECTIONAL_ALPHA_NAME = "pointAroundAlpha"; const QString POINT_BLEND_DIRECTIONAL_ALPHA_NAME = "pointAroundAlpha";
@ -6672,8 +6672,17 @@ glm::vec3 MyAvatar::aimToBlendValues(const glm::vec3& aimVector, const glm::quat
void MyAvatar::resetHeadLookAt() { void MyAvatar::resetHeadLookAt() {
if (_skeletonModel->isLoaded()) { if (_skeletonModel->isLoaded()) {
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, glm::vec3(), if (isSeated()) {
HEAD_BLEND_LINEAR_ALPHA_NAME, HEAD_ALPHA_BLENDING); _skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, glm::vec3(),
HEAD_BLEND_LINEAR_ALPHA_NAME, 0.0f);
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, glm::vec3(),
SEATED_HEAD_BLEND_LINEAR_ALPHA_NAME, 1.0f);
} else {
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, glm::vec3(),
HEAD_BLEND_LINEAR_ALPHA_NAME, 1.0f);
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, glm::vec3(),
SEATED_HEAD_BLEND_LINEAR_ALPHA_NAME, 0.0f);
}
} }
} }
@ -6686,13 +6695,22 @@ void MyAvatar::resetLookAtRotation(const glm::vec3& avatarPosition, const glm::q
resetHeadLookAt(); resetHeadLookAt();
} }
void MyAvatar::updateHeadLookAt(float deltaTime) { void MyAvatar::updateHeadLookAt(float deltaTime) {
if (_skeletonModel->isLoaded()) { if (_skeletonModel->isLoaded()) {
glm::vec3 lookAtTarget = _scriptControlsHeadLookAt ? _lookAtScriptTarget : _lookAtCameraTarget; glm::vec3 lookAtTarget = _scriptControlsHeadLookAt ? _lookAtScriptTarget : _lookAtCameraTarget;
glm::vec3 aimVector = lookAtTarget - getDefaultEyePosition(); glm::vec3 aimVector = lookAtTarget - getDefaultEyePosition();
glm::vec3 lookAtBlend = MyAvatar::aimToBlendValues(aimVector, getWorldOrientation()); glm::vec3 lookAtBlend = MyAvatar::aimToBlendValues(aimVector, getWorldOrientation());
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, lookAtBlend, if (isSeated()) {
HEAD_BLEND_LINEAR_ALPHA_NAME, HEAD_ALPHA_BLENDING); _skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, lookAtBlend,
HEAD_BLEND_LINEAR_ALPHA_NAME, 0.0f);
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, lookAtBlend,
SEATED_HEAD_BLEND_LINEAR_ALPHA_NAME, 1.0f);
} else {
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, lookAtBlend,
HEAD_BLEND_LINEAR_ALPHA_NAME, 1.0f);
_skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, lookAtBlend,
SEATED_HEAD_BLEND_LINEAR_ALPHA_NAME, 0.0f);
}
if (_scriptControlsHeadLookAt) { if (_scriptControlsHeadLookAt) {
_scriptHeadControlTimer += deltaTime; _scriptHeadControlTimer += deltaTime;