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

fix PROP index mismatch

Browse source
This commit is contained in:
ZappoMan 2015-03-20 11:43:01 -07:00
parent bfe3f2cf30
commit ad833b76c8
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,15 +96,23 @@ enum EntityPropertyList {
PROP_COLLISION_MODEL_URL, PROP_COLLISION_MODEL_URL,
PROP_ATTRIBUTION, PROP_ATTRIBUTION,
// NOTE: add new properties ABOVE this line and then modify PROP_LAST_ITEM below ////////////////////////////////////////////////////////////////////////////////////////////////////
// ATTENTION: add new properties ABOVE this line and then modify PROP_LAST_ITEM below
PROP_LAST_ITEM = PROP_ATTRIBUTION, PROP_LAST_ITEM = PROP_ATTRIBUTION,
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// WARNING! Do not add props here unless you intentionally mean to reuse PROP_ indexes
//
// 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
PROP_TEXT_COLOR = PROP_COLOR, PROP_TEXT_COLOR = PROP_COLOR,
PROP_TEXT = PROP_MODEL_URL, PROP_TEXT = PROP_MODEL_URL,
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_OLD_VERSION
// WARNING!!! DO NOT ADD PROPS_xxx here unless you really really meant to.... Add them UP above
}; };
typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags; typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags;

2
libraries/entities/src/ModelEntityItem.cpp
View file

@ -98,6 +98,8 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
READ_ENTITY_PROPERTY_STRING(PROP_MODEL_URL, setModelURL); READ_ENTITY_PROPERTY_STRING(PROP_MODEL_URL, setModelURL);
if (args.bitstreamVersion < VERSION_ENTITIES_HAS_COLLISION_MODEL) { if (args.bitstreamVersion < VERSION_ENTITIES_HAS_COLLISION_MODEL) {
setCollisionModelURL(""); setCollisionModelURL("");
} else if (args.bitstreamVersion < VERSION_ENTITIES_HAS_ATTRIBUTION) {
READ_ENTITY_PROPERTY_STRING(PROP_COLLISION_MODEL_URL_OLD_VERSION, setCollisionModelURL);
} else { } else {
READ_ENTITY_PROPERTY_STRING(PROP_COLLISION_MODEL_URL, setCollisionModelURL); READ_ENTITY_PROPERTY_STRING(PROP_COLLISION_MODEL_URL, setCollisionModelURL);
} }