From 76e8eb2bfc4ae11d0fbaf8cba798d755c3d474c2 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 15 Jan 2014 16:53:27 -0800 Subject: [PATCH] Moving SIXENSE_CONTROLLER_ID* constants into header to help eliminate magic numbers in other code (to be committed later). --- libraries/avatars/src/HandData.cpp | 3 --- libraries/avatars/src/HandData.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/avatars/src/HandData.cpp b/libraries/avatars/src/HandData.cpp index 62a15efb1a..7b0be95abe 100644 --- a/libraries/avatars/src/HandData.cpp +++ b/libraries/avatars/src/HandData.cpp @@ -38,9 +38,6 @@ PalmData& HandData::addNewPalm() { return _palms.back(); } -const int SIXENSE_CONTROLLER_ID_LEFT_HAND = 0; -const int SIXENSE_CONTROLLER_ID_RIGHT_HAND = 1; - const PalmData* HandData::getPalm(int sixSenseID) const { // the palms are not necessarily added in left-right order, // so we have to search for the right SixSenseID diff --git a/libraries/avatars/src/HandData.h b/libraries/avatars/src/HandData.h index 8de0c2d9f8..1aa60da927 100755 --- a/libraries/avatars/src/HandData.h +++ b/libraries/avatars/src/HandData.h @@ -35,6 +35,9 @@ const int BUTTON_FWD = 128; const float LEAP_UNIT_SCALE = 0.001f; ///< convert mm to meters +const int SIXENSE_CONTROLLER_ID_LEFT_HAND = 0; +const int SIXENSE_CONTROLLER_ID_RIGHT_HAND = 1; + class HandData { public: HandData(AvatarData* owningAvatar);