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

lowercasing attributes

This commit is contained in:
SweetId 2022-07-26 10:45:09 +02:00
parent 8f144a28e1
commit d7ed6f9d8e
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/NazaraImgui/NazaraImgui.h
View File

@ -64,16 +64,16 @@ namespace Nz
struct struct
{ {
std::shared_ptr<Nz::RenderPipeline> Pipeline; std::shared_ptr<Nz::RenderPipeline> pipeline;
std::unordered_map<Nz::Texture*, Nz::ShaderBindingPtr> TextureShaderBindings; std::unordered_map<Nz::Texture*, Nz::ShaderBindingPtr> textureShaderBindings;
Nz::ShaderBindingPtr UboShaderBinding; Nz::ShaderBindingPtr uboShaderBinding;
std::shared_ptr<Nz::TextureSampler> TextureSampler; std::shared_ptr<Nz::TextureSampler> textureSampler;
} m_texturedPipeline; } m_texturedPipeline;
struct struct
{ {
std::shared_ptr<Nz::RenderPipeline> Pipeline; std::shared_ptr<Nz::RenderPipeline> pipeline;
Nz::ShaderBindingPtr UboShaderBinding; Nz::ShaderBindingPtr uboShaderBinding;
} m_untexturedPipeline; } m_untexturedPipeline;
std::shared_ptr<Nz::RenderBuffer> m_uboBuffer; std::shared_ptr<Nz::RenderBuffer> m_uboBuffer;

44
src/NazaraImgui/NazaraImgui.cpp
View File

@ -106,13 +106,13 @@ namespace Nz
Imgui::~Imgui() Imgui::~Imgui()
{ {
m_untexturedPipeline.UboShaderBinding.reset(); m_untexturedPipeline.uboShaderBinding.reset();
m_untexturedPipeline.Pipeline.reset(); m_untexturedPipeline.pipeline.reset();
m_texturedPipeline.UboShaderBinding.reset(); m_texturedPipeline.uboShaderBinding.reset();
m_texturedPipeline.TextureShaderBindings.clear(); m_texturedPipeline.textureShaderBindings.clear();
m_texturedPipeline.TextureSampler.reset(); m_texturedPipeline.textureSampler.reset();
m_texturedPipeline.Pipeline.reset(); m_texturedPipeline.pipeline.reset();
ImGui::GetIO().Fonts->TexID = nullptr; ImGui::GetIO().Fonts->TexID = nullptr;
ImGui::DestroyContext(); ImGui::DestroyContext();
@ -400,7 +400,7 @@ namespace Nz
} }
m_texturedPipeline.TextureSampler = renderDevice->InstantiateTextureSampler({}); m_texturedPipeline.textureSampler = renderDevice->InstantiateTextureSampler({});
Nz::RenderPipelineLayoutInfo pipelineLayoutInfo; Nz::RenderPipelineLayoutInfo pipelineLayoutInfo;
@ -437,12 +437,12 @@ namespace Nz
pipelineVertexBuffer.binding = 0; pipelineVertexBuffer.binding = 0;
pipelineVertexBuffer.declaration = Nz::VertexDeclaration::Get(Nz::VertexLayout::XYZ_Color_UV); pipelineVertexBuffer.declaration = Nz::VertexDeclaration::Get(Nz::VertexLayout::XYZ_Color_UV);
m_texturedPipeline.Pipeline = renderDevice->InstantiateRenderPipeline(pipelineInfo); m_texturedPipeline.pipeline = renderDevice->InstantiateRenderPipeline(pipelineInfo);
m_uboBuffer = renderDevice->InstantiateBuffer(Nz::BufferType::Uniform, sizeof(ImguiUbo), Nz::BufferUsage::DeviceLocal | Nz::BufferUsage::Dynamic); m_uboBuffer = renderDevice->InstantiateBuffer(Nz::BufferType::Uniform, sizeof(ImguiUbo), Nz::BufferUsage::DeviceLocal | Nz::BufferUsage::Dynamic);
m_texturedPipeline.UboShaderBinding = renderPipelineLayout->AllocateShaderBinding(0); m_texturedPipeline.uboShaderBinding = renderPipelineLayout->AllocateShaderBinding(0);
m_texturedPipeline.UboShaderBinding->Update({ m_texturedPipeline.uboShaderBinding->Update({
{ {
0, 0,
Nz::ShaderBinding::UniformBufferBinding { Nz::ShaderBinding::UniformBufferBinding {
@ -504,10 +504,10 @@ namespace Nz
pipelineVertexBuffer.binding = 0; pipelineVertexBuffer.binding = 0;
pipelineVertexBuffer.declaration = Nz::VertexDeclaration::Get(Nz::VertexLayout::XYZ_Color_UV); pipelineVertexBuffer.declaration = Nz::VertexDeclaration::Get(Nz::VertexLayout::XYZ_Color_UV);
m_untexturedPipeline.Pipeline = renderDevice->InstantiateRenderPipeline(pipelineInfo); m_untexturedPipeline.pipeline = renderDevice->InstantiateRenderPipeline(pipelineInfo);
m_untexturedPipeline.UboShaderBinding = renderPipelineLayout->AllocateShaderBinding(0); m_untexturedPipeline.uboShaderBinding = renderPipelineLayout->AllocateShaderBinding(0);
m_untexturedPipeline.UboShaderBinding->Update({ m_untexturedPipeline.uboShaderBinding->Update({
{ {
0, 0,
Nz::ShaderBinding::UniformBufferBinding { Nz::ShaderBinding::UniformBufferBinding {
@ -598,28 +598,28 @@ namespace Nz
if (nullptr != texture) if (nullptr != texture)
{ {
if (std::end(m_texturedPipeline.TextureShaderBindings) == m_texturedPipeline.TextureShaderBindings.find(texture)) if (std::end(m_texturedPipeline.textureShaderBindings) == m_texturedPipeline.textureShaderBindings.find(texture))
{ {
auto binding = m_texturedPipeline.Pipeline->GetPipelineInfo().pipelineLayout->AllocateShaderBinding(1); auto binding = m_texturedPipeline.pipeline->GetPipelineInfo().pipelineLayout->AllocateShaderBinding(1);
binding->Update({ binding->Update({
{ {
0, 0,
Nz::ShaderBinding::TextureBinding { Nz::ShaderBinding::TextureBinding {
texture, m_texturedPipeline.TextureSampler.get() texture, m_texturedPipeline.textureSampler.get()
} }
} }
}); });
m_texturedPipeline.TextureShaderBindings[texture] = std::move(binding); m_texturedPipeline.textureShaderBindings[texture] = std::move(binding);
} }
builder.BindPipeline(*m_texturedPipeline.Pipeline); builder.BindPipeline(*m_texturedPipeline.pipeline);
builder.BindShaderBinding(0, *m_texturedPipeline.UboShaderBinding); builder.BindShaderBinding(0, *m_texturedPipeline.uboShaderBinding);
builder.BindShaderBinding(1, *m_texturedPipeline.TextureShaderBindings[texture]); builder.BindShaderBinding(1, *m_texturedPipeline.textureShaderBindings[texture]);
} }
else else
{ {
builder.BindPipeline(*m_untexturedPipeline.Pipeline); builder.BindPipeline(*m_untexturedPipeline.pipeline);
builder.BindShaderBinding(0, *m_untexturedPipeline.UboShaderBinding); builder.BindShaderBinding(0, *m_untexturedPipeline.uboShaderBinding);
} }
builder.SetViewport(Nz::Recti{ 0, 0, fb_width, fb_height }); builder.SetViewport(Nz::Recti{ 0, 0, fb_width, fb_height });