sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a lot of small bugs/warnings

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-12-25 20:07:53 +01:00
parent 1080823c4d
commit b98fd65a01
26 changed files with 62 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Core/Algorithm.inl
View File

@@ -297,6 +297,12 @@ namespace Nz
To SafeCast(From value)
{
#if defined(NAZARA_DEBUG) && !defined(NDEBUG)
#ifdef NAZARA_COMPILER_MSVC
// Disable unreachable code warnings
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
if constexpr (std::is_integral_v<To>)
{
if constexpr (std::is_enum_v<From>)
@@ -368,6 +374,10 @@ namespace Nz
}
}
}
#ifdef NAZARA_COMPILER_MSVC
#pragma warning(pop)
#endif
#endif
return static_cast<To>(value);

4
include/Nazara/Core/Bitset.inl
View File

@@ -11,6 +11,7 @@
#ifdef NAZARA_COMPILER_MSVC
// Bits tricks require us to disable some warnings under VS
#pragma warning(push)
#pragma warning(disable: 4146)
#pragma warning(disable: 4804)
#endif
@@ -1665,8 +1666,7 @@ namespace std
#ifdef NAZARA_COMPILER_MSVC
// Reenable those warnings
#pragma warning(default: 4146)
#pragma warning(default: 4804)
#pragma warning(pop)
#endif
#include <Nazara/Core/DebugOff.hpp>

12
include/Nazara/Graphics/Camera.inl
View File

@@ -12,12 +12,12 @@ namespace Nz
m_renderTarget(nullptr),
m_clearColor(Color::Black),
m_fov(90.f),
m_renderOrder(0),
m_projectionType(projectionType),
m_targetRegion(0.f, 0.f, 1.f, 1.f),
m_viewport(0, 0, 0, 0),
m_renderMask(0xFFFFFFFF),
m_renderOrder(0),
m_size(-1.f, -1.f),
m_renderMask(0xFFFFFFFF),
m_zFar((projectionType == ProjectionType::Perspective) ? 1000.f : 1.f),
m_zNear((projectionType == ProjectionType::Perspective) ? 1.f : -1.f)
{
@@ -28,12 +28,12 @@ namespace Nz
m_renderTarget(nullptr),
m_clearColor(camera.m_clearColor),
m_fov(camera.m_fov),
m_renderOrder(camera.m_renderOrder),
m_projectionType(camera.m_projectionType),
m_targetRegion(camera.m_targetRegion),
m_viewport(camera.m_viewport),
m_renderMask(camera.m_renderMask),
m_renderOrder(camera.m_renderOrder),
m_size(camera.m_size),
m_renderMask(camera.m_renderMask),
m_aspectRatio(camera.m_aspectRatio),
m_zFar(camera.m_zFar),
m_zNear(camera.m_zNear)
@@ -45,12 +45,12 @@ namespace Nz
m_renderTarget(nullptr),
m_clearColor(camera.m_clearColor),
m_fov(camera.m_fov),
m_renderOrder(camera.m_renderOrder),
m_projectionType(camera.m_projectionType),
m_targetRegion(camera.m_targetRegion),
m_viewport(camera.m_viewport),
m_renderMask(camera.m_renderMask),
m_renderOrder(camera.m_renderOrder),
m_size(camera.m_size),
m_renderMask(camera.m_renderMask),
m_aspectRatio(camera.m_aspectRatio),
m_zFar(camera.m_zFar),
m_zNear(camera.m_zNear)

6
include/Nazara/Graphics/SpriteChainRenderer.hpp
View File

@@ -30,10 +30,10 @@ namespace Nz
SpriteChainRenderer(RenderDevice& device, std::size_t maxVertexBufferSize = 32 * 1024);
~SpriteChainRenderer() = default;
std::unique_ptr<ElementRendererData> InstanciateData();
void Prepare(const ViewerInstance& viewerInstance, ElementRendererData& rendererData, RenderFrame& currentFrame, const Pointer<const RenderElement>* elements, std::size_t elementCount);
std::unique_ptr<ElementRendererData> InstanciateData() override;
void Prepare(const ViewerInstance& viewerInstance, ElementRendererData& rendererData, RenderFrame& currentFrame, const Pointer<const RenderElement>* elements, std::size_t elementCount) override;
void Render(const ViewerInstance& viewerInstance, ElementRendererData& rendererData, CommandBufferBuilder& commandBuffer, const Pointer<const RenderElement>* elements, std::size_t elementCount) override;
void Reset(ElementRendererData& rendererData, RenderFrame& currentFrame);
void Reset(ElementRendererData& rendererData, RenderFrame& currentFrame) override;
private:
struct BufferCopy

2
include/Nazara/Shader/ShaderBuilder.inl
View File

@@ -298,7 +298,7 @@ namespace Nz::ShaderBuilder
swizzleNode->componentCount = swizzleComponents.size();
for (std::size_t i = 0; i < swizzleNode->componentCount; ++i)
{
assert(swizzleComponents[i] >= 0 && swizzleComponents[i] <= 4);
assert(swizzleComponents[i] <= 4);
swizzleNode->components[i] = swizzleComponents[i];
}

2
include/Nazara/Widgets/LabelWidget.hpp
View File

@@ -24,7 +24,7 @@ namespace Nz
LabelWidget(LabelWidget&&) = default;
~LabelWidget() = default;
void UpdateText(const AbstractTextDrawer& drawer, float scale = 1.f);
void UpdateText(const AbstractTextDrawer& drawer);
LabelWidget& operator=(const LabelWidget&) = delete;
LabelWidget& operator=(LabelWidget&&) = default;