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

Basic controller-relative (non-leveled) locomotion working.

Browse source
This commit is contained in:
r3tk0n 2019-01-18 14:35:26 -08:00
parent 0c20107203
commit 79ff0a5b65
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2525,6 +2525,12 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act
}
}
quat MyAvatar::getDominantHandRotation() const {
auto hand = (getDominantHand() == DOMINANT_RIGHT_HAND) ? controller::Action::RIGHT_HAND : controller::Action::LEFT_HAND;
auto pose = getControllerPoseInAvatarFrame(hand);
return pose.rotation;
}
void MyAvatar::updateMotors() {
_characterController.clearMotors();
glm::quat motorRotation;
@ -3291,10 +3297,24 @@ void MyAvatar::updateActionMotor(float deltaTime) {
// compute action input
// Determine if we're head or controller relative...
glm::vec3 forward = (getDriveKey(TRANSLATE_Z)) * IDENTITY_FORWARD;
glm::vec3 right = (getDriveKey(TRANSLATE_X)) * IDENTITY_RIGHT;
glm::vec3 forward, right;
if (getHandRelativeMovement()) {
// Here we have to get the rotation of the dominant hand and apply that to the direction vector.
// If we're on the right hand, we have to flip the x-axis.
auto handRotation = getDominantHandRotation();
glm::vec3 controllerForward(0.0f, 1.0f, 0.0f);
glm::vec3 controllerRight((getDominantHand() == DOMINANT_RIGHT_HAND ? -1.0f : 1.0f), 0.0f, 0.0f);
forward = (getDriveKey(TRANSLATE_Z)) * (handRotation * controllerForward);
right = (getDriveKey(TRANSLATE_X)) * (handRotation * controllerRight);
}
else {
forward = (getDriveKey(TRANSLATE_Z)) * IDENTITY_FORWARD;
right = (getDriveKey(TRANSLATE_X)) * IDENTITY_RIGHT;
}
glm::vec3 direction = forward + right;
// RKNOTE: This may need to be changed later...
if (state == CharacterController::State::Hover ||
_characterController.computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS) {
glm::vec3 up = (getDriveKey(TRANSLATE_Y)) * IDENTITY_UP;

1
interface/src/avatar/MyAvatar.h
View file

@ -961,6 +961,7 @@ public:
controller::Pose getControllerPoseInSensorFrame(controller::Action action) const;
controller::Pose getControllerPoseInWorldFrame(controller::Action action) const;
controller::Pose getControllerPoseInAvatarFrame(controller::Action action) const;
quat MyAvatar::getDominantHandRotation() const;
bool hasDriveInput() const;