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

Move user data to end of enum

Browse source
This commit is contained in:
Atlante45 2014-11-13 17:44:22 -08:00
parent 9fc7451581
commit f914f02a0b
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/entities/src/EntityItem.h
View file

@ -197,11 +197,6 @@ public:
float getLifetime() const { return _lifetime; } /// get the lifetime in seconds for the entity float getLifetime() const { return _lifetime; } /// get the lifetime in seconds for the entity
void setLifetime(float value) { _lifetime = value; } /// set the lifetime in seconds for the entity void setLifetime(float value) { _lifetime = value; } /// set the lifetime in seconds for the entity
/// User-specified data stored in a variant map
static const QString DEFAULT_USER_DATA;
const QString& getUserData() const { return _userData; }
void setUserData(const QString& value) { _userData = value; }
/// is this entity immortal, in that it has no lifetime set, and will exist until manually deleted /// is this entity immortal, in that it has no lifetime set, and will exist until manually deleted
bool isImmortal() const { return _lifetime == IMMORTAL; } bool isImmortal() const { return _lifetime == IMMORTAL; }
@ -257,6 +252,10 @@ public:
bool getLocked() const { return _locked; } bool getLocked() const { return _locked; }
void setLocked(bool value) { _locked = value; } void setLocked(bool value) { _locked = value; }
static const QString DEFAULT_USER_DATA;
const QString& getUserData() const { return _userData; }
void setUserData(const QString& value) { _userData = value; }
// TODO: We need to get rid of these users of getRadius()... // TODO: We need to get rid of these users of getRadius()...
float getRadius() const; float getRadius() const;
@ -289,7 +288,6 @@ protected:
glm::vec3 _gravity; glm::vec3 _gravity;
float _damping; float _damping;
float _lifetime; float _lifetime;
QString _userData;
QString _script; QString _script;
glm::vec3 _registrationPoint; glm::vec3 _registrationPoint;
glm::vec3 _angularVelocity; glm::vec3 _angularVelocity;
@ -298,6 +296,7 @@ protected:
bool _ignoreForCollisions; bool _ignoreForCollisions;
bool _collisionsWillMove; bool _collisionsWillMove;
bool _locked; bool _locked;
QString _userData;
// NOTE: Radius support is obsolete, but these private helper functions are available for this class to // NOTE: Radius support is obsolete, but these private helper functions are available for this class to
// parse old data streams // parse old data streams

4
libraries/entities/src/EntityItemProperties.h
View file

@ -47,7 +47,6 @@ enum EntityPropertyList {
PROP_GRAVITY, PROP_GRAVITY,
PROP_DAMPING, PROP_DAMPING,
PROP_LIFETIME, PROP_LIFETIME,
PROP_USER_DATA,
PROP_SCRIPT, PROP_SCRIPT,
// these properties are supported by some derived classes // these properties are supported by some derived classes
@ -82,8 +81,9 @@ enum EntityPropertyList {
// used by Model entities // used by Model entities
PROP_TEXTURES, PROP_TEXTURES,
PROP_ANIMATION_SETTINGS, PROP_ANIMATION_SETTINGS,
PROP_USER_DATA,
PROP_LAST_ITEM = PROP_ANIMATION_SETTINGS PROP_LAST_ITEM = PROP_USER_DATA
}; };
typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags; typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags;