diff --git a/include/Nazara/Audio/AudioDevice.hpp b/include/Nazara/Audio/AudioDevice.hpp index 9caeaf12b..6b872229f 100644 --- a/include/Nazara/Audio/AudioDevice.hpp +++ b/include/Nazara/Audio/AudioDevice.hpp @@ -26,7 +26,7 @@ namespace Nz public: AudioDevice() = default; AudioDevice(const AudioDevice&) = delete; - AudioDevice(AudioDevice&&) = default; + AudioDevice(AudioDevice&&) = delete; virtual ~AudioDevice(); virtual std::shared_ptr CreateBuffer() = 0; @@ -52,7 +52,7 @@ namespace Nz virtual void SetSpeedOfSound(float speed) = 0; AudioDevice& operator=(const AudioDevice&) = delete; - AudioDevice& operator=(AudioDevice&&) = default; + AudioDevice& operator=(AudioDevice&&) = delete; NazaraSignal(OnAudioDeviceRelease, AudioDevice* /*audioDevice*/); }; diff --git a/include/Nazara/Audio/DummyAudioDevice.hpp b/include/Nazara/Audio/DummyAudioDevice.hpp index f3b64cc13..b76a67929 100644 --- a/include/Nazara/Audio/DummyAudioDevice.hpp +++ b/include/Nazara/Audio/DummyAudioDevice.hpp @@ -21,7 +21,7 @@ namespace Nz public: DummyAudioDevice(); DummyAudioDevice(const DummyAudioDevice&) = delete; - DummyAudioDevice(DummyAudioDevice&&) = default; + DummyAudioDevice(DummyAudioDevice&&) = delete; ~DummyAudioDevice() = default; std::shared_ptr CreateBuffer() override; @@ -46,7 +46,7 @@ namespace Nz void SetSpeedOfSound(float speed) override; DummyAudioDevice& operator=(const DummyAudioDevice&) = delete; - DummyAudioDevice& operator=(DummyAudioDevice&&) = default; + DummyAudioDevice& operator=(DummyAudioDevice&&) = delete; private: Quaternionf m_listenerRotation; diff --git a/include/Nazara/Audio/Music.hpp b/include/Nazara/Audio/Music.hpp index 38b4ef733..123e7e845 100644 --- a/include/Nazara/Audio/Music.hpp +++ b/include/Nazara/Audio/Music.hpp @@ -28,7 +28,7 @@ namespace Nz Music(); Music(AudioDevice& device); Music(const Music&) = delete; - Music(Music&&) noexcept = default; + Music(Music&&) = delete; ~Music(); bool Create(std::shared_ptr soundStream); @@ -57,7 +57,7 @@ namespace Nz void Stop() override; Music& operator=(const Music&) = delete; - Music& operator=(Music&&) noexcept = default; + Music& operator=(Music&&) = delete; private: AudioFormat m_audioFormat; diff --git a/include/Nazara/Audio/OpenALDevice.hpp b/include/Nazara/Audio/OpenALDevice.hpp index 78c4d8966..84572e4d7 100644 --- a/include/Nazara/Audio/OpenALDevice.hpp +++ b/include/Nazara/Audio/OpenALDevice.hpp @@ -39,7 +39,7 @@ namespace Nz public: OpenALDevice(OpenALLibrary& library, ALCdevice* device); OpenALDevice(const OpenALDevice&) = delete; - OpenALDevice(OpenALDevice&&) = default; + OpenALDevice(OpenALDevice&&) = delete; ~OpenALDevice(); std::shared_ptr CreateBuffer() override; @@ -69,7 +69,7 @@ namespace Nz inline ALenum TranslateAudioFormat(AudioFormat format) const; OpenALDevice& operator=(const OpenALDevice&) = delete; - OpenALDevice& operator=(OpenALDevice&&) = default; + OpenALDevice& operator=(OpenALDevice&&) = delete; private: std::array m_audioFormatValues; diff --git a/include/Nazara/Audio/Sound.hpp b/include/Nazara/Audio/Sound.hpp index 560b5cb14..f9362582a 100644 --- a/include/Nazara/Audio/Sound.hpp +++ b/include/Nazara/Audio/Sound.hpp @@ -20,7 +20,7 @@ namespace Nz using SoundEmitter::SoundEmitter; Sound(); Sound(AudioDevice& audioDevice, std::shared_ptr soundBuffer); - Sound(const Sound&) = default; + Sound(const Sound&) = delete; Sound(Sound&&) = default; ~Sound(); @@ -46,7 +46,7 @@ namespace Nz void Stop() override; - Sound& operator=(const Sound&) = default; + Sound& operator=(const Sound&) = delete; Sound& operator=(Sound&&) = default; private: diff --git a/include/Nazara/Audio/SoundEmitter.hpp b/include/Nazara/Audio/SoundEmitter.hpp index eca2fd366..2e74b3c82 100644 --- a/include/Nazara/Audio/SoundEmitter.hpp +++ b/include/Nazara/Audio/SoundEmitter.hpp @@ -57,7 +57,7 @@ namespace Nz virtual void Stop() = 0; - SoundEmitter& operator=(const SoundEmitter&) = delete; + SoundEmitter& operator=(const SoundEmitter&) = default; SoundEmitter& operator=(SoundEmitter&&) noexcept = default; protected: diff --git a/include/Nazara/Graphics/InstancedRenderable.hpp b/include/Nazara/Graphics/InstancedRenderable.hpp index ffef3f987..a99160b51 100644 --- a/include/Nazara/Graphics/InstancedRenderable.hpp +++ b/include/Nazara/Graphics/InstancedRenderable.hpp @@ -31,7 +31,7 @@ namespace Nz inline InstancedRenderable(); InstancedRenderable(const InstancedRenderable&) = delete; InstancedRenderable(InstancedRenderable&&) noexcept = default; - ~InstancedRenderable(); + virtual ~InstancedRenderable(); virtual void BuildElement(ElementRendererRegistry& registry, const ElementData& elementData, std::size_t passIndex, std::vector& elements) const = 0; diff --git a/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp index ae8b1330e..fe8c166a8 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp @@ -18,19 +18,12 @@ namespace Nz { public: using Framebuffer::Framebuffer; - OpenGLFramebuffer() = default; - OpenGLFramebuffer(const OpenGLFramebuffer&) = delete; - OpenGLFramebuffer(OpenGLFramebuffer&&) noexcept = default; - ~OpenGLFramebuffer() = default; virtual void Activate() const = 0; virtual std::size_t GetColorBufferCount() const = 0; virtual const Vector2ui& GetSize() const = 0; - - OpenGLFramebuffer& operator=(const OpenGLFramebuffer&) = delete; - OpenGLFramebuffer& operator=(OpenGLFramebuffer&&) noexcept = default; }; } diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp index cbbc0178f..1225ae214 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp @@ -21,9 +21,6 @@ namespace Nz { public: OpenGLRenderImage(OpenGLRenderWindow& owner); - OpenGLRenderImage(const OpenGLRenderImage&) = delete; - OpenGLRenderImage(OpenGLRenderImage&&) noexcept = default; - ~OpenGLRenderImage() = default; void Execute(const std::function& callback, QueueTypeFlags queueTypeFlags) override; @@ -33,9 +30,6 @@ namespace Nz void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) override; - OpenGLRenderImage& operator=(const OpenGLRenderImage&) = delete; - OpenGLRenderImage& operator=(OpenGLRenderImage&&) = delete; - private: OpenGLRenderWindow& m_owner; OpenGLUploadPool m_uploadPool; diff --git a/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp b/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp index 3698dd2c4..f5472589d 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp +++ b/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp @@ -26,17 +26,11 @@ namespace Nz OpenGLShaderModule(OpenGLDevice& device, nzsl::ShaderStageTypeFlags shaderStages, const nzsl::Ast::Module& shaderModule, const nzsl::ShaderWriter::States& states = {}); OpenGLShaderModule(OpenGLDevice& device, nzsl::ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const nzsl::ShaderWriter::States& states = {}); - OpenGLShaderModule(const OpenGLShaderModule&) = delete; - OpenGLShaderModule(OpenGLShaderModule&&) noexcept = default; - ~OpenGLShaderModule() = default; nzsl::ShaderStageTypeFlags Attach(GL::Program& program, const nzsl::GlslWriter::BindingMapping& bindingMapping, std::vector* explicitBindings) const; inline const std::vector& GetExplicitBindings() const; - OpenGLShaderModule& operator=(const OpenGLShaderModule&) = delete; - OpenGLShaderModule& operator=(OpenGLShaderModule&&) noexcept = default; - struct ExplicitBinding { std::string name; diff --git a/include/Nazara/VulkanRenderer/VulkanFramebuffer.hpp b/include/Nazara/VulkanRenderer/VulkanFramebuffer.hpp index 5d0922777..3fac85152 100644 --- a/include/Nazara/VulkanRenderer/VulkanFramebuffer.hpp +++ b/include/Nazara/VulkanRenderer/VulkanFramebuffer.hpp @@ -18,14 +18,8 @@ namespace Nz { public: using Framebuffer::Framebuffer; - VulkanFramebuffer(const VulkanFramebuffer&) = delete; - VulkanFramebuffer(VulkanFramebuffer&&) noexcept = default; - ~VulkanFramebuffer() = default; virtual const Vk::Framebuffer& GetFramebuffer() const = 0; - - VulkanFramebuffer& operator=(const VulkanFramebuffer&) = delete; - VulkanFramebuffer& operator=(VulkanFramebuffer&&) noexcept = default; }; } diff --git a/include/Nazara/VulkanRenderer/VulkanRenderImage.hpp b/include/Nazara/VulkanRenderer/VulkanRenderImage.hpp index a6c83b054..82cb4fe12 100644 --- a/include/Nazara/VulkanRenderer/VulkanRenderImage.hpp +++ b/include/Nazara/VulkanRenderer/VulkanRenderImage.hpp @@ -25,7 +25,7 @@ namespace Nz public: VulkanRenderImage(VulkanRenderWindow& owner); VulkanRenderImage(const VulkanRenderImage&) = delete; - VulkanRenderImage(VulkanRenderImage&&) noexcept = default; + VulkanRenderImage(VulkanRenderImage&&) = delete; ~VulkanRenderImage(); void Execute(const std::function& callback, QueueTypeFlags queueTypeFlags) override; diff --git a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp index c059ec3ea..c4e52bec9 100644 --- a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp +++ b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp @@ -22,20 +22,12 @@ namespace Nz public: struct Stage; - VulkanShaderModule() = default; - VulkanShaderModule(const VulkanShaderModule&) = delete; - VulkanShaderModule(VulkanShaderModule&&) = delete; - ~VulkanShaderModule() = default; - bool Create(Vk::Device& device, nzsl::ShaderStageTypeFlags shaderStages, const nzsl::Ast::Module& shaderModule, const nzsl::ShaderWriter::States& states); bool Create(Vk::Device& device, nzsl::ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const nzsl::ShaderWriter::States& states); inline const Vk::ShaderModule& GetHandle() const; inline const std::vector& GetStages() const; - VulkanShaderModule& operator=(const VulkanShaderModule&) = delete; - VulkanShaderModule& operator=(VulkanShaderModule&&) = delete; - struct Stage { nzsl::ShaderStageType stage; diff --git a/include/Nazara/Widgets/AbstractTextAreaWidget.hpp b/include/Nazara/Widgets/AbstractTextAreaWidget.hpp index 151166284..191724023 100644 --- a/include/Nazara/Widgets/AbstractTextAreaWidget.hpp +++ b/include/Nazara/Widgets/AbstractTextAreaWidget.hpp @@ -23,7 +23,7 @@ namespace Nz AbstractTextAreaWidget(BaseWidget* parent); AbstractTextAreaWidget(const AbstractTextAreaWidget&) = delete; - AbstractTextAreaWidget(AbstractTextAreaWidget&&) = default; + AbstractTextAreaWidget(AbstractTextAreaWidget&&) = delete; ~AbstractTextAreaWidget() = default; virtual void Clear(); @@ -69,7 +69,7 @@ namespace Nz virtual void Write(const std::string& text, std::size_t glyphPosition) = 0; AbstractTextAreaWidget& operator=(const AbstractTextAreaWidget&) = delete; - AbstractTextAreaWidget& operator=(AbstractTextAreaWidget&&) = default; + AbstractTextAreaWidget& operator=(AbstractTextAreaWidget&&) = delete; NazaraSignal(OnTextAreaCursorMove, const AbstractTextAreaWidget* /*textArea*/, Vector2ui* /*newCursorPosition*/); NazaraSignal(OnTextAreaKeyBackspace, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/); diff --git a/include/Nazara/Widgets/CheckboxWidget.hpp b/include/Nazara/Widgets/CheckboxWidget.hpp index 1ed303dce..b4ec4771d 100644 --- a/include/Nazara/Widgets/CheckboxWidget.hpp +++ b/include/Nazara/Widgets/CheckboxWidget.hpp @@ -21,7 +21,7 @@ namespace Nz public: CheckboxWidget(BaseWidget* parent); CheckboxWidget(const CheckboxWidget&) = delete; - CheckboxWidget(CheckboxWidget&&) = default; + CheckboxWidget(CheckboxWidget&&) = delete; ~CheckboxWidget() = default; inline void EnableTristate(bool enabled); @@ -34,7 +34,7 @@ namespace Nz inline void SwitchToNextState(); CheckboxWidget& operator=(const CheckboxWidget&) = delete; - CheckboxWidget& operator=(CheckboxWidget&&) = default; + CheckboxWidget& operator=(CheckboxWidget&&) = delete; NazaraSignal(OnCheckboxStateUpdate, const CheckboxWidget* /*button*/, CheckboxState /*newState*/); diff --git a/include/Nazara/Widgets/ImageButtonWidget.hpp b/include/Nazara/Widgets/ImageButtonWidget.hpp index 5bf2e1917..15f8c5456 100644 --- a/include/Nazara/Widgets/ImageButtonWidget.hpp +++ b/include/Nazara/Widgets/ImageButtonWidget.hpp @@ -24,7 +24,7 @@ namespace Nz inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr material, float cornerSize, float cornerTexCoords); ImageButtonWidget(BaseWidget* parent, std::shared_ptr material, std::shared_ptr hoveredMaterial, std::shared_ptr pressedMaterial, float cornerSize, float cornerTexCoords); ImageButtonWidget(const ImageButtonWidget&) = delete; - ImageButtonWidget(ImageButtonWidget&&) = default; + ImageButtonWidget(ImageButtonWidget&&) = delete; ~ImageButtonWidget() = default; inline const Color& GetColor() const; @@ -43,7 +43,7 @@ namespace Nz inline void SetTextureCoords(const Rectf& coords); ImageButtonWidget& operator=(const ImageButtonWidget&) = delete; - ImageButtonWidget& operator=(ImageButtonWidget&&) = default; + ImageButtonWidget& operator=(ImageButtonWidget&&) = delete; NazaraSignal(OnButtonTrigger, const ImageButtonWidget* /*button*/); diff --git a/include/Nazara/Widgets/ImageWidget.hpp b/include/Nazara/Widgets/ImageWidget.hpp index b15587ebe..76325a853 100644 --- a/include/Nazara/Widgets/ImageWidget.hpp +++ b/include/Nazara/Widgets/ImageWidget.hpp @@ -19,7 +19,7 @@ namespace Nz public: ImageWidget(BaseWidget* parent, std::shared_ptr material); ImageWidget(const ImageWidget&) = delete; - ImageWidget(ImageWidget&&) = default; + ImageWidget(ImageWidget&&) = delete; ~ImageWidget() = default; inline const Color& GetColor() const; @@ -32,7 +32,7 @@ namespace Nz inline void SetTextureRect(const Rectf& rect); ImageWidget& operator=(const ImageWidget&) = delete; - ImageWidget& operator=(ImageWidget&&) = default; + ImageWidget& operator=(ImageWidget&&) = delete; private: void Layout() override; diff --git a/include/Nazara/Widgets/LabelWidget.hpp b/include/Nazara/Widgets/LabelWidget.hpp index 5698f0898..02f273f8f 100644 --- a/include/Nazara/Widgets/LabelWidget.hpp +++ b/include/Nazara/Widgets/LabelWidget.hpp @@ -21,13 +21,13 @@ namespace Nz public: LabelWidget(BaseWidget* parent); LabelWidget(const LabelWidget&) = delete; - LabelWidget(LabelWidget&&) = default; + LabelWidget(LabelWidget&&) = delete; ~LabelWidget() = default; void UpdateText(const AbstractTextDrawer& drawer); LabelWidget& operator=(const LabelWidget&) = delete; - LabelWidget& operator=(LabelWidget&&) = default; + LabelWidget& operator=(LabelWidget&&) = delete; private: void OnMouseEnter() override; diff --git a/include/Nazara/Widgets/RichTextAreaWidget.hpp b/include/Nazara/Widgets/RichTextAreaWidget.hpp index 3d7438552..04b953276 100644 --- a/include/Nazara/Widgets/RichTextAreaWidget.hpp +++ b/include/Nazara/Widgets/RichTextAreaWidget.hpp @@ -17,7 +17,7 @@ namespace Nz public: RichTextAreaWidget(BaseWidget* parent); RichTextAreaWidget(const RichTextAreaWidget&) = delete; - RichTextAreaWidget(RichTextAreaWidget&&) = default; + RichTextAreaWidget(RichTextAreaWidget&&) = delete; ~RichTextAreaWidget() = default; void AppendText(const std::string& text); @@ -47,7 +47,7 @@ namespace Nz void Write(const std::string& text, std::size_t glyphPosition) override; RichTextAreaWidget& operator=(const RichTextAreaWidget&) = delete; - RichTextAreaWidget& operator=(RichTextAreaWidget&&) = default; + RichTextAreaWidget& operator=(RichTextAreaWidget&&) = delete; private: void CopySelectionToClipboard(const Vector2ui& selectionBegin, const Vector2ui& selectionEnd) override; diff --git a/include/Nazara/Widgets/ScrollAreaWidget.hpp b/include/Nazara/Widgets/ScrollAreaWidget.hpp index 5fb81a44f..f9a62e04a 100644 --- a/include/Nazara/Widgets/ScrollAreaWidget.hpp +++ b/include/Nazara/Widgets/ScrollAreaWidget.hpp @@ -20,7 +20,7 @@ namespace Nz public: ScrollAreaWidget(BaseWidget* parent, BaseWidget* content); ScrollAreaWidget(const ScrollAreaWidget&) = delete; - ScrollAreaWidget(ScrollAreaWidget&&) = default; + ScrollAreaWidget(ScrollAreaWidget&&) = delete; ~ScrollAreaWidget() = default; void EnableScrollbar(bool enable); @@ -36,7 +36,7 @@ namespace Nz void ScrollToRatio(float ratio); ScrollAreaWidget& operator=(const ScrollAreaWidget&) = delete; - ScrollAreaWidget& operator=(ScrollAreaWidget&&) = default; + ScrollAreaWidget& operator=(ScrollAreaWidget&&) = delete; private: void Layout() override; diff --git a/include/Nazara/Widgets/ScrollbarWidget.hpp b/include/Nazara/Widgets/ScrollbarWidget.hpp index d7b4f39df..2fdbc53d7 100644 --- a/include/Nazara/Widgets/ScrollbarWidget.hpp +++ b/include/Nazara/Widgets/ScrollbarWidget.hpp @@ -40,7 +40,7 @@ namespace Nz void OnMouseEnter() override; void OnMouseExit() override; - void OnRenderLayerUpdated(int baseRenderLayer); + void OnRenderLayerUpdated(int baseRenderLayer) override; std::unique_ptr m_style; ImageButtonWidget* m_scrollBackButton; diff --git a/include/Nazara/Widgets/TextAreaWidget.hpp b/include/Nazara/Widgets/TextAreaWidget.hpp index bc2161842..01ca0f8d3 100644 --- a/include/Nazara/Widgets/TextAreaWidget.hpp +++ b/include/Nazara/Widgets/TextAreaWidget.hpp @@ -17,7 +17,7 @@ namespace Nz public: TextAreaWidget(BaseWidget* parent); TextAreaWidget(const TextAreaWidget&) = delete; - TextAreaWidget(TextAreaWidget&&) = default; + TextAreaWidget(TextAreaWidget&&) = delete; ~TextAreaWidget() = default; void AppendText(const std::string& text); @@ -52,7 +52,7 @@ namespace Nz void Write(const std::string& text, std::size_t glyphPosition) override; TextAreaWidget& operator=(const TextAreaWidget&) = delete; - TextAreaWidget& operator=(TextAreaWidget&&) = default; + TextAreaWidget& operator=(TextAreaWidget&&) = delete; NazaraSignal(OnTextChanged, const AbstractTextAreaWidget* /*textArea*/, const std::string& /*text*/); diff --git a/plugins/Assimp/Plugin.cpp b/plugins/Assimp/Plugin.cpp index fc1870f0e..f7008e36c 100644 --- a/plugins/Assimp/Plugin.cpp +++ b/plugins/Assimp/Plugin.cpp @@ -476,10 +476,7 @@ std::shared_ptr ProcessSubMesh(const std::filesystem::path& originP if (meshData->HasVertexColors(0)) { for (unsigned int vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex) - { - aiColor4D color = meshData->mColors[0][vertexIndex]; *colorPtr++ = FromAssimp(meshData->mColors[0][vertexIndex]); - } } else { diff --git a/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp b/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp index a2fa64fee..f1ace3a42 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp @@ -143,12 +143,13 @@ namespace Nz::GL return context; } - std::unique_ptr EGLLoader::CreateContext(const OpenGLDevice* device, const ContextParams& params, WindowHandle handle, Context* shareContext) const + std::unique_ptr EGLLoader::CreateContext([[maybe_unused]] const OpenGLDevice* device, const ContextParams& params, WindowHandle handle, Context* shareContext) const { std::unique_ptr context; switch (handle.type) { case WindowBackend::Invalid: + case WindowBackend::Cocoa: //< TODO? break; case WindowBackend::X11: diff --git a/src/Nazara/Utility/Node.cpp b/src/Nazara/Utility/Node.cpp index 83519db66..f1980996d 100644 --- a/src/Nazara/Utility/Node.cpp +++ b/src/Nazara/Utility/Node.cpp @@ -43,6 +43,9 @@ namespace Nz } Node::Node(Node&& node) noexcept : + OnNodeInvalidation(std::move(node.OnNodeInvalidation)), + OnNodeNewParent(std::move(node.OnNodeNewParent)), + OnNodeRelease(std::move(node.OnNodeRelease)), m_childs(std::move(node.m_childs)), m_initialRotation(node.m_initialRotation), m_rotation(node.m_rotation), @@ -55,10 +58,7 @@ namespace Nz m_inheritPosition(node.m_inheritPosition), m_inheritRotation(node.m_inheritRotation), m_inheritScale(node.m_inheritScale), - m_transformMatrixUpdated(false), - OnNodeInvalidation(std::move(node.OnNodeInvalidation)), - OnNodeNewParent(std::move(node.OnNodeNewParent)), - OnNodeRelease(std::move(node.OnNodeRelease)) + m_transformMatrixUpdated(false) { if (m_parent) { diff --git a/src/Nazara/Utility/Systems/SkeletonSystem.cpp b/src/Nazara/Utility/Systems/SkeletonSystem.cpp index 5b0a28b87..29d854ad4 100644 --- a/src/Nazara/Utility/Systems/SkeletonSystem.cpp +++ b/src/Nazara/Utility/Systems/SkeletonSystem.cpp @@ -39,8 +39,6 @@ namespace Nz SkeletonComponent& entitySkeleton = m_registry.get(entity); // TODO: When attaching for the first time, set the skeleton to the position of the node before attaching the node - Node* skeletonRoot = entitySkeleton.GetRootNode(); - entityNode.SetParent(entitySkeleton.GetRootNode()); }); diff --git a/src/Nazara/Utility/VertexBuffer.cpp b/src/Nazara/Utility/VertexBuffer.cpp index bb5ccfa67..d040a59c7 100644 --- a/src/Nazara/Utility/VertexBuffer.cpp +++ b/src/Nazara/Utility/VertexBuffer.cpp @@ -35,8 +35,8 @@ namespace Nz VertexBuffer::VertexBuffer(std::shared_ptr vertexDeclaration, UInt32 vertexCount, BufferUsageFlags usage, const BufferFactory& bufferFactory, const void* initialData) : m_vertexDeclaration(std::move(vertexDeclaration)), - m_startOffset(0), - m_vertexCount(vertexCount) + m_vertexCount(vertexCount), + m_startOffset(0) { NazaraAssert(m_vertexDeclaration, "invalid vertex declaration"); NazaraAssert(vertexCount > 0, "invalid vertex count"); diff --git a/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp b/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp index 43d8abefc..ea2ad6ce4 100644 --- a/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp +++ b/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp @@ -119,7 +119,7 @@ namespace Nz return createInfo; } - std::vector VulkanRenderPipeline::BuildDynamicStateList(const RenderPipelineInfo& pipelineInfo) + std::vector VulkanRenderPipeline::BuildDynamicStateList(const RenderPipelineInfo& /*pipelineInfo*/) { std::vector dynamicStates; dynamicStates.push_back(VK_DYNAMIC_STATE_VIEWPORT); @@ -160,7 +160,7 @@ namespace Nz return createInfo; } - VkPipelineViewportStateCreateInfo VulkanRenderPipeline::BuildViewportInfo(const RenderPipelineInfo& pipelineInfo) + VkPipelineViewportStateCreateInfo VulkanRenderPipeline::BuildViewportInfo(const RenderPipelineInfo& /*pipelineInfo*/) { VkPipelineViewportStateCreateInfo createInfo = {}; createInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; diff --git a/src/Nazara/Widgets/BoxLayout.cpp b/src/Nazara/Widgets/BoxLayout.cpp index 1cd00c65c..0c0f5c098 100644 --- a/src/Nazara/Widgets/BoxLayout.cpp +++ b/src/Nazara/Widgets/BoxLayout.cpp @@ -77,12 +77,12 @@ namespace Nz m_state->sizeVar.emplace_back(); auto& sizeVar = m_state->sizeVar.back(); - m_state->solver.addConstraint({ sizeVar >= minimumSize | kiwi::strength::required }); + m_state->solver.addConstraint({ (sizeVar >= minimumSize) | kiwi::strength::required }); if (maximumSize < std::numeric_limits::infinity()) - m_state->solver.addConstraint({ sizeVar <= maximumSize | kiwi::strength::required }); + m_state->solver.addConstraint({ (sizeVar <= maximumSize) | kiwi::strength::required }); - m_state->solver.addConstraint({ sizeVar >= perfectSpacePerWidget | kiwi::strength::medium }); + m_state->solver.addConstraint({ (sizeVar >= perfectSpacePerWidget) | kiwi::strength::medium }); sizeSum = sizeSum + sizeVar; }); diff --git a/src/Nazara/Widgets/Canvas.cpp b/src/Nazara/Widgets/Canvas.cpp index f49feee53..a89bf84f1 100644 --- a/src/Nazara/Widgets/Canvas.cpp +++ b/src/Nazara/Widgets/Canvas.cpp @@ -150,7 +150,7 @@ namespace Nz UpdateHoveredWidget(event.x, event.y); } - void Canvas::OnEventMouseEntered(const EventHandler* eventHandler) + void Canvas::OnEventMouseEntered(const EventHandler* /*eventHandler*/) { // Keep previous mouse states but not new ones if (m_mouseOwner != InvalidCanvasIndex) diff --git a/src/Nazara/Widgets/DefaultWidgetTheme.cpp b/src/Nazara/Widgets/DefaultWidgetTheme.cpp index 7e8325bca..6564fa7d0 100644 --- a/src/Nazara/Widgets/DefaultWidgetTheme.cpp +++ b/src/Nazara/Widgets/DefaultWidgetTheme.cpp @@ -238,7 +238,7 @@ namespace Nz std::unique_ptr DefaultWidgetTheme::CreateStyle(ScrollAreaWidget* scrollAreaWidget) const { - return nullptr; + return nullptr; //< TODO } std::unique_ptr DefaultWidgetTheme::CreateStyle(ScrollbarWidget* scrollBarWidget) const diff --git a/src/Nazara/Widgets/ScrollbarButtonWidget.cpp b/src/Nazara/Widgets/ScrollbarButtonWidget.cpp index 7142f8744..84c74d19c 100644 --- a/src/Nazara/Widgets/ScrollbarButtonWidget.cpp +++ b/src/Nazara/Widgets/ScrollbarButtonWidget.cpp @@ -37,7 +37,7 @@ namespace Nz return false; } - bool ScrollbarButtonWidget::OnMouseButtonRelease(int x, int y, Mouse::Button button) + bool ScrollbarButtonWidget::OnMouseButtonRelease(int /*x*/, int /*y*/, Mouse::Button button) { if (button == Mouse::Left) { diff --git a/src/Nazara/Widgets/SimpleWidgetStyles.cpp b/src/Nazara/Widgets/SimpleWidgetStyles.cpp index cd8e2f412..6453448d8 100644 --- a/src/Nazara/Widgets/SimpleWidgetStyles.cpp +++ b/src/Nazara/Widgets/SimpleWidgetStyles.cpp @@ -416,12 +416,6 @@ namespace Nz void SimpleScrollbarWidgetStyle::Layout(const Vector2f& size) { - float totalSize; - if (GetOwnerWidget()->GetOrientation() == ScrollbarOrientation::Horizontal) - totalSize = size.x; - else - totalSize = size.y; - m_backgroundScrollbarSprite->SetSize(size); } diff --git a/src/Nazara/Widgets/TextAreaWidget.cpp b/src/Nazara/Widgets/TextAreaWidget.cpp index d9a7f27b3..d243ab0b9 100644 --- a/src/Nazara/Widgets/TextAreaWidget.cpp +++ b/src/Nazara/Widgets/TextAreaWidget.cpp @@ -247,7 +247,7 @@ namespace Nz } } - void TextAreaWidget::HandleWordSelection(const Vector2ui& position) + void TextAreaWidget::HandleWordSelection(const Vector2ui& /*position*/) { NAZARA_USE_ANONYMOUS_NAMESPACE