Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:36:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move AvatarData typedefs to AvatarData.h

Browse source
This commit is contained in:
Ryan Huffman 2015-05-27 14:52:48 -07:00
parent c5a3edee09
commit 21b5e26dc9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/avatars/src/AvatarData.h
View file

@ -57,6 +57,10 @@ typedef unsigned long long quint64;
#include "Recorder.h" #include "Recorder.h"
#include "Referential.h" #include "Referential.h"
typedef std::shared_ptr<AvatarData> AvatarSharedPointer;
typedef std::weak_ptr<AvatarData> AvatarWeakPointer;
typedef QHash<QUuid, AvatarSharedPointer> AvatarHash;
// avatar motion behaviors // avatar motion behaviors
const quint32 AVATAR_MOTION_KEYBOARD_MOTOR_ENABLED = 1U << 0; const quint32 AVATAR_MOTION_KEYBOARD_MOTOR_ENABLED = 1U << 0;
const quint32 AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED = 1U << 1; const quint32 AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED = 1U << 1;

4
libraries/avatars/src/AvatarHashMap.h
View file

@ -24,10 +24,6 @@
#include "AvatarData.h" #include "AvatarData.h"
#include <glm/glm.hpp> #include <glm/glm.hpp>
typedef std::shared_ptr<AvatarData> AvatarSharedPointer;
typedef std::weak_ptr<AvatarData> AvatarWeakPointer;
typedef QHash<QUuid, AvatarSharedPointer> AvatarHash;
class AvatarHashMap : public QObject, public Dependency { class AvatarHashMap : public QObject, public Dependency {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY