Fix a bunch of warnings
This commit is contained in:
parent
71c5133c7a
commit
842e797cc4
|
|
@ -26,7 +26,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
AudioDevice() = default;
|
AudioDevice() = default;
|
||||||
AudioDevice(const AudioDevice&) = delete;
|
AudioDevice(const AudioDevice&) = delete;
|
||||||
AudioDevice(AudioDevice&&) = default;
|
AudioDevice(AudioDevice&&) = delete;
|
||||||
virtual ~AudioDevice();
|
virtual ~AudioDevice();
|
||||||
|
|
||||||
virtual std::shared_ptr<AudioBuffer> CreateBuffer() = 0;
|
virtual std::shared_ptr<AudioBuffer> CreateBuffer() = 0;
|
||||||
|
|
@ -52,7 +52,7 @@ namespace Nz
|
||||||
virtual void SetSpeedOfSound(float speed) = 0;
|
virtual void SetSpeedOfSound(float speed) = 0;
|
||||||
|
|
||||||
AudioDevice& operator=(const AudioDevice&) = delete;
|
AudioDevice& operator=(const AudioDevice&) = delete;
|
||||||
AudioDevice& operator=(AudioDevice&&) = default;
|
AudioDevice& operator=(AudioDevice&&) = delete;
|
||||||
|
|
||||||
NazaraSignal(OnAudioDeviceRelease, AudioDevice* /*audioDevice*/);
|
NazaraSignal(OnAudioDeviceRelease, AudioDevice* /*audioDevice*/);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
DummyAudioDevice();
|
DummyAudioDevice();
|
||||||
DummyAudioDevice(const DummyAudioDevice&) = delete;
|
DummyAudioDevice(const DummyAudioDevice&) = delete;
|
||||||
DummyAudioDevice(DummyAudioDevice&&) = default;
|
DummyAudioDevice(DummyAudioDevice&&) = delete;
|
||||||
~DummyAudioDevice() = default;
|
~DummyAudioDevice() = default;
|
||||||
|
|
||||||
std::shared_ptr<AudioBuffer> CreateBuffer() override;
|
std::shared_ptr<AudioBuffer> CreateBuffer() override;
|
||||||
|
|
@ -46,7 +46,7 @@ namespace Nz
|
||||||
void SetSpeedOfSound(float speed) override;
|
void SetSpeedOfSound(float speed) override;
|
||||||
|
|
||||||
DummyAudioDevice& operator=(const DummyAudioDevice&) = delete;
|
DummyAudioDevice& operator=(const DummyAudioDevice&) = delete;
|
||||||
DummyAudioDevice& operator=(DummyAudioDevice&&) = default;
|
DummyAudioDevice& operator=(DummyAudioDevice&&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Quaternionf m_listenerRotation;
|
Quaternionf m_listenerRotation;
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ namespace Nz
|
||||||
Music();
|
Music();
|
||||||
Music(AudioDevice& device);
|
Music(AudioDevice& device);
|
||||||
Music(const Music&) = delete;
|
Music(const Music&) = delete;
|
||||||
Music(Music&&) noexcept = default;
|
Music(Music&&) = delete;
|
||||||
~Music();
|
~Music();
|
||||||
|
|
||||||
bool Create(std::shared_ptr<SoundStream> soundStream);
|
bool Create(std::shared_ptr<SoundStream> soundStream);
|
||||||
|
|
@ -57,7 +57,7 @@ namespace Nz
|
||||||
void Stop() override;
|
void Stop() override;
|
||||||
|
|
||||||
Music& operator=(const Music&) = delete;
|
Music& operator=(const Music&) = delete;
|
||||||
Music& operator=(Music&&) noexcept = default;
|
Music& operator=(Music&&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
AudioFormat m_audioFormat;
|
AudioFormat m_audioFormat;
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
OpenALDevice(OpenALLibrary& library, ALCdevice* device);
|
OpenALDevice(OpenALLibrary& library, ALCdevice* device);
|
||||||
OpenALDevice(const OpenALDevice&) = delete;
|
OpenALDevice(const OpenALDevice&) = delete;
|
||||||
OpenALDevice(OpenALDevice&&) = default;
|
OpenALDevice(OpenALDevice&&) = delete;
|
||||||
~OpenALDevice();
|
~OpenALDevice();
|
||||||
|
|
||||||
std::shared_ptr<AudioBuffer> CreateBuffer() override;
|
std::shared_ptr<AudioBuffer> CreateBuffer() override;
|
||||||
|
|
@ -69,7 +69,7 @@ namespace Nz
|
||||||
inline ALenum TranslateAudioFormat(AudioFormat format) const;
|
inline ALenum TranslateAudioFormat(AudioFormat format) const;
|
||||||
|
|
||||||
OpenALDevice& operator=(const OpenALDevice&) = delete;
|
OpenALDevice& operator=(const OpenALDevice&) = delete;
|
||||||
OpenALDevice& operator=(OpenALDevice&&) = default;
|
OpenALDevice& operator=(OpenALDevice&&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::array<ALenum, AudioFormatCount> m_audioFormatValues;
|
std::array<ALenum, AudioFormatCount> m_audioFormatValues;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ namespace Nz
|
||||||
using SoundEmitter::SoundEmitter;
|
using SoundEmitter::SoundEmitter;
|
||||||
Sound();
|
Sound();
|
||||||
Sound(AudioDevice& audioDevice, std::shared_ptr<SoundBuffer> soundBuffer);
|
Sound(AudioDevice& audioDevice, std::shared_ptr<SoundBuffer> soundBuffer);
|
||||||
Sound(const Sound&) = default;
|
Sound(const Sound&) = delete;
|
||||||
Sound(Sound&&) = default;
|
Sound(Sound&&) = default;
|
||||||
~Sound();
|
~Sound();
|
||||||
|
|
||||||
|
|
@ -46,7 +46,7 @@ namespace Nz
|
||||||
|
|
||||||
void Stop() override;
|
void Stop() override;
|
||||||
|
|
||||||
Sound& operator=(const Sound&) = default;
|
Sound& operator=(const Sound&) = delete;
|
||||||
Sound& operator=(Sound&&) = default;
|
Sound& operator=(Sound&&) = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ namespace Nz
|
||||||
|
|
||||||
virtual void Stop() = 0;
|
virtual void Stop() = 0;
|
||||||
|
|
||||||
SoundEmitter& operator=(const SoundEmitter&) = delete;
|
SoundEmitter& operator=(const SoundEmitter&) = default;
|
||||||
SoundEmitter& operator=(SoundEmitter&&) noexcept = default;
|
SoundEmitter& operator=(SoundEmitter&&) noexcept = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ namespace Nz
|
||||||
inline InstancedRenderable();
|
inline InstancedRenderable();
|
||||||
InstancedRenderable(const InstancedRenderable&) = delete;
|
InstancedRenderable(const InstancedRenderable&) = delete;
|
||||||
InstancedRenderable(InstancedRenderable&&) noexcept = default;
|
InstancedRenderable(InstancedRenderable&&) noexcept = default;
|
||||||
~InstancedRenderable();
|
virtual ~InstancedRenderable();
|
||||||
|
|
||||||
virtual void BuildElement(ElementRendererRegistry& registry, const ElementData& elementData, std::size_t passIndex, std::vector<RenderElementOwner>& elements) const = 0;
|
virtual void BuildElement(ElementRendererRegistry& registry, const ElementData& elementData, std::size_t passIndex, std::vector<RenderElementOwner>& elements) const = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,19 +18,12 @@ namespace Nz
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
using Framebuffer::Framebuffer;
|
using Framebuffer::Framebuffer;
|
||||||
OpenGLFramebuffer() = default;
|
|
||||||
OpenGLFramebuffer(const OpenGLFramebuffer&) = delete;
|
|
||||||
OpenGLFramebuffer(OpenGLFramebuffer&&) noexcept = default;
|
|
||||||
~OpenGLFramebuffer() = default;
|
|
||||||
|
|
||||||
virtual void Activate() const = 0;
|
virtual void Activate() const = 0;
|
||||||
|
|
||||||
virtual std::size_t GetColorBufferCount() const = 0;
|
virtual std::size_t GetColorBufferCount() const = 0;
|
||||||
|
|
||||||
virtual const Vector2ui& GetSize() const = 0;
|
virtual const Vector2ui& GetSize() const = 0;
|
||||||
|
|
||||||
OpenGLFramebuffer& operator=(const OpenGLFramebuffer&) = delete;
|
|
||||||
OpenGLFramebuffer& operator=(OpenGLFramebuffer&&) noexcept = default;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,6 @@ namespace Nz
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
OpenGLRenderImage(OpenGLRenderWindow& owner);
|
OpenGLRenderImage(OpenGLRenderWindow& owner);
|
||||||
OpenGLRenderImage(const OpenGLRenderImage&) = delete;
|
|
||||||
OpenGLRenderImage(OpenGLRenderImage&&) noexcept = default;
|
|
||||||
~OpenGLRenderImage() = default;
|
|
||||||
|
|
||||||
void Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) override;
|
void Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) override;
|
||||||
|
|
||||||
|
|
@ -33,9 +30,6 @@ namespace Nz
|
||||||
|
|
||||||
void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) override;
|
void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) override;
|
||||||
|
|
||||||
OpenGLRenderImage& operator=(const OpenGLRenderImage&) = delete;
|
|
||||||
OpenGLRenderImage& operator=(OpenGLRenderImage&&) = delete;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
OpenGLRenderWindow& m_owner;
|
OpenGLRenderWindow& m_owner;
|
||||||
OpenGLUploadPool m_uploadPool;
|
OpenGLUploadPool m_uploadPool;
|
||||||
|
|
|
||||||
|
|
@ -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, 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(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<ExplicitBinding>* explicitBindings) const;
|
nzsl::ShaderStageTypeFlags Attach(GL::Program& program, const nzsl::GlslWriter::BindingMapping& bindingMapping, std::vector<ExplicitBinding>* explicitBindings) const;
|
||||||
|
|
||||||
inline const std::vector<ExplicitBinding>& GetExplicitBindings() const;
|
inline const std::vector<ExplicitBinding>& GetExplicitBindings() const;
|
||||||
|
|
||||||
OpenGLShaderModule& operator=(const OpenGLShaderModule&) = delete;
|
|
||||||
OpenGLShaderModule& operator=(OpenGLShaderModule&&) noexcept = default;
|
|
||||||
|
|
||||||
struct ExplicitBinding
|
struct ExplicitBinding
|
||||||
{
|
{
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
|
||||||
|
|
@ -18,14 +18,8 @@ namespace Nz
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
using Framebuffer::Framebuffer;
|
using Framebuffer::Framebuffer;
|
||||||
VulkanFramebuffer(const VulkanFramebuffer&) = delete;
|
|
||||||
VulkanFramebuffer(VulkanFramebuffer&&) noexcept = default;
|
|
||||||
~VulkanFramebuffer() = default;
|
|
||||||
|
|
||||||
virtual const Vk::Framebuffer& GetFramebuffer() const = 0;
|
virtual const Vk::Framebuffer& GetFramebuffer() const = 0;
|
||||||
|
|
||||||
VulkanFramebuffer& operator=(const VulkanFramebuffer&) = delete;
|
|
||||||
VulkanFramebuffer& operator=(VulkanFramebuffer&&) noexcept = default;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
VulkanRenderImage(VulkanRenderWindow& owner);
|
VulkanRenderImage(VulkanRenderWindow& owner);
|
||||||
VulkanRenderImage(const VulkanRenderImage&) = delete;
|
VulkanRenderImage(const VulkanRenderImage&) = delete;
|
||||||
VulkanRenderImage(VulkanRenderImage&&) noexcept = default;
|
VulkanRenderImage(VulkanRenderImage&&) = delete;
|
||||||
~VulkanRenderImage();
|
~VulkanRenderImage();
|
||||||
|
|
||||||
void Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) override;
|
void Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) override;
|
||||||
|
|
|
||||||
|
|
@ -22,20 +22,12 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
struct Stage;
|
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, 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);
|
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 Vk::ShaderModule& GetHandle() const;
|
||||||
inline const std::vector<Stage>& GetStages() const;
|
inline const std::vector<Stage>& GetStages() const;
|
||||||
|
|
||||||
VulkanShaderModule& operator=(const VulkanShaderModule&) = delete;
|
|
||||||
VulkanShaderModule& operator=(VulkanShaderModule&&) = delete;
|
|
||||||
|
|
||||||
struct Stage
|
struct Stage
|
||||||
{
|
{
|
||||||
nzsl::ShaderStageType stage;
|
nzsl::ShaderStageType stage;
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ namespace Nz
|
||||||
|
|
||||||
AbstractTextAreaWidget(BaseWidget* parent);
|
AbstractTextAreaWidget(BaseWidget* parent);
|
||||||
AbstractTextAreaWidget(const AbstractTextAreaWidget&) = delete;
|
AbstractTextAreaWidget(const AbstractTextAreaWidget&) = delete;
|
||||||
AbstractTextAreaWidget(AbstractTextAreaWidget&&) = default;
|
AbstractTextAreaWidget(AbstractTextAreaWidget&&) = delete;
|
||||||
~AbstractTextAreaWidget() = default;
|
~AbstractTextAreaWidget() = default;
|
||||||
|
|
||||||
virtual void Clear();
|
virtual void Clear();
|
||||||
|
|
@ -69,7 +69,7 @@ namespace Nz
|
||||||
virtual void Write(const std::string& text, std::size_t glyphPosition) = 0;
|
virtual void Write(const std::string& text, std::size_t glyphPosition) = 0;
|
||||||
|
|
||||||
AbstractTextAreaWidget& operator=(const AbstractTextAreaWidget&) = delete;
|
AbstractTextAreaWidget& operator=(const AbstractTextAreaWidget&) = delete;
|
||||||
AbstractTextAreaWidget& operator=(AbstractTextAreaWidget&&) = default;
|
AbstractTextAreaWidget& operator=(AbstractTextAreaWidget&&) = delete;
|
||||||
|
|
||||||
NazaraSignal(OnTextAreaCursorMove, const AbstractTextAreaWidget* /*textArea*/, Vector2ui* /*newCursorPosition*/);
|
NazaraSignal(OnTextAreaCursorMove, const AbstractTextAreaWidget* /*textArea*/, Vector2ui* /*newCursorPosition*/);
|
||||||
NazaraSignal(OnTextAreaKeyBackspace, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
|
NazaraSignal(OnTextAreaKeyBackspace, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
CheckboxWidget(BaseWidget* parent);
|
CheckboxWidget(BaseWidget* parent);
|
||||||
CheckboxWidget(const CheckboxWidget&) = delete;
|
CheckboxWidget(const CheckboxWidget&) = delete;
|
||||||
CheckboxWidget(CheckboxWidget&&) = default;
|
CheckboxWidget(CheckboxWidget&&) = delete;
|
||||||
~CheckboxWidget() = default;
|
~CheckboxWidget() = default;
|
||||||
|
|
||||||
inline void EnableTristate(bool enabled);
|
inline void EnableTristate(bool enabled);
|
||||||
|
|
@ -34,7 +34,7 @@ namespace Nz
|
||||||
inline void SwitchToNextState();
|
inline void SwitchToNextState();
|
||||||
|
|
||||||
CheckboxWidget& operator=(const CheckboxWidget&) = delete;
|
CheckboxWidget& operator=(const CheckboxWidget&) = delete;
|
||||||
CheckboxWidget& operator=(CheckboxWidget&&) = default;
|
CheckboxWidget& operator=(CheckboxWidget&&) = delete;
|
||||||
|
|
||||||
NazaraSignal(OnCheckboxStateUpdate, const CheckboxWidget* /*button*/, CheckboxState /*newState*/);
|
NazaraSignal(OnCheckboxStateUpdate, const CheckboxWidget* /*button*/, CheckboxState /*newState*/);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ namespace Nz
|
||||||
inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, float cornerSize, float cornerTexCoords);
|
inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, float cornerSize, float cornerTexCoords);
|
||||||
ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, std::shared_ptr<MaterialInstance> hoveredMaterial, std::shared_ptr<MaterialInstance> pressedMaterial, float cornerSize, float cornerTexCoords);
|
ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, std::shared_ptr<MaterialInstance> hoveredMaterial, std::shared_ptr<MaterialInstance> pressedMaterial, float cornerSize, float cornerTexCoords);
|
||||||
ImageButtonWidget(const ImageButtonWidget&) = delete;
|
ImageButtonWidget(const ImageButtonWidget&) = delete;
|
||||||
ImageButtonWidget(ImageButtonWidget&&) = default;
|
ImageButtonWidget(ImageButtonWidget&&) = delete;
|
||||||
~ImageButtonWidget() = default;
|
~ImageButtonWidget() = default;
|
||||||
|
|
||||||
inline const Color& GetColor() const;
|
inline const Color& GetColor() const;
|
||||||
|
|
@ -43,7 +43,7 @@ namespace Nz
|
||||||
inline void SetTextureCoords(const Rectf& coords);
|
inline void SetTextureCoords(const Rectf& coords);
|
||||||
|
|
||||||
ImageButtonWidget& operator=(const ImageButtonWidget&) = delete;
|
ImageButtonWidget& operator=(const ImageButtonWidget&) = delete;
|
||||||
ImageButtonWidget& operator=(ImageButtonWidget&&) = default;
|
ImageButtonWidget& operator=(ImageButtonWidget&&) = delete;
|
||||||
|
|
||||||
NazaraSignal(OnButtonTrigger, const ImageButtonWidget* /*button*/);
|
NazaraSignal(OnButtonTrigger, const ImageButtonWidget* /*button*/);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
ImageWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material);
|
ImageWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material);
|
||||||
ImageWidget(const ImageWidget&) = delete;
|
ImageWidget(const ImageWidget&) = delete;
|
||||||
ImageWidget(ImageWidget&&) = default;
|
ImageWidget(ImageWidget&&) = delete;
|
||||||
~ImageWidget() = default;
|
~ImageWidget() = default;
|
||||||
|
|
||||||
inline const Color& GetColor() const;
|
inline const Color& GetColor() const;
|
||||||
|
|
@ -32,7 +32,7 @@ namespace Nz
|
||||||
inline void SetTextureRect(const Rectf& rect);
|
inline void SetTextureRect(const Rectf& rect);
|
||||||
|
|
||||||
ImageWidget& operator=(const ImageWidget&) = delete;
|
ImageWidget& operator=(const ImageWidget&) = delete;
|
||||||
ImageWidget& operator=(ImageWidget&&) = default;
|
ImageWidget& operator=(ImageWidget&&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Layout() override;
|
void Layout() override;
|
||||||
|
|
|
||||||
|
|
@ -21,13 +21,13 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
LabelWidget(BaseWidget* parent);
|
LabelWidget(BaseWidget* parent);
|
||||||
LabelWidget(const LabelWidget&) = delete;
|
LabelWidget(const LabelWidget&) = delete;
|
||||||
LabelWidget(LabelWidget&&) = default;
|
LabelWidget(LabelWidget&&) = delete;
|
||||||
~LabelWidget() = default;
|
~LabelWidget() = default;
|
||||||
|
|
||||||
void UpdateText(const AbstractTextDrawer& drawer);
|
void UpdateText(const AbstractTextDrawer& drawer);
|
||||||
|
|
||||||
LabelWidget& operator=(const LabelWidget&) = delete;
|
LabelWidget& operator=(const LabelWidget&) = delete;
|
||||||
LabelWidget& operator=(LabelWidget&&) = default;
|
LabelWidget& operator=(LabelWidget&&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void OnMouseEnter() override;
|
void OnMouseEnter() override;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
RichTextAreaWidget(BaseWidget* parent);
|
RichTextAreaWidget(BaseWidget* parent);
|
||||||
RichTextAreaWidget(const RichTextAreaWidget&) = delete;
|
RichTextAreaWidget(const RichTextAreaWidget&) = delete;
|
||||||
RichTextAreaWidget(RichTextAreaWidget&&) = default;
|
RichTextAreaWidget(RichTextAreaWidget&&) = delete;
|
||||||
~RichTextAreaWidget() = default;
|
~RichTextAreaWidget() = default;
|
||||||
|
|
||||||
void AppendText(const std::string& text);
|
void AppendText(const std::string& text);
|
||||||
|
|
@ -47,7 +47,7 @@ namespace Nz
|
||||||
void Write(const std::string& text, std::size_t glyphPosition) override;
|
void Write(const std::string& text, std::size_t glyphPosition) override;
|
||||||
|
|
||||||
RichTextAreaWidget& operator=(const RichTextAreaWidget&) = delete;
|
RichTextAreaWidget& operator=(const RichTextAreaWidget&) = delete;
|
||||||
RichTextAreaWidget& operator=(RichTextAreaWidget&&) = default;
|
RichTextAreaWidget& operator=(RichTextAreaWidget&&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void CopySelectionToClipboard(const Vector2ui& selectionBegin, const Vector2ui& selectionEnd) override;
|
void CopySelectionToClipboard(const Vector2ui& selectionBegin, const Vector2ui& selectionEnd) override;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
ScrollAreaWidget(BaseWidget* parent, BaseWidget* content);
|
ScrollAreaWidget(BaseWidget* parent, BaseWidget* content);
|
||||||
ScrollAreaWidget(const ScrollAreaWidget&) = delete;
|
ScrollAreaWidget(const ScrollAreaWidget&) = delete;
|
||||||
ScrollAreaWidget(ScrollAreaWidget&&) = default;
|
ScrollAreaWidget(ScrollAreaWidget&&) = delete;
|
||||||
~ScrollAreaWidget() = default;
|
~ScrollAreaWidget() = default;
|
||||||
|
|
||||||
void EnableScrollbar(bool enable);
|
void EnableScrollbar(bool enable);
|
||||||
|
|
@ -36,7 +36,7 @@ namespace Nz
|
||||||
void ScrollToRatio(float ratio);
|
void ScrollToRatio(float ratio);
|
||||||
|
|
||||||
ScrollAreaWidget& operator=(const ScrollAreaWidget&) = delete;
|
ScrollAreaWidget& operator=(const ScrollAreaWidget&) = delete;
|
||||||
ScrollAreaWidget& operator=(ScrollAreaWidget&&) = default;
|
ScrollAreaWidget& operator=(ScrollAreaWidget&&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Layout() override;
|
void Layout() override;
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ namespace Nz
|
||||||
void OnMouseEnter() override;
|
void OnMouseEnter() override;
|
||||||
void OnMouseExit() override;
|
void OnMouseExit() override;
|
||||||
|
|
||||||
void OnRenderLayerUpdated(int baseRenderLayer);
|
void OnRenderLayerUpdated(int baseRenderLayer) override;
|
||||||
|
|
||||||
std::unique_ptr<ScrollbarWidgetStyle> m_style;
|
std::unique_ptr<ScrollbarWidgetStyle> m_style;
|
||||||
ImageButtonWidget* m_scrollBackButton;
|
ImageButtonWidget* m_scrollBackButton;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
TextAreaWidget(BaseWidget* parent);
|
TextAreaWidget(BaseWidget* parent);
|
||||||
TextAreaWidget(const TextAreaWidget&) = delete;
|
TextAreaWidget(const TextAreaWidget&) = delete;
|
||||||
TextAreaWidget(TextAreaWidget&&) = default;
|
TextAreaWidget(TextAreaWidget&&) = delete;
|
||||||
~TextAreaWidget() = default;
|
~TextAreaWidget() = default;
|
||||||
|
|
||||||
void AppendText(const std::string& text);
|
void AppendText(const std::string& text);
|
||||||
|
|
@ -52,7 +52,7 @@ namespace Nz
|
||||||
void Write(const std::string& text, std::size_t glyphPosition) override;
|
void Write(const std::string& text, std::size_t glyphPosition) override;
|
||||||
|
|
||||||
TextAreaWidget& operator=(const TextAreaWidget&) = delete;
|
TextAreaWidget& operator=(const TextAreaWidget&) = delete;
|
||||||
TextAreaWidget& operator=(TextAreaWidget&&) = default;
|
TextAreaWidget& operator=(TextAreaWidget&&) = delete;
|
||||||
|
|
||||||
NazaraSignal(OnTextChanged, const AbstractTextAreaWidget* /*textArea*/, const std::string& /*text*/);
|
NazaraSignal(OnTextChanged, const AbstractTextAreaWidget* /*textArea*/, const std::string& /*text*/);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -476,10 +476,7 @@ std::shared_ptr<Nz::SubMesh> ProcessSubMesh(const std::filesystem::path& originP
|
||||||
if (meshData->HasVertexColors(0))
|
if (meshData->HasVertexColors(0))
|
||||||
{
|
{
|
||||||
for (unsigned int vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex)
|
for (unsigned int vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex)
|
||||||
{
|
|
||||||
aiColor4D color = meshData->mColors[0][vertexIndex];
|
|
||||||
*colorPtr++ = FromAssimp(meshData->mColors[0][vertexIndex]);
|
*colorPtr++ = FromAssimp(meshData->mColors[0][vertexIndex]);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -143,12 +143,13 @@ namespace Nz::GL
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<Context> EGLLoader::CreateContext(const OpenGLDevice* device, const ContextParams& params, WindowHandle handle, Context* shareContext) const
|
std::unique_ptr<Context> EGLLoader::CreateContext([[maybe_unused]] const OpenGLDevice* device, const ContextParams& params, WindowHandle handle, Context* shareContext) const
|
||||||
{
|
{
|
||||||
std::unique_ptr<EGLContextBase> context;
|
std::unique_ptr<EGLContextBase> context;
|
||||||
switch (handle.type)
|
switch (handle.type)
|
||||||
{
|
{
|
||||||
case WindowBackend::Invalid:
|
case WindowBackend::Invalid:
|
||||||
|
case WindowBackend::Cocoa: //< TODO?
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WindowBackend::X11:
|
case WindowBackend::X11:
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,9 @@ namespace Nz
|
||||||
}
|
}
|
||||||
|
|
||||||
Node::Node(Node&& node) noexcept :
|
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_childs(std::move(node.m_childs)),
|
||||||
m_initialRotation(node.m_initialRotation),
|
m_initialRotation(node.m_initialRotation),
|
||||||
m_rotation(node.m_rotation),
|
m_rotation(node.m_rotation),
|
||||||
|
|
@ -55,10 +58,7 @@ namespace Nz
|
||||||
m_inheritPosition(node.m_inheritPosition),
|
m_inheritPosition(node.m_inheritPosition),
|
||||||
m_inheritRotation(node.m_inheritRotation),
|
m_inheritRotation(node.m_inheritRotation),
|
||||||
m_inheritScale(node.m_inheritScale),
|
m_inheritScale(node.m_inheritScale),
|
||||||
m_transformMatrixUpdated(false),
|
m_transformMatrixUpdated(false)
|
||||||
OnNodeInvalidation(std::move(node.OnNodeInvalidation)),
|
|
||||||
OnNodeNewParent(std::move(node.OnNodeNewParent)),
|
|
||||||
OnNodeRelease(std::move(node.OnNodeRelease))
|
|
||||||
{
|
{
|
||||||
if (m_parent)
|
if (m_parent)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,6 @@ namespace Nz
|
||||||
SkeletonComponent& entitySkeleton = m_registry.get<SkeletonComponent>(entity);
|
SkeletonComponent& entitySkeleton = m_registry.get<SkeletonComponent>(entity);
|
||||||
|
|
||||||
// TODO: When attaching for the first time, set the skeleton to the position of the node before attaching the node
|
// 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());
|
entityNode.SetParent(entitySkeleton.GetRootNode());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,8 @@ namespace Nz
|
||||||
|
|
||||||
VertexBuffer::VertexBuffer(std::shared_ptr<const VertexDeclaration> vertexDeclaration, UInt32 vertexCount, BufferUsageFlags usage, const BufferFactory& bufferFactory, const void* initialData) :
|
VertexBuffer::VertexBuffer(std::shared_ptr<const VertexDeclaration> vertexDeclaration, UInt32 vertexCount, BufferUsageFlags usage, const BufferFactory& bufferFactory, const void* initialData) :
|
||||||
m_vertexDeclaration(std::move(vertexDeclaration)),
|
m_vertexDeclaration(std::move(vertexDeclaration)),
|
||||||
m_startOffset(0),
|
m_vertexCount(vertexCount),
|
||||||
m_vertexCount(vertexCount)
|
m_startOffset(0)
|
||||||
{
|
{
|
||||||
NazaraAssert(m_vertexDeclaration, "invalid vertex declaration");
|
NazaraAssert(m_vertexDeclaration, "invalid vertex declaration");
|
||||||
NazaraAssert(vertexCount > 0, "invalid vertex count");
|
NazaraAssert(vertexCount > 0, "invalid vertex count");
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ namespace Nz
|
||||||
return createInfo;
|
return createInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<VkDynamicState> VulkanRenderPipeline::BuildDynamicStateList(const RenderPipelineInfo& pipelineInfo)
|
std::vector<VkDynamicState> VulkanRenderPipeline::BuildDynamicStateList(const RenderPipelineInfo& /*pipelineInfo*/)
|
||||||
{
|
{
|
||||||
std::vector<VkDynamicState> dynamicStates;
|
std::vector<VkDynamicState> dynamicStates;
|
||||||
dynamicStates.push_back(VK_DYNAMIC_STATE_VIEWPORT);
|
dynamicStates.push_back(VK_DYNAMIC_STATE_VIEWPORT);
|
||||||
|
|
@ -160,7 +160,7 @@ namespace Nz
|
||||||
return createInfo;
|
return createInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
VkPipelineViewportStateCreateInfo VulkanRenderPipeline::BuildViewportInfo(const RenderPipelineInfo& pipelineInfo)
|
VkPipelineViewportStateCreateInfo VulkanRenderPipeline::BuildViewportInfo(const RenderPipelineInfo& /*pipelineInfo*/)
|
||||||
{
|
{
|
||||||
VkPipelineViewportStateCreateInfo createInfo = {};
|
VkPipelineViewportStateCreateInfo createInfo = {};
|
||||||
createInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
|
createInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
|
||||||
|
|
|
||||||
|
|
@ -77,12 +77,12 @@ namespace Nz
|
||||||
m_state->sizeVar.emplace_back();
|
m_state->sizeVar.emplace_back();
|
||||||
auto& sizeVar = m_state->sizeVar.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<float>::infinity())
|
if (maximumSize < std::numeric_limits<float>::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;
|
sizeSum = sizeSum + sizeVar;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,7 @@ namespace Nz
|
||||||
UpdateHoveredWidget(event.x, event.y);
|
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
|
// Keep previous mouse states but not new ones
|
||||||
if (m_mouseOwner != InvalidCanvasIndex)
|
if (m_mouseOwner != InvalidCanvasIndex)
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@ namespace Nz
|
||||||
|
|
||||||
std::unique_ptr<ScrollAreaWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollAreaWidget* scrollAreaWidget) const
|
std::unique_ptr<ScrollAreaWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollAreaWidget* scrollAreaWidget) const
|
||||||
{
|
{
|
||||||
return nullptr;
|
return nullptr; //< TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<ScrollbarWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollbarWidget* scrollBarWidget) const
|
std::unique_ptr<ScrollbarWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollbarWidget* scrollBarWidget) const
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ namespace Nz
|
||||||
return false;
|
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)
|
if (button == Mouse::Left)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -416,12 +416,6 @@ namespace Nz
|
||||||
|
|
||||||
void SimpleScrollbarWidgetStyle::Layout(const Vector2f& size)
|
void SimpleScrollbarWidgetStyle::Layout(const Vector2f& size)
|
||||||
{
|
{
|
||||||
float totalSize;
|
|
||||||
if (GetOwnerWidget<ScrollbarWidget>()->GetOrientation() == ScrollbarOrientation::Horizontal)
|
|
||||||
totalSize = size.x;
|
|
||||||
else
|
|
||||||
totalSize = size.y;
|
|
||||||
|
|
||||||
m_backgroundScrollbarSprite->SetSize(size);
|
m_backgroundScrollbarSprite->SetSize(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -247,7 +247,7 @@ namespace Nz
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TextAreaWidget::HandleWordSelection(const Vector2ui& position)
|
void TextAreaWidget::HandleWordSelection(const Vector2ui& /*position*/)
|
||||||
{
|
{
|
||||||
NAZARA_USE_ANONYMOUS_NAMESPACE
|
NAZARA_USE_ANONYMOUS_NAMESPACE
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue