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

Graphics: Add ModelInstance class

This commit is contained in:
Jérôme Leclercq 2021-01-22 23:32:32 +01:00
parent 19783f7755
commit e3e5c4ba8f
4 changed files with 154 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
examples/GraphicsTest/main.cpp
View File

@ -115,13 +115,11 @@ int main()
Nz::PredefinedViewerData viewerUboOffsets = Nz::PredefinedViewerData::GetOffsets();
const Nz::BasicMaterial::UniformOffsets& materialSettingOffsets = Nz::BasicMaterial::GetOffsets();
std::vector<std::uint8_t> instanceDataBuffer(instanceUboOffsets.totalSize);
std::vector<std::uint8_t> viewerDataBuffer(viewerUboOffsets.totalSize);
std::vector<std::uint8_t> materialSettings(materialSettingOffsets.totalSize);
Nz::Vector2ui windowSize = window.GetSize();
Nz::AccessByOffset<Nz::Matrix4f&>(instanceDataBuffer.data(), instanceUboOffsets.worldMatrixOffset) = Nz::Matrix4f::Translate(Nz::Vector3f::Forward() * 2 + Nz::Vector3f::Right());
Nz::AccessByOffset<Nz::Matrix4f&>(viewerDataBuffer.data(), viewerUboOffsets.viewMatrixOffset) = Nz::Matrix4f::Translate(Nz::Vector3f::Backward() * 1);
Nz::AccessByOffset<Nz::Matrix4f&>(viewerDataBuffer.data(), viewerUboOffsets.projMatrixOffset) = Nz::Matrix4f::Perspective(70.f, float(windowSize.x) / windowSize.y, 0.1f, 1000.f);
@ -130,22 +128,6 @@ int main()
std::shared_ptr<Nz::RenderPipelineLayout> renderPipelineLayout = material.GetSettings()->GetRenderPipelineLayout();
std::shared_ptr<Nz::AbstractBuffer> instanceDataUbo = device->InstantiateBuffer(Nz::BufferType_Uniform);
if (!instanceDataUbo->Initialize(instanceDataBuffer.size(), Nz::BufferUsage_DeviceLocal | Nz::BufferUsage_Dynamic))
{
NazaraError("Failed to create instance UBO");
return __LINE__;
}
instanceDataUbo->Fill(instanceDataBuffer.data(), 0, instanceDataBuffer.size());
std::shared_ptr<Nz::AbstractBuffer> viewerDataUbo = device->InstantiateBuffer(Nz::BufferType_Uniform);
if (!viewerDataUbo->Initialize(viewerDataBuffer.size(), Nz::BufferUsage_DeviceLocal | Nz::BufferUsage_Dynamic))
{
NazaraError("Failed to create viewer UBO");
return __LINE__;
}
std::shared_ptr<Nz::AbstractBuffer> matSettingUBO = device->InstantiateBuffer(Nz::BufferType_Uniform);
if (!matSettingUBO->Initialize(materialSettings.size(), Nz::BufferUsage_DeviceLocal | Nz::BufferUsage_Dynamic))
{
@ -155,40 +137,6 @@ int main()
matSettingUBO->Fill(materialSettings.data(), 0, materialSettings.size());
Nz::ShaderBindingPtr shaderBinding = renderPipelineLayout->AllocateShaderBinding();
shaderBinding->Update({
{
material.GetSettings()->GetPredefinedBindingIndex(Nz::PredefinedShaderBinding::UboViewerData),
Nz::ShaderBinding::UniformBufferBinding {
viewerDataUbo.get(), 0, viewerDataBuffer.size()
}
},
{
material.GetSettings()->GetPredefinedBindingIndex(Nz::PredefinedShaderBinding::UboInstanceData),
Nz::ShaderBinding::UniformBufferBinding {
instanceDataUbo.get(), 0, instanceDataBuffer.size()
}
},
{
3,
Nz::ShaderBinding::UniformBufferBinding {
matSettingUBO.get(), 0, materialSettings.size()
}
},
{
0,
Nz::ShaderBinding::TextureBinding {
alphaTexture.get(), textureSampler.get()
}
},
{
1,
Nz::ShaderBinding::TextureBinding {
texture.get(), textureSampler.get()
}
}
});
std::vector<Nz::RenderPipelineInfo::VertexBufferData> vertexBuffers = {
{
0,
@ -196,6 +144,30 @@ int main()
}
};
std::vector<std::uint8_t> instanceDataBuffer(instanceUboOffsets.totalSize);
Nz::ModelInstance modelInstance(material.GetSettings());
{
material.UpdateShaderBinding(modelInstance.GetShaderBinding());
Nz::AccessByOffset<Nz::Matrix4f&>(instanceDataBuffer.data(), instanceUboOffsets.worldMatrixOffset) = Nz::Matrix4f::Translate(Nz::Vector3f::Forward() * 2 + Nz::Vector3f::Right());
std::shared_ptr<Nz::AbstractBuffer>& instanceDataUBO = modelInstance.GetInstanceBuffer();
instanceDataUBO->Fill(instanceDataBuffer.data(), 0, instanceDataBuffer.size());
}
Nz::ModelInstance modelInstance2(material.GetSettings());
{
material.UpdateShaderBinding(modelInstance2.GetShaderBinding());
Nz::AccessByOffset<Nz::Matrix4f&>(instanceDataBuffer.data(), instanceUboOffsets.worldMatrixOffset) = Nz::Matrix4f::Translate(Nz::Vector3f::Forward() * 2 + Nz::Vector3f::Right() * 3.f);
std::shared_ptr<Nz::AbstractBuffer>& instanceDataUBO = modelInstance2.GetInstanceBuffer();
instanceDataUBO->Fill(instanceDataBuffer.data(), 0, instanceDataBuffer.size());
}
std::shared_ptr<Nz::AbstractBuffer> viewerDataUBO = Nz::Graphics::Instance()->GetViewerDataUBO();
std::shared_ptr<Nz::RenderPipeline> pipeline = material.GetPipeline()->GetRenderPipeline(vertexBuffers);
Nz::RenderDevice* renderDevice = window.GetRenderDevice().get();
@ -239,13 +211,18 @@ int main()
{
builder.BeginRenderPass(windowImpl->GetFramebuffer(), windowImpl->GetRenderPass(), renderRect, { clearValues[0], clearValues[1] });
{
builder.SetScissor(Nz::Recti{ 0, 0, int(windowSize.x), int(windowSize.y) });
builder.SetViewport(Nz::Recti{ 0, 0, int(windowSize.x), int(windowSize.y) });
builder.BindIndexBuffer(indexBufferImpl);
builder.BindPipeline(*pipeline);
builder.BindVertexBuffer(0, vertexBufferImpl);
builder.BindShaderBinding(*shaderBinding);
builder.SetScissor(Nz::Recti{ 0, 0, int(windowSize.x), int(windowSize.y) });
builder.SetViewport(Nz::Recti{ 0, 0, int(windowSize.x), int(windowSize.y) });
builder.BindShaderBinding(modelInstance.GetShaderBinding());
builder.DrawIndexed(drfreakIB->GetIndexCount());
builder.BindShaderBinding(modelInstance2.GetShaderBinding());
builder.DrawIndexed(drfreakIB->GetIndexCount());
}
@ -363,7 +340,7 @@ int main()
builder.BeginDebugRegion("UBO Update", Nz::Color::Yellow);
{
builder.PreTransferBarrier();
builder.CopyBuffer(allocation, viewerDataUbo.get());
builder.CopyBuffer(allocation, viewerDataUBO.get());
builder.PostTransferBarrier();
}
builder.EndDebugRegion();

43
include/Nazara/Graphics/ModelInstance.hpp Normal file
View File

@ -0,0 +1,43 @@
// Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once
#ifndef NAZARA_MODELINSTANCE_HPP
#define NAZARA_MODELINSTANCE_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Renderer/ShaderBinding.hpp>
#include <memory>
namespace Nz
{
class AbstractBuffer;
class MaterialSettings;
class NAZARA_GRAPHICS_API ModelInstance
{
public:
ModelInstance(const std::shared_ptr<const MaterialSettings>& settings);
ModelInstance(const ModelInstance&) = delete;
ModelInstance(ModelInstance&&) noexcept = default;
~ModelInstance() = default;
inline std::shared_ptr<AbstractBuffer>& GetInstanceBuffer();
inline const std::shared_ptr<AbstractBuffer>& GetInstanceBuffer() const;
inline ShaderBinding& GetShaderBinding();
ModelInstance& operator=(const ModelInstance&) = delete;
ModelInstance& operator=(ModelInstance&&) noexcept = default;
private:
std::shared_ptr<AbstractBuffer> m_instanceDataBuffer;
ShaderBindingPtr m_shaderBinding;
};
}
#include <Nazara/Graphics/ModelInstance.inl>
#endif // NAZARA_MODELINSTANCE_HPP

26
include/Nazara/Graphics/ModelInstance.inl Normal file
View File

@ -0,0 +1,26 @@
// Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/ModelInstance.hpp>
#include <Nazara/Graphics/Debug.hpp>
namespace Nz
{
inline std::shared_ptr<AbstractBuffer>& ModelInstance::GetInstanceBuffer()
{
return m_instanceDataBuffer;
}
inline const std::shared_ptr<AbstractBuffer>& ModelInstance::GetInstanceBuffer() const
{
return m_instanceDataBuffer;
}
inline ShaderBinding& ModelInstance::GetShaderBinding()
{
return *m_shaderBinding;
}
}
#include <Nazara/Graphics/DebugOff.hpp>

52
src/Nazara/Graphics/ModelInstance.cpp Normal file
View File

@ -0,0 +1,52 @@
// Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/ModelInstance.hpp>
#include <Nazara/Core/StackVector.hpp>
#include <Nazara/Graphics/Graphics.hpp>
#include <Nazara/Graphics/MaterialSettings.hpp>
#include <Nazara/Graphics/PredefinedShaderStructs.hpp>
#include <Nazara/Graphics/Debug.hpp>
namespace Nz
{
ModelInstance::ModelInstance(const std::shared_ptr<const MaterialSettings>& settings)
{
Nz::PredefinedInstanceData instanceUboOffsets = Nz::PredefinedInstanceData::GetOffsets();
m_instanceDataBuffer = Graphics::Instance()->GetRenderDevice().InstantiateBuffer(BufferType_Uniform);
if (!m_instanceDataBuffer->Initialize(instanceUboOffsets.totalSize, Nz::BufferUsage_DeviceLocal | Nz::BufferUsage_Dynamic))
throw std::runtime_error("failed to initialize viewer data UBO");
m_shaderBinding = settings->GetRenderPipelineLayout()->AllocateShaderBinding();
// TODO: Use StackVector
StackVector<ShaderBinding::Binding> bindings = NazaraStackVector(ShaderBinding::Binding, 2);
if (std::size_t bindingIndex = settings->GetPredefinedBindingIndex(PredefinedShaderBinding::UboInstanceData); bindingIndex != MaterialSettings::InvalidIndex)
{
bindings.push_back({
bindingIndex,
ShaderBinding::UniformBufferBinding {
m_instanceDataBuffer.get(), 0, m_instanceDataBuffer->GetSize()
}
});
}
if (std::size_t bindingIndex = settings->GetPredefinedBindingIndex(PredefinedShaderBinding::UboViewerData); bindingIndex != MaterialSettings::InvalidIndex)
{
const std::shared_ptr<AbstractBuffer>& instanceDataUBO = Graphics::Instance()->GetViewerDataUBO();
bindings.push_back({
bindingIndex,
ShaderBinding::UniformBufferBinding {
instanceDataUBO.get(), 0, instanceDataUBO->GetSize()
}
});
}
if (!bindings.empty())
m_shaderBinding->Update(bindings.data(), bindings.size());
}
}