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

remove the last of Leap specific cruft

Browse source
This commit is contained in:
Andrew Meadows 2014-05-12 11:48:56 -07:00
parent efb3edf400
commit cea472b730
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/SkeletonModel.cpp
View file

@ -33,7 +33,7 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
return; // only simulate for own avatar return; // only simulate for own avatar
} }
// find the left and rightmost active Leap palms // find the left and rightmost active palms
int leftPalmIndex, rightPalmIndex; int leftPalmIndex, rightPalmIndex;
Hand* hand = _owningAvatar->getHand(); Hand* hand = _owningAvatar->getHand();
hand->getLeftRightPalmIndices(leftPalmIndex, rightPalmIndex); hand->getLeftRightPalmIndices(leftPalmIndex, rightPalmIndex);
@ -42,7 +42,7 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
const FBXGeometry& geometry = _geometry->getFBXGeometry(); const FBXGeometry& geometry = _geometry->getFBXGeometry();
if (leftPalmIndex == -1) { if (leftPalmIndex == -1) {
// no Leap data; set hands from mouse // palms are not yet set, use mouse
if (_owningAvatar->getHandState() == HAND_STATE_NULL) { if (_owningAvatar->getHandState() == HAND_STATE_NULL) {
restoreRightHandPosition(HAND_RESTORATION_RATE); restoreRightHandPosition(HAND_RESTORATION_RATE);
} else { } else {

1
libraries/avatars/src/HandData.cpp
View file

@ -71,7 +71,6 @@ _rotationalVelocity(0.f),
_totalPenetration(0.f), _totalPenetration(0.f),
_controllerButtons(0), _controllerButtons(0),
_isActive(false), _isActive(false),
_leapID(LEAPID_INVALID),
_sixenseID(SIXENSEID_INVALID), _sixenseID(SIXENSEID_INVALID),
_numFramesWithoutData(0), _numFramesWithoutData(0),
_owningHandData(owningHandData), _owningHandData(owningHandData),

3
libraries/avatars/src/HandData.h
View file

@ -91,11 +91,9 @@ public:
const glm::vec3& getRawPosition() const { return _rawPosition; } const glm::vec3& getRawPosition() const { return _rawPosition; }
bool isActive() const { return _isActive; } bool isActive() const { return _isActive; }
int getLeapID() const { return _leapID; }
int getSixenseID() const { return _sixenseID; } int getSixenseID() const { return _sixenseID; }
void setActive(bool active) { _isActive = active; } void setActive(bool active) { _isActive = active; }
void setLeapID(int id) { _leapID = id; }
void setSixenseID(int id) { _sixenseID = id; } void setSixenseID(int id) { _sixenseID = id; }
void setRawRotation(const glm::quat rawRotation) { _rawRotation = rawRotation; }; void setRawRotation(const glm::quat rawRotation) { _rawRotation = rawRotation; };
@ -166,7 +164,6 @@ private:
float _joystickX, _joystickY; float _joystickX, _joystickY;
bool _isActive; // This has current valid data bool _isActive; // This has current valid data
int _leapID; // the Leap's serial id for this tracked object
int _sixenseID; // Sixense controller ID for this palm int _sixenseID; // Sixense controller ID for this palm
int _numFramesWithoutData; // after too many frames without data, this tracked object assumed lost. int _numFramesWithoutData; // after too many frames without data, this tracked object assumed lost.
HandData* _owningHandData; HandData* _owningHandData;