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

simplify to just changing timescales

Browse source
This commit is contained in:
David Back 2018-02-23 15:00:23 -08:00
parent ba0ba96d81
commit a418129bea
2 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1626,7 +1626,6 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act
void MyAvatar::updateMotors() { void MyAvatar::updateMotors() {
_characterController.clearMotors(); _characterController.clearMotors();
glm::quat motorRotation; glm::quat motorRotation;
glm::quat avatarOrientation = getWorldOrientation();
const float FLYING_MOTOR_TIMESCALE = 0.05f; const float FLYING_MOTOR_TIMESCALE = 0.05f;
const float WALKING_MOTOR_TIMESCALE = 0.2f; const float WALKING_MOTOR_TIMESCALE = 0.2f;
@ -1654,10 +1653,11 @@ void MyAvatar::updateMotors() {
// we decompose camera's rotation and store the twist part in motorRotation // we decompose camera's rotation and store the twist part in motorRotation
// however, we need to perform the decomposition in the avatar-frame // however, we need to perform the decomposition in the avatar-frame
// using the local UP axis and then transform back into world-frame // using the local UP axis and then transform back into world-frame
glm::quat headOrientation = glm::inverse(avatarOrientation) * getMyHead()->getHeadOrientation(); // avatar-frame glm::quat orientation = getWorldOrientation();
glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame
glm::quat liftRotation; glm::quat liftRotation;
swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation); swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation);
motorRotation = avatarOrientation * motorRotation; motorRotation = orientation * motorRotation;
} }
if (_isPushing || _isBraking || !_isBeingPushed) { if (_isPushing || _isBraking || !_isBeingPushed) {
@ -1669,35 +1669,21 @@ void MyAvatar::updateMotors() {
} }
} }
if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) { if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) {
if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
}
else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
motorRotation = getWorldOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
}
else {
// world-frame
motorRotation = glm::quat();
}
if (_scriptedMotorMode == SCRIPTED_MOTOR_SIMPLE_MODE) { if (_scriptedMotorMode == SCRIPTED_MOTOR_SIMPLE_MODE) {
if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
}
else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
motorRotation = avatarOrientation * glm::angleAxis(PI, Vectors::UNIT_Y);
}
else {
// world-frame
motorRotation = glm::quat();
}
_characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale); _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale);
} else { } else {
// dynamic mode // dynamic mode
glm::vec3 avatarFrameVelocity; _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale);
if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
// convert camera frame velocity to avatar frame
glm::quat cameraOrientation = qApp->getCamera().getOrientation();
avatarFrameVelocity = glm::inverse(avatarOrientation) * cameraOrientation * _scriptedMotorVelocity;
} else if (_scriptedMotorFrame == SCRIPTED_MOTOR_WORLD_FRAME) {
// convert world frame velocity to avatar frame
avatarFrameVelocity = glm::inverse(avatarOrientation) * _scriptedMotorVelocity;
} else {
// avatar frame
avatarFrameVelocity = _scriptedMotorVelocity;
}
// dynamic mode for scripted motor uses avatar frame and piggybacks off of the default action motor's timescales
motorRotation = avatarOrientation * glm::angleAxis(PI, Vectors::UNIT_Y);
_characterController.addMotor(avatarFrameVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale);
} }
} }

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

@ -69,7 +69,7 @@ class MyAvatar : public Avatar {
* @property motorTimescale {float} Specifies how quickly the avatar should accelerate to meet the motorVelocity, * @property motorTimescale {float} Specifies how quickly the avatar should accelerate to meet the motorVelocity,
* smaller values will result in higher acceleration. * smaller values will result in higher acceleration.
* @property motorReferenceFrame {string} Reference frame of the motorVelocity, must be one of the following: "avatar", "camera", "world" * @property motorReferenceFrame {string} Reference frame of the motorVelocity, must be one of the following: "avatar", "camera", "world"
* @property motorMode {string} Type of scripted motor behavior, "simple" = unmodified legacy behavior and "dynamic" = same as default motor * @property motorMode {string} Type of scripted motor behavior, "simple" = use motorTimescale property (default mode) and "dynamic" = use action motor's timescales
* @property collisionSoundURL {string} Specifies the sound to play when the avatar experiences a collision. * @property collisionSoundURL {string} Specifies the sound to play when the avatar experiences a collision.
* You can provide a mono or stereo 16-bit WAV file running at either 24 Khz or 48 Khz. * You can provide a mono or stereo 16-bit WAV file running at either 24 Khz or 48 Khz.
* The latter is downsampled by the audio mixer, so all audio effectively plays back at a 24 Khz sample rate. * The latter is downsampled by the audio mixer, so all audio effectively plays back at a 24 Khz sample rate.
@ -668,7 +668,7 @@ private:
void setScriptedMotorVelocity(const glm::vec3& velocity); void setScriptedMotorVelocity(const glm::vec3& velocity);
void setScriptedMotorTimescale(float timescale); void setScriptedMotorTimescale(float timescale);
void setScriptedMotorFrame(QString frame); void setScriptedMotorFrame(QString frame);
void setScriptedMotorMode(QString frame); void setScriptedMotorMode(QString mode);
virtual void attach(const QString& modelURL, const QString& jointName = QString(), virtual void attach(const QString& modelURL, const QString& jointName = QString(),
const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(), const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(),
float scale = 1.0f, bool isSoft = false, float scale = 1.0f, bool isSoft = false,