From d7c743ba9eb800554697c2752746b7703e091daa Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Wed, 6 Dec 2023 13:34:24 +0100 Subject: [PATCH] Fixes based on review comments on previous PR --- libraries/entities/src/ZoneEntityItem.h.in | 8 ++++++++ libraries/networking/src/udt/PacketHeaders.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/ZoneEntityItem.h.in b/libraries/entities/src/ZoneEntityItem.h.in index 7da10c3c2a..c9ae7f5f43 100644 --- a/libraries/entities/src/ZoneEntityItem.h.in +++ b/libraries/entities/src/ZoneEntityItem.h.in @@ -57,6 +57,14 @@ public: const TonemappingPropertyGroup& getTonemappingProperties() const { return _tonemappingProperties; } const AmbientOcclusionPropertyGroup& getAmbientOcclusionProperties() const { return _ambientOcclusionProperties; } + /** + * @brief Backwards compatibility for screenshare and the like + * Doesn't do anything. + * @param value + */ + void ignoreUint32(uint32_t value) { /* nothing */ }; + + void setUserData(const QString& value) override; bool keyLightPropertiesChanged() const { return _keyLightPropertiesChanged; } diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index 3a2890a5bf..c04531bc40 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -341,8 +341,8 @@ enum class EntityVersion : PacketVersion { ShadowBiasAndDistance, TextEntityFonts, ScriptServerKinematicMotion, - // TODO: This was "ScreenshareZone". Drop it on the next protocol change. - DropOnProtocolChange, + // This was ScreenshareZone, property was dropped. + ScreenshareZoneUnused, ZoneOcclusion, ModelBlendshapes, TransparentWeb,