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

code cleanup

Browse source
This commit is contained in:
Anthony J. Thibault 2017-04-24 17:04:16 -07:00
parent 8b16a7c7e1
commit 937f308ba8
2 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -465,6 +465,10 @@ public:
void removeHoldAction(AvatarActionHold* holdAction); // thread-safe
void updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose& postUpdatePose);
// derive avatar body position and orientation from the current HMD Sensor location.
// results are in HMD frame
glm::mat4 deriveBodyFromHMDSensor() const;
public slots:
void increaseSize();
void decreaseSize();
@ -553,11 +557,6 @@ private:
void setVisibleInSceneIfReady(Model* model, render::ScenePointer scene, bool visiblity);
// AJT: FIX ME... reorder this
public:
// derive avatar body position and orientation from the current HMD Sensor location.
// results are in HMD frame
glm::mat4 deriveBodyFromHMDSensor() const;
private:
virtual void updatePalms() override {}

16
libraries/animation/src/AnimInverseKinematics.cpp
View file

@ -828,14 +828,7 @@ void AnimInverseKinematics::initConstraints() {
const float MAX_SPINE_TWIST = PI / 20.0f;
stConstraint->setTwistLimits(-MAX_SPINE_TWIST, MAX_SPINE_TWIST);
/*
std::vector<float> minDots;
const float MAX_SPINE_SWING = PI / 10.0f;
minDots.push_back(cosf(MAX_SPINE_SWING));
stConstraint->setSwingLimits(minDots);
*/
// AJT: limit lateral swings more then forward-backward swings
// limit lateral swings more then forward-backward swings
setEllipticalSwingLimits(stConstraint, PI / 30.0f, PI / 20.0f);
if (0 == baseName.compare("Spine1", Qt::CaseSensitive)
@ -851,13 +844,6 @@ void AnimInverseKinematics::initConstraints() {
const float MAX_NECK_TWIST = PI / 10.0f;
stConstraint->setTwistLimits(-MAX_NECK_TWIST, MAX_NECK_TWIST);
/*
std::vector<float> minDots;
const float MAX_NECK_SWING = PI / 8.0f;
minDots.push_back(cosf(MAX_NECK_SWING));
stConstraint->setSwingLimits(minDots);
*/
setEllipticalSwingLimits(stConstraint, PI / 10.0f, PI / 8.0f);
constraint = static_cast<RotationConstraint*>(stConstraint);