From 729b85062d7fa21fbc549fec92bad796e906a633 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Mon, 9 Sep 2024 12:37:35 -0700 Subject: [PATCH] fix component mode serialization --- .../entities/src/EntityItemProperties.cpp.in | 2 +- .../entities/src/EntityItemProperties.h.in | 2 +- .../entities/src/EntityItemProperties.txt | 18 ++++++------ .../entities/src/EntityPropertyFlags.h.in | 2 +- libraries/entities/src/ZoneEntityItem.cpp.in | 28 +++++++++---------- libraries/shared/src/ComponentMode.h | 4 +-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp.in b/libraries/entities/src/EntityItemProperties.cpp.in index 31272b954f..e5d16aaf94 100644 --- a/libraries/entities/src/EntityItemProperties.cpp.in +++ b/libraries/entities/src/EntityItemProperties.cpp.in @@ -257,7 +257,7 @@ const QHash stringToComponentMode = [] { addComponentMode(toReturn, ComponentMode::COMPONENT_MODE_ENABLED); return toReturn; }(); -QString EntityItemProperties::getComponentModeAsString(uint32_t mode) { return ComponentModeHelpers::getNameForComponentMode((ComponentMode)mode); } +QString EntityItemProperties::getComponentModeAsString(uint8_t mode) { return ComponentModeHelpers::getNameForComponentMode((ComponentMode)mode); } QString EntityItemProperties::getSkyboxModeAsString() const { return getComponentModeAsString(_skyboxMode); } QString EntityItemProperties::getKeyLightModeAsString() const { return getComponentModeAsString(_keyLightMode); } QString EntityItemProperties::getAmbientLightModeAsString() const { return getComponentModeAsString(_ambientLightMode); } diff --git a/libraries/entities/src/EntityItemProperties.h.in b/libraries/entities/src/EntityItemProperties.h.in index 6565d650c9..c838e1d0d7 100644 --- a/libraries/entities/src/EntityItemProperties.h.in +++ b/libraries/entities/src/EntityItemProperties.h.in @@ -117,7 +117,7 @@ public: @ENTITY_ITEM_PROPERTY_DEFINES@ - static QString getComponentModeAsString(uint32_t mode); + static QString getComponentModeAsString(uint8_t mode); public: float getMaxDimension() const { return glm::compMax(_dimensions); } diff --git a/libraries/entities/src/EntityItemProperties.txt b/libraries/entities/src/EntityItemProperties.txt index e03142afdd..251c9766d1 100644 --- a/libraries/entities/src/EntityItemProperties.txt +++ b/libraries/entities/src/EntityItemProperties.txt @@ -176,15 +176,15 @@ group:ambientOcclusion recordChange, enum:FLYING_ALLOWED prop:flyingAllowed type:bool default:ZoneEntityItem::DEFAULT_FLYING_ALLOWED basicProp, enum:GHOSTING_ALLOWED prop:ghostingAllowed type:bool default:ZoneEntityItem::DEFAULT_GHOSTING_ALLOWED basicProp, enum:FILTER_URL prop:filterURL type:QString default:ZoneEntityItem::DEFAULT_FILTER_URL urlPermission, -enum:KEY_LIGHT_MODE prop:keyLightMode type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum, -enum:AMBIENT_LIGHT_MODE prop:ambientLightMode type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum, -enum:SKYBOX_MODE prop:skyboxMode type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum, -enum:HAZE_MODE prop:hazeMode type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum, -enum:BLOOM_MODE prop:bloomMode type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum, -enum:AVATAR_PRIORITY prop:avatarPriority type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum basicProp, -enum:SCREENSHARE prop:screenshare type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum basicProp, -enum:TONEMAPPING_MODE prop:tonemappingMode type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum, -enum:AMBIENT_OCCLUSION_MODE prop:ambientOcclusionMode type:uint32_t default:(uint32_t)COMPONENT_MODE_INHERIT enum, +enum:KEY_LIGHT_MODE prop:keyLightMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum, +enum:AMBIENT_LIGHT_MODE prop:ambientLightMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum, +enum:SKYBOX_MODE prop:skyboxMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum, +enum:HAZE_MODE prop:hazeMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum, +enum:BLOOM_MODE prop:bloomMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum, +enum:AVATAR_PRIORITY prop:avatarPriority type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum basicProp, +enum:SCREENSHARE prop:screenshare type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum basicProp, +enum:TONEMAPPING_MODE prop:tonemappingMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum, +enum:AMBIENT_OCCLUSION_MODE prop:ambientOcclusionMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum, PolyVox enum:VOXEL_VOLUME_SIZE prop:voxelVolumeSize type:vec3 default:PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE noGetterSetterProp, enum:VOXEL_DATA prop:voxelData type:QByteArray default:PolyVoxEntityItem::DEFAULT_VOXEL_DATA noGetterSetterProp, diff --git a/libraries/entities/src/EntityPropertyFlags.h.in b/libraries/entities/src/EntityPropertyFlags.h.in index f689845478..c087ae5c57 100644 --- a/libraries/entities/src/EntityPropertyFlags.h.in +++ b/libraries/entities/src/EntityPropertyFlags.h.in @@ -16,7 +16,7 @@ #include -enum EntityPropertyList { +enum EntityPropertyList : uint16_t { PROP_PAGED_PROPERTY, PROP_CUSTOM_PROPERTIES_INCLUDED, diff --git a/libraries/entities/src/ZoneEntityItem.cpp.in b/libraries/entities/src/ZoneEntityItem.cpp.in index 4b3689be02..e926f678ce 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp.in +++ b/libraries/entities/src/ZoneEntityItem.cpp.in @@ -239,80 +239,80 @@ void ZoneEntityItem::resetRenderingPropertiesChanged() { }); } -void ZoneEntityItem::setSkyboxMode(const uint32_t value) { +void ZoneEntityItem::setSkyboxMode(const uint8_t value) { if (value < COMPONENT_MODE_ITEM_COUNT && value != _skyboxMode) { _skyboxMode = value; _skyboxPropertiesChanged = true; } } -uint32_t ZoneEntityItem::getSkyboxMode() const { +uint8_t ZoneEntityItem::getSkyboxMode() const { return _skyboxMode; } -void ZoneEntityItem::setKeyLightMode(const uint32_t value) { +void ZoneEntityItem::setKeyLightMode(const uint8_t value) { if (value < COMPONENT_MODE_ITEM_COUNT && value != _keyLightMode) { _keyLightMode = value; _keyLightPropertiesChanged = true; } } -uint32_t ZoneEntityItem::getKeyLightMode() const { +uint8_t ZoneEntityItem::getKeyLightMode() const { return _keyLightMode; } -void ZoneEntityItem::setAmbientLightMode(const uint32_t value) { +void ZoneEntityItem::setAmbientLightMode(const uint8_t value) { if (value < COMPONENT_MODE_ITEM_COUNT && value != _ambientLightMode) { _ambientLightMode = value; _ambientLightPropertiesChanged = true; } } -uint32_t ZoneEntityItem::getAmbientLightMode() const { +uint8_t ZoneEntityItem::getAmbientLightMode() const { return _ambientLightMode; } -void ZoneEntityItem::setHazeMode(const uint32_t value) { +void ZoneEntityItem::setHazeMode(const uint8_t value) { if (value < COMPONENT_MODE_ITEM_COUNT && value != _hazeMode) { _hazeMode = value; _hazePropertiesChanged = true; } } -uint32_t ZoneEntityItem::getHazeMode() const { +uint8_t ZoneEntityItem::getHazeMode() const { return _hazeMode; } -void ZoneEntityItem::setBloomMode(const uint32_t value) { +void ZoneEntityItem::setBloomMode(const uint8_t value) { if (value < COMPONENT_MODE_ITEM_COUNT && value != _bloomMode) { _bloomMode = value; _bloomPropertiesChanged = true; } } -uint32_t ZoneEntityItem::getBloomMode() const { +uint8_t ZoneEntityItem::getBloomMode() const { return _bloomMode; } -void ZoneEntityItem::setTonemappingMode(const uint32_t value) { +void ZoneEntityItem::setTonemappingMode(const uint8_t value) { if (value < COMPONENT_MODE_ITEM_COUNT && value != _tonemappingMode) { _tonemappingMode = value; _tonemappingPropertiesChanged = true; } } -uint32_t ZoneEntityItem::getTonemappingMode() const { +uint8_t ZoneEntityItem::getTonemappingMode() const { return _tonemappingMode; } -void ZoneEntityItem::setAmbientOcclusionMode(const uint32_t value) { +void ZoneEntityItem::setAmbientOcclusionMode(const uint8_t value) { if (value < COMPONENT_MODE_ITEM_COUNT && value != _ambientOcclusionMode) { _ambientOcclusionMode = value; _ambientOcclusionPropertiesChanged = true; } } -uint32_t ZoneEntityItem::getAmbientOcclusionMode() const { +uint8_t ZoneEntityItem::getAmbientOcclusionMode() const { return _ambientOcclusionMode; } diff --git a/libraries/shared/src/ComponentMode.h b/libraries/shared/src/ComponentMode.h index f1d030cefd..9cf773e997 100644 --- a/libraries/shared/src/ComponentMode.h +++ b/libraries/shared/src/ComponentMode.h @@ -14,7 +14,7 @@ #include -enum ComponentMode { +enum ComponentMode : uint8_t { COMPONENT_MODE_INHERIT, COMPONENT_MODE_DISABLED, COMPONENT_MODE_ENABLED, @@ -22,7 +22,7 @@ enum ComponentMode { COMPONENT_MODE_ITEM_COUNT }; -enum AvatarPriorityMode { +enum AvatarPriorityMode : uint8_t { AVATAR_PRIORITY_INHERIT, AVATAR_PRIORITY_CROWD, AVATAR_PRIORITY_HERO,