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

Fix emun placement

Browse source
This commit is contained in:
Atlante45 2015-03-19 17:25:53 +01:00
parent d3ae7cf5cf
commit cbef6e546f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,8 +93,11 @@ enum EntityPropertyList {
PROP_LOCAL_GRAVITY, PROP_LOCAL_GRAVITY,
PROP_PARTICLE_RADIUS, PROP_PARTICLE_RADIUS,
// used by Model entities
PROP_ATTRIBUTION,
// NOTE: add new properties ABOVE this line and then modify PROP_LAST_ITEM below // NOTE: add new properties ABOVE this line and then modify PROP_LAST_ITEM below
PROP_LAST_ITEM = PROP_PARTICLE_RADIUS, PROP_LAST_ITEM = PROP_ATTRIBUTION,
// These properties of TextEntity piggy back off of properties of ModelEntities, the type doesn't matter // These properties of TextEntity piggy back off of properties of ModelEntities, the type doesn't matter
// since the derived class knows how to interpret it's own properties and knows the types it expects // since the derived class knows how to interpret it's own properties and knows the types it expects
@ -103,9 +106,6 @@ enum EntityPropertyList {
PROP_LINE_HEIGHT = PROP_ANIMATION_URL, PROP_LINE_HEIGHT = PROP_ANIMATION_URL,
PROP_BACKGROUND_COLOR = PROP_ANIMATION_FPS, PROP_BACKGROUND_COLOR = PROP_ANIMATION_FPS,
PROP_COLLISION_MODEL_URL, PROP_COLLISION_MODEL_URL,
// used by Model entities
PROP_ATTRIBUTION
}; };
typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags; typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags;