From c2f1507df12961d9fa726c9d9450bcb5742f3363 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 25 Apr 2014 14:16:42 -0700 Subject: [PATCH] move AVATAR_MOTION_OBEY_GRAVITY to libs --- interface/src/avatar/MyAvatar.h | 2 -- libraries/avatars/src/AvatarData.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 9b6b13568f..8d0b4b99d9 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -25,8 +25,6 @@ enum AvatarHandState NUM_HAND_STATES }; -const quint32 AVATAR_MOTION_OBEY_GRAVITY = 1U << 0; - class MyAvatar : public Avatar { Q_OBJECT Q_PROPERTY(bool shouldRenderLocally READ getShouldRenderLocally WRITE setShouldRenderLocally) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 250ae07b01..494d86ebda 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -50,6 +50,9 @@ typedef unsigned long long quint64; #include "HeadData.h" #include "HandData.h" +// avatar motion behaviors +const quint32 AVATAR_MOTION_OBEY_GRAVITY = 1U << 0; + // First bitset const int KEY_STATE_START_BIT = 0; // 1st and 2nd bits const int HAND_STATE_START_BIT = 2; // 3rd and 4th bits