From ef7a16d6c8cd44bc6da8b647a966285340cbb5c8 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Mon, 20 Jan 2025 14:47:55 -0800 Subject: [PATCH] final fixes --- CMakeLists.txt | 2 ++ .../entities/src/EntityItemProperties.cpp.in | 1 + libraries/networking/src/Assignment.cpp | 5 ----- libraries/octree/src/OctreePacketData.cpp | 2 +- .../procedural/src/procedural/Procedural.cpp | 20 +++++++++---------- .../procedural/src/procedural/Procedural.h | 2 +- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb392e1caa..3288391aaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,6 +187,8 @@ if(OVERTE_WARNINGS_AS_ERRORS) if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR (CMAKE_CXX_COMPILER_ID MATCHES "" AND WIN32)) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") set(CMAKE_CFLAGS "${CMAKE_CFLAGS} /WX") + # Silence a warning in Qt about stdext::checked_array_iterator + add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) else() # Silence multichar to work around an issue in crashpad # Silence stringop-overflow to work around an issue in tbb diff --git a/libraries/entities/src/EntityItemProperties.cpp.in b/libraries/entities/src/EntityItemProperties.cpp.in index 7b48d11d00..7f078df660 100644 --- a/libraries/entities/src/EntityItemProperties.cpp.in +++ b/libraries/entities/src/EntityItemProperties.cpp.in @@ -490,6 +490,7 @@ void EntityItemProperties::setTagsFromVector(const QVector& tags) { for (const QString& tag : tags) { _tags.insert(tag); } + _tagsChanged = true; } EntityPropertyFlags EntityItemProperties::getChangedProperties() const { diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp index 43468c36dc..66b266ce6a 100644 --- a/libraries/networking/src/Assignment.cpp +++ b/libraries/networking/src/Assignment.cpp @@ -96,11 +96,6 @@ Assignment::Assignment(ReceivedMessage& message) : packetStream >> *this; } -#ifdef _WIN32 -#pragma warning(default:4351) -#endif - - Assignment::Assignment(const Assignment& otherAssignment) : QObject() { _uuid = otherAssignment._uuid; _command = otherAssignment._command; diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp index 1dec995410..ae7832870f 100644 --- a/libraries/octree/src/OctreePacketData.cpp +++ b/libraries/octree/src/OctreePacketData.cpp @@ -858,7 +858,7 @@ int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, AACube DataDeserializer des(dataBytes, sizeof(aaCubeData)); des >> result; - return des.length(); + return (int)des.length(); } int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QRect& result) { diff --git a/libraries/procedural/src/procedural/Procedural.cpp b/libraries/procedural/src/procedural/Procedural.cpp index eee4e64d54..5bcb42bc53 100644 --- a/libraries/procedural/src/procedural/Procedural.cpp +++ b/libraries/procedural/src/procedural/Procedural.cpp @@ -356,11 +356,11 @@ void Procedural::prepare(gpu::Batch& batch, } } // Then fill in every reflections the new custom bindings - size_t customSlot = procedural::slot::uniform::Custom; + int customSlot = procedural::slot::uniform::Custom; _slotMap.clear(); for (const auto& key : _data.uniforms.keys()) { bool isArrayUniform = false; - size_t numSlots = 0; + int numSlots = 0; const QJsonValue& value = _data.uniforms[key]; if (value.isDouble()) { numSlots = 1; @@ -368,12 +368,12 @@ void Procedural::prepare(gpu::Batch& batch, const QJsonArray valueArray = value.toArray(); if (valueArray.size() > 0) { if (valueArray[0].isArray()) { - const size_t valueLength = valueArray[0].toArray().size(); - size_t count = 0; + const int valueLength = valueArray[0].toArray().size(); + int count = 0; for (const QJsonValue& value : valueArray) { if (value.isArray()) { const QJsonArray innerValueArray = value.toArray(); - if ((size_t)innerValueArray.size() == valueLength) { + if (innerValueArray.size() == valueLength) { if (valueLength == 3 || valueLength == 4 || valueLength == 9 || valueLength == 16) { count++; isArrayUniform = true; @@ -495,7 +495,7 @@ void Procedural::setupUniforms() { continue; } - const size_t slot = slotItr->second; + const int slot = slotItr->second; const QJsonValue& value = _data.uniforms[key]; if (value.isDouble()) { const float v = value.toDouble(); @@ -504,16 +504,16 @@ void Procedural::setupUniforms() { const QJsonArray valueArray = value.toArray(); if (valueArray.size() > 0) { if (valueArray[0].isArray()) { - const size_t valueLength = valueArray[0].toArray().size(); + const int valueLength = valueArray[0].toArray().size(); std::vector vs; vs.reserve(valueLength * valueArray.size()); - size_t count = 0; + int count = 0; for (const QJsonValue& value : valueArray) { if (value.isArray()) { const QJsonArray innerValueArray = value.toArray(); - if ((size_t)innerValueArray.size() == valueLength) { + if (innerValueArray.size() == valueLength) { if (valueLength == 3 || valueLength == 4 || valueLength == 9 || valueLength == 16) { - for (size_t i = 0; i < valueLength; i++) { + for (int i = 0; i < valueLength; i++) { vs.push_back(innerValueArray[i].toDouble()); } count++; diff --git a/libraries/procedural/src/procedural/Procedural.h b/libraries/procedural/src/procedural/Procedural.h index c1836095a7..577caa4894 100644 --- a/libraries/procedural/src/procedural/Procedural.h +++ b/libraries/procedural/src/procedural/Procedural.h @@ -190,7 +190,7 @@ struct Procedural { NetworkTexturePointer _channels[MAX_PROCEDURAL_TEXTURE_CHANNELS]; std::unordered_map _vertexReplacements; std::unordered_map _fragmentReplacements; - std::unordered_map _slotMap; + std::unordered_map _slotMap; std::unordered_map _proceduralPipelines; std::unordered_map _errorPipelines;