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

cleanups

Browse source
This commit is contained in:
Seth Alves 2015-10-15 14:52:38 -07:00
parent 36a523478f
commit 487131dde1
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

10
interface/src/avatar/AvatarActionHold.cpp
View file

@ -121,11 +121,11 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
holderID = myAvatar->getSessionUUID(); holderID = myAvatar->getSessionUUID();
if (somethingChanged || if (somethingChanged ||
relativePosition != _relativePosition relativePosition != _relativePosition ||
|| relativeRotation != _relativeRotation relativeRotation != _relativeRotation ||
|| timeScale != _linearTimeScale timeScale != _linearTimeScale ||
|| hand != _hand hand != _hand ||
|| holderID != _holderID) { holderID != _holderID) {
needUpdate = true; needUpdate = true;
} }
}); });