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

add some accessors

Browse source
This commit is contained in:
Seth Alves 2015-10-15 11:42:53 -07:00
parent 1d8db13f41
commit a70ba4cd5a
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/Avatar.h
View file

@ -174,6 +174,8 @@ public:
void setMotionState(AvatarMotionState* motionState) { _motionState = motionState; }
AvatarMotionState* getMotionState() { return _motionState; }
virtual RigPointer getRig() const { return _skeletonModel.getRig(); }
public slots:
glm::vec3 getLeftPalmPosition();
glm::vec3 getLeftPalmVelocity();

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

@ -183,6 +183,8 @@ public:
glm::quat getCustomListenOrientation() { return _customListenOrientation; }
void setCustomListenOrientation(glm::quat customListenOrientation) { _customListenOrientation = customListenOrientation; }
virtual RigPointer getRig() const { return _rig; }
public slots:
void increaseSize();
void decreaseSize();

7
libraries/animation/src/Rig.cpp
View file

@ -50,6 +50,13 @@ void Rig::HeadParameters::dump() const {
qCDebug(animation, " isTalking = %s", isTalking ? "true" : "false");
}
// QString Rig::HeadParameters::dumpJoint(int jointIndex) const {
// QString out = "";
// out += ...;
// JointState& state = _jointStates[i];
// int parentIndex = state.getParentIndex();
// }
void insertSorted(QList<AnimationHandlePointer>& handles, const AnimationHandlePointer& handle) {
for (QList<AnimationHandlePointer>::iterator it = handles.begin(); it != handles.end(); it++) {
if (handle->getPriority() > (*it)->getPriority()) {

4
libraries/render-utils/src/Model.h
View file

@ -198,6 +198,10 @@ public:
return ((index < 0) && (index >= _blendshapeCoefficients.size())) ? 0.0f : _blendshapeCoefficients.at(index);
}
virtual RigPointer getRig() const { return _rig; }
const glm::vec3& getRegistrationPoint() const { return _registrationPoint; }
protected:
void setPupilDilation(float dilation) { _pupilDilation = dilation; }