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-17 20:13:00 +02:00
parent f1549b934c
commit c669c68533
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/FramePipeline.hpp
View File

@ -66,6 +66,8 @@ namespace Nz
FramePipeline& operator=(const FramePipeline&) = delete; FramePipeline& operator=(const FramePipeline&) = delete;
FramePipeline& operator=(FramePipeline&&) noexcept = default; FramePipeline& operator=(FramePipeline&&) noexcept = default;
NazaraSignal(OnTransfer, FramePipeline* /*pipeline*/, RenderFrame& /*renderFrame*/, CommandBufferBuilder& /*builder*/);
private: private:
std::vector<std::unique_ptr<ElementRenderer>> m_elementRenderers; std::vector<std::unique_ptr<ElementRenderer>> m_elementRenderers;
DebugDrawer m_debugDrawer; DebugDrawer m_debugDrawer;

11
include/Nazara/Graphics/ViewerInstance.inl
View File

@ -70,6 +70,9 @@ namespace Nz
if (!m_projectionMatrix.GetInverse(&m_invProjectionMatrix)) if (!m_projectionMatrix.GetInverse(&m_invProjectionMatrix))
NazaraError("failed to inverse projection matrix"); NazaraError("failed to inverse projection matrix");
m_viewProjMatrix = m_viewMatrix * m_projectionMatrix;
m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix;
m_dataInvalidated = true; m_dataInvalidated = true;
} }
@ -78,6 +81,9 @@ namespace Nz
m_projectionMatrix = projectionMatrix; m_projectionMatrix = projectionMatrix;
m_invProjectionMatrix = invProjectionMatrix; m_invProjectionMatrix = invProjectionMatrix;
m_viewProjMatrix = m_viewMatrix * m_projectionMatrix;
m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix;
m_dataInvalidated = true; m_dataInvalidated = true;
} }
@ -91,9 +97,8 @@ namespace Nz
if (!m_viewMatrix.GetInverseTransform(&m_invViewMatrix)) if (!m_viewMatrix.GetInverseTransform(&m_invViewMatrix))
NazaraError("failed to inverse view matrix"); NazaraError("failed to inverse view matrix");
m_viewProjMatrix = m_projectionMatrix * m_viewMatrix; m_viewProjMatrix = m_viewMatrix * m_projectionMatrix;
if (!m_viewProjMatrix.GetInverse(&m_invViewProjMatrix)) m_invViewProjMatrix = m_invProjectionMatrix * m_invViewMatrix;
NazaraError("failed to inverse view proj matrix");
m_dataInvalidated = true; m_dataInvalidated = true;
} }

2
src/Nazara/Graphics/SpriteChainRenderer.cpp
View File

@ -330,7 +330,7 @@ namespace Nz
for (auto& vertexBufferPtr : data.vertexBuffers) for (auto& vertexBufferPtr : data.vertexBuffers)
{ {
currentFrame.PushReleaseCallback([pool = m_vertexBufferPool, vertexBuffer = std::move(vertexBufferPtr)]() currentFrame.PushReleaseCallback([pool = m_vertexBufferPool, vertexBuffer = std::move(vertexBufferPtr)]() mutable
{ {
pool->vertexBuffers.push_back(std::move(vertexBuffer)); pool->vertexBuffers.push_back(std::move(vertexBuffer));
}); });

1
src/Nazara/VulkanRenderer/Wrapper/Device.cpp
View File

@ -12,7 +12,6 @@
#include <Nazara/Utils/CallOnExit.hpp> #include <Nazara/Utils/CallOnExit.hpp>
#define VMA_IMPLEMENTATION #define VMA_IMPLEMENTATION
#define VMA_USE_STL_CONTAINERS 1
#define VMA_STATIC_VULKAN_FUNCTIONS 0 #define VMA_STATIC_VULKAN_FUNCTIONS 0
#include <vma/vk_mem_alloc.h> #include <vma/vk_mem_alloc.h>