diff --git a/include/Nazara/Core/AbstractLogger.hpp b/include/Nazara/Core/AbstractLogger.hpp index 59b2ef39a..5c97336f4 100644 --- a/include/Nazara/Core/AbstractLogger.hpp +++ b/include/Nazara/Core/AbstractLogger.hpp @@ -17,6 +17,8 @@ namespace Nz { public: AbstractLogger() = default; + AbstractLogger(const AbstractLogger&) = default; + AbstractLogger(AbstractLogger&&) noexcept = default; virtual ~AbstractLogger(); virtual void EnableStdReplication(bool enable) = 0; @@ -25,6 +27,9 @@ namespace Nz virtual void Write(const std::string_view& string) = 0; virtual void WriteError(ErrorType type, const std::string_view& error, unsigned int line = 0, const char* file = nullptr, const char* function = nullptr); + + AbstractLogger& operator=(const AbstractLogger&) = default; + AbstractLogger& operator=(AbstractLogger&&) noexcept = default; }; } diff --git a/include/Nazara/Core/FileLogger.hpp b/include/Nazara/Core/FileLogger.hpp index e92d56571..6e93e876b 100644 --- a/include/Nazara/Core/FileLogger.hpp +++ b/include/Nazara/Core/FileLogger.hpp @@ -19,8 +19,8 @@ namespace Nz { public: FileLogger(std::filesystem::path logPath = "NazaraLog.log"); - FileLogger(const FileLogger&) = default; - FileLogger(FileLogger&&) = default; + FileLogger(const FileLogger&) = delete; + FileLogger(FileLogger&&) noexcept = default; ~FileLogger(); void EnableTimeLogging(bool enable); @@ -32,8 +32,8 @@ namespace Nz void Write(const std::string_view& string) override; void WriteError(ErrorType type, const std::string_view& error, unsigned int line = 0, const char* file = nullptr, const char* function = nullptr) override; - FileLogger& operator=(const FileLogger&) = default; - FileLogger& operator=(FileLogger&&) = default; + FileLogger& operator=(const FileLogger&) = delete; + FileLogger& operator=(FileLogger&&) noexcept = default; private: std::fstream m_outputFile; diff --git a/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp index 32f216de5..cc9ac019c 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp @@ -31,7 +31,7 @@ namespace Nz inline OpenGLCommandBuffer(); inline OpenGLCommandBuffer(OpenGLCommandPool& owner, std::size_t poolIndex, std::size_t bindingIndex); OpenGLCommandBuffer(const OpenGLCommandBuffer&) = delete; - OpenGLCommandBuffer(OpenGLCommandBuffer&&) noexcept = default; + OpenGLCommandBuffer(OpenGLCommandBuffer&&) = delete; ~OpenGLCommandBuffer() = default; inline void BeginDebugRegion(const std::string_view& regionName, const Nz::Color& color); diff --git a/include/Nazara/OpenGLRenderer/OpenGLShaderBinding.hpp b/include/Nazara/OpenGLRenderer/OpenGLShaderBinding.hpp index 6358c1c6d..33fb89f40 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLShaderBinding.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLShaderBinding.hpp @@ -20,8 +20,8 @@ namespace Nz { public: inline OpenGLShaderBinding(OpenGLRenderPipelineLayout& owner, std::size_t poolIndex, std::size_t bindingIndex); - OpenGLShaderBinding(const OpenGLShaderBinding&) = default; - OpenGLShaderBinding(OpenGLShaderBinding&&) = default; + OpenGLShaderBinding(const OpenGLShaderBinding&) = delete; + OpenGLShaderBinding(OpenGLShaderBinding&&) = delete; ~OpenGLShaderBinding() = default; void Apply(const GL::Context& context) const; diff --git a/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp b/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp index 47a60b42a..d3d66cb12 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp @@ -19,8 +19,8 @@ namespace Nz { public: OpenGLTexture(OpenGLDevice& device, const TextureInfo& params); - OpenGLTexture(const OpenGLTexture&) = default; - OpenGLTexture(OpenGLTexture&&) noexcept = default; + OpenGLTexture(const OpenGLTexture&) = delete; + OpenGLTexture(OpenGLTexture&&) = delete; ~OpenGLTexture() = default; PixelFormat GetFormat() const override; diff --git a/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp b/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp index f6ac10f0d..15799f642 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp @@ -18,8 +18,8 @@ namespace Nz { public: OpenGLTextureSampler(OpenGLDevice& device, const TextureSamplerInfo& samplerInfo); - OpenGLTextureSampler(const OpenGLTextureSampler&) = default; - OpenGLTextureSampler(OpenGLTextureSampler&&) noexcept = default; + OpenGLTextureSampler(const OpenGLTextureSampler&) = delete; + OpenGLTextureSampler(OpenGLTextureSampler&&) = delete; ~OpenGLTextureSampler() = default; inline const GL::Sampler& GetSampler(bool mipmaps) const; diff --git a/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp index b1a08cb26..0e702f98c 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp @@ -25,7 +25,7 @@ namespace Nz void Activate() const override; OpenGLWindowFramebuffer& operator=(const OpenGLWindowFramebuffer&) = delete; - OpenGLWindowFramebuffer& operator=(OpenGLWindowFramebuffer&&) noexcept = default; + OpenGLWindowFramebuffer& operator=(OpenGLWindowFramebuffer&&) = delete; private: OpenGLRenderWindow& m_renderWindow; diff --git a/include/Nazara/Shader/ShaderAstCloner.hpp b/include/Nazara/Shader/ShaderAstCloner.hpp index 4c24e689e..34336e9ba 100644 --- a/include/Nazara/Shader/ShaderAstCloner.hpp +++ b/include/Nazara/Shader/ShaderAstCloner.hpp @@ -19,14 +19,14 @@ namespace Nz { public: ShaderAstCloner() = default; - ShaderAstCloner(const ShaderAstCloner&) = default; - ShaderAstCloner(ShaderAstCloner&&) = default; + ShaderAstCloner(const ShaderAstCloner&) = delete; + ShaderAstCloner(ShaderAstCloner&&) = delete; ~ShaderAstCloner() = default; ShaderNodes::StatementPtr Clone(const ShaderNodes::StatementPtr& statement); - ShaderAstCloner& operator=(const ShaderAstCloner&) = default; - ShaderAstCloner& operator=(ShaderAstCloner&&) = default; + ShaderAstCloner& operator=(const ShaderAstCloner&) = delete; + ShaderAstCloner& operator=(ShaderAstCloner&&) = delete; protected: ShaderNodes::ExpressionPtr CloneExpression(const ShaderNodes::ExpressionPtr& expr); diff --git a/include/Nazara/Shader/ShaderAstVisitor.hpp b/include/Nazara/Shader/ShaderAstVisitor.hpp index 64dc35559..decd3a2f9 100644 --- a/include/Nazara/Shader/ShaderAstVisitor.hpp +++ b/include/Nazara/Shader/ShaderAstVisitor.hpp @@ -42,6 +42,9 @@ namespace Nz virtual void Visit(ShaderNodes::StatementBlock& node) = 0; virtual void Visit(ShaderNodes::SwizzleOp& node) = 0; + ShaderAstVisitor& operator=(const ShaderAstVisitor&) = delete; + ShaderAstVisitor& operator=(ShaderAstVisitor&&) = delete; + private: std::unordered_set m_conditions; }; diff --git a/include/Nazara/Shader/ShaderVarVisitor.hpp b/include/Nazara/Shader/ShaderVarVisitor.hpp index ebee55ab6..babfb2b1e 100644 --- a/include/Nazara/Shader/ShaderVarVisitor.hpp +++ b/include/Nazara/Shader/ShaderVarVisitor.hpp @@ -29,6 +29,9 @@ namespace Nz virtual void Visit(ShaderNodes::OutputVariable& var) = 0; virtual void Visit(ShaderNodes::ParameterVariable& var) = 0; virtual void Visit(ShaderNodes::UniformVariable& var) = 0; + + ShaderVarVisitor& operator=(const ShaderVarVisitor&) = delete; + ShaderVarVisitor& operator=(ShaderVarVisitor&&) = delete; }; } diff --git a/include/Nazara/Utility/RichTextDrawer.hpp b/include/Nazara/Utility/RichTextDrawer.hpp index 56166ebd6..44cb55695 100644 --- a/include/Nazara/Utility/RichTextDrawer.hpp +++ b/include/Nazara/Utility/RichTextDrawer.hpp @@ -172,7 +172,7 @@ namespace Nz public: BlockRef(const BlockRef&) = default; - BlockRef(BlockRef&&) = default; + BlockRef(BlockRef&&) = delete; ~BlockRef() = default; inline float GetCharacterSpacingOffset() const; @@ -196,8 +196,8 @@ namespace Nz inline void SetStyle(TextStyleFlags style); inline void SetText(std::string text); - BlockRef& operator=(const BlockRef&) = default; - BlockRef& operator=(BlockRef&&) = default; + BlockRef& operator=(const BlockRef&) = delete; + BlockRef& operator=(BlockRef&&) = delete; private: inline BlockRef(RichTextDrawer& drawer, std::size_t index); diff --git a/include/Nazara/VulkanRenderer/VulkanCommandBuffer.hpp b/include/Nazara/VulkanRenderer/VulkanCommandBuffer.hpp index 04f5c560a..dd01bbeb3 100644 --- a/include/Nazara/VulkanRenderer/VulkanCommandBuffer.hpp +++ b/include/Nazara/VulkanRenderer/VulkanCommandBuffer.hpp @@ -23,7 +23,7 @@ namespace Nz inline VulkanCommandBuffer(VulkanCommandPool& owner, std::size_t poolIndex, std::size_t bindingIndex, Vk::AutoCommandBuffer commandBuffer); inline VulkanCommandBuffer(VulkanCommandPool& owner, std::size_t poolIndex, std::size_t bindingIndex, std::vector commandBuffers); VulkanCommandBuffer(const VulkanCommandBuffer&) = delete; - VulkanCommandBuffer(VulkanCommandBuffer&&) noexcept = default; + VulkanCommandBuffer(VulkanCommandBuffer&&) = delete; ~VulkanCommandBuffer() = default; inline std::size_t GetBindingIndex() const; diff --git a/include/Nazara/VulkanRenderer/VulkanRenderer.hpp b/include/Nazara/VulkanRenderer/VulkanRenderer.hpp index d0c14c6b5..d52086dce 100644 --- a/include/Nazara/VulkanRenderer/VulkanRenderer.hpp +++ b/include/Nazara/VulkanRenderer/VulkanRenderer.hpp @@ -44,7 +44,6 @@ namespace Nz std::vector m_physDevices; ParameterList m_initializationParameters; Vk::Instance m_instance; - UInt32 m_apiVersion; }; } diff --git a/include/Nazara/VulkanRenderer/VulkanShaderBinding.hpp b/include/Nazara/VulkanRenderer/VulkanShaderBinding.hpp index 72fb993d1..ee97ec66f 100644 --- a/include/Nazara/VulkanRenderer/VulkanShaderBinding.hpp +++ b/include/Nazara/VulkanRenderer/VulkanShaderBinding.hpp @@ -19,8 +19,8 @@ namespace Nz { public: inline VulkanShaderBinding(VulkanRenderPipelineLayout& owner, std::size_t poolIndex, std::size_t bindingIndex, Vk::DescriptorSet descriptorSet); - VulkanShaderBinding(const VulkanShaderBinding&) = default; - VulkanShaderBinding(VulkanShaderBinding&&) noexcept = default; + VulkanShaderBinding(const VulkanShaderBinding&) = delete; + VulkanShaderBinding(VulkanShaderBinding&&) = delete; ~VulkanShaderBinding() = default; inline std::size_t GetBindingIndex() const; diff --git a/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp b/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp index f6505b1cb..50644f102 100644 --- a/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp +++ b/include/Nazara/VulkanRenderer/VulkanShaderStage.hpp @@ -20,7 +20,7 @@ namespace Nz public: VulkanShaderStage() = default; VulkanShaderStage(const VulkanShaderStage&) = delete; - VulkanShaderStage(VulkanShaderStage&&) noexcept = default; + VulkanShaderStage(VulkanShaderStage&&) = delete; ~VulkanShaderStage() = default; bool Create(Vk::Device& device, ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize); @@ -29,7 +29,7 @@ namespace Nz inline ShaderStageType GetStageType() const; VulkanShaderStage& operator=(const VulkanShaderStage&) = delete; - VulkanShaderStage& operator=(VulkanShaderStage&&) noexcept = default; + VulkanShaderStage& operator=(VulkanShaderStage&&) = delete; private: Vk::ShaderModule m_shaderModule; diff --git a/include/Nazara/VulkanRenderer/VulkanSingleFramebuffer.hpp b/include/Nazara/VulkanRenderer/VulkanSingleFramebuffer.hpp index c3d7b3d25..688bf99ba 100644 --- a/include/Nazara/VulkanRenderer/VulkanSingleFramebuffer.hpp +++ b/include/Nazara/VulkanRenderer/VulkanSingleFramebuffer.hpp @@ -16,14 +16,14 @@ namespace Nz public: inline VulkanSingleFramebuffer(Vk::Framebuffer renderPass); VulkanSingleFramebuffer(const VulkanSingleFramebuffer&) = delete; - VulkanSingleFramebuffer(VulkanSingleFramebuffer&&) noexcept = default; + VulkanSingleFramebuffer(VulkanSingleFramebuffer&&) = delete; ~VulkanSingleFramebuffer() = default; inline Vk::Framebuffer& GetFramebuffer(); inline const Vk::Framebuffer& GetFramebuffer() const; VulkanSingleFramebuffer& operator=(const VulkanSingleFramebuffer&) = delete; - VulkanSingleFramebuffer& operator=(VulkanSingleFramebuffer&&) noexcept = default; + VulkanSingleFramebuffer& operator=(VulkanSingleFramebuffer&&) = delete; private: Vk::Framebuffer m_framebuffer; diff --git a/include/Nazara/VulkanRenderer/VulkanTexture.hpp b/include/Nazara/VulkanRenderer/VulkanTexture.hpp index 1a255aa75..32bbfa485 100644 --- a/include/Nazara/VulkanRenderer/VulkanTexture.hpp +++ b/include/Nazara/VulkanRenderer/VulkanTexture.hpp @@ -19,8 +19,8 @@ namespace Nz { public: VulkanTexture(Vk::Device& device, const TextureInfo& params); - VulkanTexture(const VulkanTexture&) = default; - VulkanTexture(VulkanTexture&&) noexcept = default; + VulkanTexture(const VulkanTexture&) = delete; + VulkanTexture(VulkanTexture&&) = delete; ~VulkanTexture(); PixelFormat GetFormat() const override; diff --git a/include/Nazara/VulkanRenderer/VulkanTextureSampler.hpp b/include/Nazara/VulkanRenderer/VulkanTextureSampler.hpp index 2ea6e549b..a5f5a8052 100644 --- a/include/Nazara/VulkanRenderer/VulkanTextureSampler.hpp +++ b/include/Nazara/VulkanRenderer/VulkanTextureSampler.hpp @@ -17,8 +17,8 @@ namespace Nz { public: VulkanTextureSampler(Vk::Device& device, TextureSamplerInfo samplerInfo); - VulkanTextureSampler(const VulkanTextureSampler&) = default; - VulkanTextureSampler(VulkanTextureSampler&&) noexcept = default; + VulkanTextureSampler(const VulkanTextureSampler&) = delete; + VulkanTextureSampler(VulkanTextureSampler&&) = delete; ~VulkanTextureSampler() = default; inline VkSampler GetSampler() const; diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.inl b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.inl index a43966dc0..64fe9a353 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.inl +++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.inl @@ -89,9 +89,13 @@ namespace Nz { if (m_device->vkSetDebugUtilsObjectNameEXT) { - VkDebugUtilsObjectNameInfoEXT debugName = { VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT }; - debugName.objectType = ObjectType; - debugName.pObjectName = name; + VkDebugUtilsObjectNameInfoEXT debugName = { + VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT, + nullptr, + ObjectType, + 0, + name + }; if constexpr (std::is_pointer_v) debugName.objectHandle = static_cast(reinterpret_cast(m_handle)); diff --git a/src/Nazara/OpenGLRenderer/OpenGLUploadPool.cpp b/src/Nazara/OpenGLRenderer/OpenGLUploadPool.cpp index 454c75840..54901ee8d 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLUploadPool.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLUploadPool.cpp @@ -27,7 +27,6 @@ namespace Nz for (Block& block : m_blocks) { - UInt64 alignedOffset = block.freeOffset; if (block.freeOffset + size > m_blockSize) continue; //< Not enough space diff --git a/src/Nazara/Physics2D/PhysWorld2D.cpp b/src/Nazara/Physics2D/PhysWorld2D.cpp index d7d9552af..2704606de 100644 --- a/src/Nazara/Physics2D/PhysWorld2D.cpp +++ b/src/Nazara/Physics2D/PhysWorld2D.cpp @@ -418,7 +418,7 @@ namespace Nz } else { - handler->beginFunc = [](cpArbiter* arb, cpSpace* space, void*) -> cpBool + handler->beginFunc = [](cpArbiter*, cpSpace*, void*) -> cpBool { return cpTrue; }; @@ -444,7 +444,7 @@ namespace Nz } else { - handler->separateFunc = [](cpArbiter* arb, cpSpace* space, void*) + handler->separateFunc = [](cpArbiter*, cpSpace*, void*) { }; } @@ -472,7 +472,7 @@ namespace Nz } else { - handler->preSolveFunc = [](cpArbiter* arb, cpSpace* space, void* data) -> cpBool + handler->preSolveFunc = [](cpArbiter*, cpSpace*, void*) -> cpBool { return cpTrue; }; @@ -498,7 +498,7 @@ namespace Nz } else { - handler->postSolveFunc = [](cpArbiter* arb, cpSpace* space, void* data) + handler->postSolveFunc = [](cpArbiter*, cpSpace*, void*) { }; } diff --git a/src/Nazara/Physics2D/RigidBody2D.cpp b/src/Nazara/Physics2D/RigidBody2D.cpp index 2b113d96b..409ec357f 100644 --- a/src/Nazara/Physics2D/RigidBody2D.cpp +++ b/src/Nazara/Physics2D/RigidBody2D.cpp @@ -183,7 +183,7 @@ namespace Nz { using CallbackType = decltype(callback); - auto RealCallback = [](cpBody* body, cpArbiter* arbiter, void* data) + auto RealCallback = [](cpBody* /*body*/, cpArbiter* arbiter, void* data) { CallbackType& cb = *static_cast(data); @@ -399,7 +399,6 @@ namespace Nz m_geom->GenerateShapes(this, &m_shapes); - cpSpace* space = m_world->GetHandle(); for (cpShape* shape : m_shapes) cpShapeSetUserData(shape, this); @@ -643,7 +642,6 @@ namespace Nz { UnregisterFromSpace(); - cpSpace* space = m_world->GetHandle(); for (cpShape* shape : m_shapes) cpShapeFree(shape); diff --git a/src/Nazara/Physics3D/PhysWorld3D.cpp b/src/Nazara/Physics3D/PhysWorld3D.cpp index 534b48935..b436821f1 100644 --- a/src/Nazara/Physics3D/PhysWorld3D.cpp +++ b/src/Nazara/Physics3D/PhysWorld3D.cpp @@ -11,8 +11,8 @@ namespace Nz { PhysWorld3D::PhysWorld3D() : - m_gravity(Vector3f::Zero()), m_maxStepCount(50), + m_gravity(Vector3f::Zero()), m_stepSize(0.005f), m_timestepAccumulator(0.f) { @@ -159,7 +159,7 @@ namespace Nz } } - int PhysWorld3D::OnAABBOverlap(const NewtonJoint* const contactJoint, float timestep, int threadIndex) + int PhysWorld3D::OnAABBOverlap(const NewtonJoint* const contactJoint, float /*timestep*/, int /*threadIndex*/) { RigidBody3D* bodyA = static_cast(NewtonBodyGetUserData(NewtonJointGetBody0(contactJoint))); RigidBody3D* bodyB = static_cast(NewtonBodyGetUserData(NewtonJointGetBody1(contactJoint))); @@ -186,7 +186,7 @@ namespace Nz return 1; } - void PhysWorld3D::ProcessContact(const NewtonJoint* const contactJoint, float timestep, int threadIndex) + void PhysWorld3D::ProcessContact(const NewtonJoint* const contactJoint, float /*timestep*/, int /*threadIndex*/) { RigidBody3D* bodyA = static_cast(NewtonBodyGetUserData(NewtonJointGetBody0(contactJoint))); RigidBody3D* bodyB = static_cast(NewtonBodyGetUserData(NewtonJointGetBody1(contactJoint))); diff --git a/src/Nazara/Shader/SpirvExpressionLoad.cpp b/src/Nazara/Shader/SpirvExpressionLoad.cpp index bd7c6cc55..026fefee8 100644 --- a/src/Nazara/Shader/SpirvExpressionLoad.cpp +++ b/src/Nazara/Shader/SpirvExpressionLoad.cpp @@ -82,7 +82,7 @@ namespace Nz m_value = Value { resultId }; }, - [this](std::monostate) + [](std::monostate) { throw std::runtime_error("an internal error occurred"); } diff --git a/src/Nazara/Shader/SpirvExpressionStore.cpp b/src/Nazara/Shader/SpirvExpressionStore.cpp index 85dabdf58..9123bdcf4 100644 --- a/src/Nazara/Shader/SpirvExpressionStore.cpp +++ b/src/Nazara/Shader/SpirvExpressionStore.cpp @@ -46,7 +46,6 @@ namespace Nz { UInt32 resultId = m_writer.AllocateResultId(); UInt32 pointerType = m_writer.RegisterPointerType(node.exprType, pointer.storage); //< FIXME - UInt32 typeId = m_writer.GetTypeId(node.exprType); m_writer.GetInstructions().AppendVariadic(SpirvOp::OpAccessChain, [&](const auto& appender) { diff --git a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp index 96b4b9d6c..b98b3cdf4 100644 --- a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp +++ b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp @@ -217,7 +217,7 @@ namespace Nz for (unsigned int y = 0; y < height; ++y) { for (unsigned int x = 0; x < width; ++x) - *pixels++ = (data[x/8] & ((1 << (7 - x%8)) ? 255 : 0)); + *pixels++ = (data[x/8] & ((1 << (7 - x%8) != 0) ? 255 : 0)); data += bitmap.pitch; } diff --git a/src/Nazara/Utility/Formats/OBJParser.cpp b/src/Nazara/Utility/Formats/OBJParser.cpp index 1fdb96dba..f5e7b4f76 100644 --- a/src/Nazara/Utility/Formats/OBJParser.cpp +++ b/src/Nazara/Utility/Formats/OBJParser.cpp @@ -460,15 +460,15 @@ namespace Nz if (!mesh.faces.empty()) { + const std::string& matKey = matIt.key(); mesh.name = meshIt.key(); - const std::string& matName = matIt.key(); - auto it = materials.find(matName); + auto it = materials.find(matKey); if (it == materials.end()) { mesh.material = index; - materials[matName] = index; - m_materials[index] = matName; + materials[matKey] = index; + m_materials[index] = matKey; } else mesh.material = it->second; diff --git a/src/Nazara/Utility/RichTextDrawer.cpp b/src/Nazara/Utility/RichTextDrawer.cpp index 7d00c5fe0..b11dce7b2 100644 --- a/src/Nazara/Utility/RichTextDrawer.cpp +++ b/src/Nazara/Utility/RichTextDrawer.cpp @@ -263,7 +263,7 @@ namespace Nz DisconnectFontSlots(); m_blocks = std::move(drawer.m_blocks); - m_bounds = std::move(m_bounds); + m_bounds = std::move(drawer.m_bounds); m_defaultCharacterSize = std::move(drawer.m_defaultCharacterSize); m_defaultCharacterSpacingOffset = std::move(drawer.m_defaultCharacterSpacingOffset); m_defaultColor = std::move(drawer.m_defaultColor); @@ -272,12 +272,12 @@ namespace Nz m_defaultOutlineColor = std::move(drawer.m_defaultOutlineColor); m_defaultOutlineThickness = std::move(drawer.m_defaultOutlineThickness); m_defaultStyle = std::move(drawer.m_defaultStyle); - m_drawPos = std::move(m_drawPos); + m_drawPos = std::move(drawer.m_drawPos); m_fontIndexes = std::move(drawer.m_fontIndexes); m_fonts = std::move(drawer.m_fonts); - m_glyphs = std::move(m_glyphs); - m_lines = std::move(m_lines); - m_glyphUpdated = std::move(m_glyphUpdated); + m_glyphs = std::move(drawer.m_glyphs); + m_lines = std::move(drawer.m_lines); + m_glyphUpdated = std::move(drawer.m_glyphUpdated); drawer.DisconnectFontSlots(); ConnectFontSlots(); diff --git a/src/NazaraSDK/Entity.cpp b/src/NazaraSDK/Entity.cpp index 36c2c9128..8b9f94830 100644 --- a/src/NazaraSDK/Entity.cpp +++ b/src/NazaraSDK/Entity.cpp @@ -24,8 +24,8 @@ namespace Ndk * \param id Identifier of the entity */ Entity::Entity(World* world, EntityId id) : - m_id(id), - m_world(world) + m_world(world), + m_id(id) { } diff --git a/tests/Engine/Core/StackVector.cpp b/tests/Engine/Core/StackVector.cpp index 62e67404b..ff66116da 100644 --- a/tests/Engine/Core/StackVector.cpp +++ b/tests/Engine/Core/StackVector.cpp @@ -174,9 +174,10 @@ SCENARIO("StackVector", "[CORE][STACKVECTOR]") CHECK(!vector.empty()); CHECK(vector.size() == 3); - - std::array expectedValues = { 0, 1, 2 }; - CHECK(std::equal(vector.begin(), vector.end(), expectedValues.begin(), expectedValues.end())); + { + std::array expectedValues = { 0, 1, 2 }; + CHECK(std::equal(vector.begin(), vector.end(), expectedValues.begin(), expectedValues.end())); + } THEN("We resize to five") { @@ -212,9 +213,11 @@ SCENARIO("StackVector", "[CORE][STACKVECTOR]") for (std::size_t i = 0; i < vector.size(); ++i) vector[i] = DestructionCounter(&counter, -5 + int(i)); - std::array expectedValues = { -5, -4, -3, -2, -1, 0, 1, 2, 3, 4 }; - CHECK(vector.size() == expectedValues.size()); - CHECK(std::equal(vector.begin(), vector.end(), expectedValues.begin(), expectedValues.end())); + { + std::array expectedValues = { -5, -4, -3, -2, -1, 0, 1, 2, 3, 4 }; + CHECK(vector.size() == expectedValues.size()); + CHECK(std::equal(vector.begin(), vector.end(), expectedValues.begin(), expectedValues.end())); + } AND_WHEN("We pop back some elements") {