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

Minor fixes

This commit is contained in:
SirLynix 2022-08-23 18:17:10 +02:00 committed by Jérôme Leclercq
parent 8d39441bd1
commit 133caac5b5
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Graphics.hpp
View File

@ -35,6 +35,7 @@
#include <Nazara/Graphics/BasicMaterial.hpp> #include <Nazara/Graphics/BasicMaterial.hpp>
#include <Nazara/Graphics/Camera.hpp> #include <Nazara/Graphics/Camera.hpp>
#include <Nazara/Graphics/Config.hpp> #include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/DebugDrawPipelinePass.hpp>
#include <Nazara/Graphics/DepthMaterial.hpp> #include <Nazara/Graphics/DepthMaterial.hpp>
#include <Nazara/Graphics/DepthPipelinePass.hpp> #include <Nazara/Graphics/DepthPipelinePass.hpp>
#include <Nazara/Graphics/DirectionalLight.hpp> #include <Nazara/Graphics/DirectionalLight.hpp>

2
include/Nazara/Renderer/DebugDrawer.hpp
View File

@ -71,7 +71,7 @@ namespace Nz
struct DrawCall struct DrawCall
{ {
std::shared_ptr<RenderBuffer> vertexBuffer; std::shared_ptr<RenderBuffer> vertexBuffer;
std::uint64_t vertexCount; std::size_t vertexCount;
}; };
struct PendingUpload struct PendingUpload

6
include/Nazara/Utility/Plugins/AssimpPlugin.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#ifndef NAZARA_UTILITY_PLUGIN_ASSIMPPLUGIN_HPP #ifndef NAZARA_UTILITY_PLUGINS_ASSIMPPLUGIN_HPP
#define NAZARA_UTILITY_PLUGIN_ASSIMPPLUGIN_HPP #define NAZARA_UTILITY_PLUGINS_ASSIMPPLUGIN_HPP
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/PluginInterface.hpp> #include <Nazara/Core/PluginInterface.hpp>
@ -34,4 +34,4 @@ namespace Nz
#include <Nazara/Utility/Plugins/AssimpPlugin.inl> #include <Nazara/Utility/Plugins/AssimpPlugin.inl>
#endif // NAZARA_UTILITY_PLUGIN_ASSIMPPLUGIN_HPP #endif // NAZARA_UTILITY_PLUGINS_ASSIMPPLUGIN_HPP

6
include/Nazara/Utility/Plugins/FFmpegPlugin.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#ifndef NAZARA_UTILITY_PLUGIN_FFMPEGPLUGIN_HPP #ifndef NAZARA_UTILITY_PLUGINS_FFMPEGPLUGIN_HPP
#define NAZARA_UTILITY_PLUGIN_FFMPEGPLUGIN_HPP #define NAZARA_UTILITY_PLUGINS_FFMPEGPLUGIN_HPP
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/PluginInterface.hpp> #include <Nazara/Core/PluginInterface.hpp>
@ -36,4 +36,4 @@ namespace Nz
#include <Nazara/Utility/Plugins/FFmpegPlugin.inl> #include <Nazara/Utility/Plugins/FFmpegPlugin.inl>
#endif // NAZARA_UTILITY_PLUGIN_FFMPEGPLUGIN_HPP #endif // NAZARA_UTILITY_PLUGINS_FFMPEGPLUGIN_HPP

2
src/Nazara/Renderer/DebugDrawer.cpp
View File

@ -88,7 +88,7 @@ namespace Nz
for (auto& drawCall : m_drawCalls) for (auto& drawCall : m_drawCalls)
{ {
builder.BindVertexBuffer(0, *drawCall.vertexBuffer); builder.BindVertexBuffer(0, *drawCall.vertexBuffer);
builder.Draw(drawCall.vertexCount); builder.Draw(SafeCast<UInt32>(drawCall.vertexCount));
} }
} }