Rework initializers

This commit is contained in:
David Rowe 2016-01-25 11:22:31 +13:00
parent 840bf7cfb4
commit 8a8e14f54a
2 changed files with 14 additions and 31 deletions

View file

@ -32,24 +32,7 @@ KeyLightPropertyGroup EntityItemProperties::_staticKeyLight;
EntityPropertyList PROP_LAST_ITEM = (EntityPropertyList)(PROP_AFTER_LAST_ITEM - 1);
EntityItemProperties::EntityItemProperties(EntityPropertyFlags desiredProperties) :
_id(UNKNOWN_ENTITY_ID),
_idSet(false),
_lastEdited(0),
_type(EntityTypes::Unknown),
_glowLevel(0.0f),
_localRenderAlpha(1.0f),
_glowLevelChanged(false),
_localRenderAlphaChanged(false),
_defaultSettings(true),
_naturalDimensions(1.0f, 1.0f, 1.0f),
_naturalPosition(0.0f, 0.0f, 0.0f),
_desiredProperties(desiredProperties),
_entityFound(false)
_desiredProperties(desiredProperties) //,
{
}

View file

@ -279,29 +279,29 @@ protected:
void setCollisionMaskFromString(const QString& maskString);
private:
QUuid _id;
bool _idSet;
quint64 _lastEdited;
EntityTypes::EntityType _type;
QUuid _id { UNKNOWN_ENTITY_ID };
bool _idSet { false };
quint64 _lastEdited { 0 };
EntityTypes::EntityType _type { EntityTypes::Unknown };
void setType(const QString& typeName) { _type = EntityTypes::getEntityTypeFromName(typeName); }
float _glowLevel;
float _localRenderAlpha;
bool _glowLevelChanged;
bool _localRenderAlphaChanged;
bool _defaultSettings;
bool _dimensionsInitialized = true; // Only false if creating an entity locally with no dimensions properties
float _glowLevel { 0.0f };
float _localRenderAlpha { 1.0f };
bool _glowLevelChanged { false };
bool _localRenderAlphaChanged { false };
bool _defaultSettings { true };
bool _dimensionsInitialized { true }; // Only false if creating an entity locally with no dimensions properties
// NOTE: The following are pseudo client only properties. They are only used in clients which can access
// properties of model geometry. But these properties are not serialized like other properties.
QVector<SittingPoint> _sittingPoints;
QStringList _textureNames;
glm::vec3 _naturalDimensions;
glm::vec3 _naturalPosition;
glm::vec3 _naturalDimensions { 1.0f, 1.0f, 1.0f };
glm::vec3 _naturalPosition { 0.0f, 0.0f, 0.0f };
EntityPropertyFlags _desiredProperties; // if set will narrow scopes of copy/to/from to just these properties
bool _entityFound;
bool _entityFound { false };
};
Q_DECLARE_METATYPE(EntityItemProperties);