kbz_8/MacroLibX
1
0
Fork 0
mirror of https://github.com/seekrs/MacroLibX.git synced 2026-01-11 22:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

still refactor

Browse Source
This commit is contained in:
kbz_8
2024-04-24 13:47:58 +02:00
parent 1d9a51e4f7
commit afee09d1ea
10 changed files with 288 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/Includes/Renderer/Images/TextureAtlas.h
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/07 16:36:33 by maldavid #+# #+# */ /* Created: 2023/04/07 16:36:33 by maldavid #+# #+# */
/* Updated: 2024/03/28 22:12:13 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:37:54 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -27,7 +27,6 @@ namespace mlx
void Destroy() noexcept override; void Destroy() noexcept override;
inline void SetDescriptor(DescriptorSet&& set) noexcept { m_set = set; } inline void SetDescriptor(DescriptorSet&& set) noexcept { m_set = set; }
inline VkDescriptorSet GetVkSet() noexcept { return m_set.isInit() ? m_set.get() : VK_NULL_HANDLE; }
inline DescriptorSet GetSet() noexcept { return m_set; } inline DescriptorSet GetSet() noexcept { return m_set; }
inline void UpdateSet(int binding) noexcept { m_set.writeDescriptor(binding, *this); m_has_been_updated = true; } inline void UpdateSet(int binding) noexcept { m_set.writeDescriptor(binding, *this); m_has_been_updated = true; }
inline bool HasBeenUpdated() const noexcept { return m_has_been_updated; } inline bool HasBeenUpdated() const noexcept { return m_has_been_updated; }

6
runtime/Includes/Renderer/PixelPut.h
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/03/31 13:18:50 by maldavid #+# #+# */ /* Created: 2023/03/31 13:18:50 by maldavid #+# #+# */
/* Updated: 2024/03/28 22:28:46 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:46:11 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -26,12 +26,12 @@ namespace mlx
void Init(std::uint32_t width, std::uint32_t height, class Renderer& renderer) noexcept; void Init(std::uint32_t width, std::uint32_t height, class Renderer& renderer) noexcept;
void SetPixel(int x, int y, std::uint32_t color) noexcept; void SetPixel(int x, int y, std::uint32_t color) noexcept;
void Render(std::array<VkDescriptorSet, 2>& sets, class Renderer& renderer) noexcept; void Render(class Renderer& renderer) noexcept;
void Clear(); void Clear();
void Destroy() noexcept; void Destroy() noexcept;
~PixelPutPipeline(); ~PixelPutPipeline() = default;
private: private:
Texture m_texture; Texture m_texture;

13
runtime/Includes/Renderer/Renderer.h
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/18 17:14:45 by maldavid #+# #+# */ /* Created: 2022/12/18 17:14:45 by maldavid #+# #+# */
/* Updated: 2024/04/23 22:25:13 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:53:20 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -45,14 +45,12 @@ namespace mlx
inline void SetWindow(NonOwningPtr<class Window> window) { m_window = window; } inline void SetWindow(NonOwningPtr<class Window> window) { m_window = window; }
inline Surface& GetSurface() noexcept { return m_surface; } inline Surface& GetSurface() noexcept { return m_surface; }
inline CmdPool& GetCmdPool() noexcept { return m_cmd.GetCmdPool(); }
inline NonOwningPtr<UniformBuffer> GetUniformBuffer() noexcept { return m_uniform_buffer.get(); } inline NonOwningPtr<UniformBuffer> GetUniformBuffer() noexcept { return m_uniform_buffer.get(); }
inline SwapChain& GetSwapChain() noexcept { return m_swapchain; } inline SwapChain& GetSwapChain() noexcept { return m_swapchain; }
inline Semaphore& GetSemaphore(int i) noexcept { return m_semaphores[i]; }
inline RenderPass& GetRenderPass() noexcept { return m_pass; } inline RenderPass& GetRenderPass() noexcept { return m_pass; }
inline GraphicPipeline& GetPipeline() noexcept { return m_pipeline; } inline GraphicPipeline& GetPipeline() noexcept { return m_pipeline; }
inline CmdBuffer& GetCmdBuffer(int i) noexcept { return m_cmd.GetCmdBuffer(i); } inline CommandBuffer& GetCmdBuffer(int i) noexcept { return m_cmd.GetCmdBuffer(i); }
inline CmdBuffer& GetActiveCmdBuffer() noexcept { return m_cmd.GetCmdBuffer(m_current_frame_index); } inline CommandBuffer& GetActiveCmdBuffer() noexcept { return m_cmd.GetCmdBuffer(m_current_frame_index); }
inline FrameBuffer& GetFrameBuffer(int i) noexcept { return m_framebuffers[i]; } inline FrameBuffer& GetFrameBuffer(int i) noexcept { return m_framebuffers[i]; }
inline DescriptorSet& GetVertDescriptorSet() noexcept { return m_vert_set; } inline DescriptorSet& GetVertDescriptorSet() noexcept { return m_vert_set; }
inline DescriptorSet& GetFragDescriptorSet() noexcept { return m_frag_set; } inline DescriptorSet& GetFragDescriptorSet() noexcept { return m_frag_set; }
@@ -68,11 +66,12 @@ namespace mlx
private: private:
GraphicPipeline m_pipeline; GraphicPipeline m_pipeline;
CmdManager m_cmd; CommandManager m_cmd;
RenderPass m_pass; RenderPass m_pass;
Surface m_surface; Surface m_surface;
SwapChain m_swapchain; SwapChain m_swapchain;
std::array<Semaphore, MAX_FRAMES_IN_FLIGHT> m_semaphores; std::array<Semaphore, MAX_FRAMES_IN_FLIGHT> m_render_finished_semaphores;
std::array<Semaphore, MAX_FRAMES_IN_FLIGHT> m_image_available_semaphores;
std::vector<FrameBuffer> m_framebuffers; std::vector<FrameBuffer> m_framebuffers;
DescriptorSet m_vert_set; DescriptorSet m_vert_set;

61
runtime/Sources/Renderer/PixelPut.cpp
View File

@@ -1,70 +1,67 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* pixel_put.cpp :+: :+: :+: */ /* PixelPut.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/03/31 15:14:50 by maldavid #+# #+# */ /* Created: 2023/03/31 15:14:50 by maldavid #+# #+# */
/* Updated: 2024/03/25 19:03:45 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:46:06 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <pre_compiled.h> #include <PreCompiled.h>
#include <renderer/pixel_put.h> #include <Renderer/PixelPut.h>
#include <core/profiler.h>
namespace mlx namespace mlx
{ {
void PixelPutPipeline::init(std::uint32_t width, std::uint32_t height, Renderer& renderer) noexcept void PixelPutPipeline::Init(std::uint32_t width, std::uint32_t height, Renderer& renderer) noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
_texture.create(nullptr, width, height, VK_FORMAT_R8G8B8A8_UNORM, "__mlx_pixel_put_pipeline_texture", true); m_texture.Create(nullptr, width, height, VK_FORMAT_R8G8B8A8_UNORM, "__mlx_pixel_put_pipeline_texture", true);
_texture.setDescriptor(renderer.getFragDescriptorSet().duplicate()); m_texture.SetDescriptor(renderer.GetFragDescriptorSet().Duplicate());
_buffer.create(Buffer::kind::dynamic, sizeof(std::uint32_t) * (width * height), VK_BUFFER_USAGE_TRANSFER_SRC_BIT, "__mlx_pixel_put_pipeline_texture"); m_buffer.Create(BufferType::HighDynamic, sizeof(std::uint32_t) * (width * height), VK_BUFFER_USAGE_TRANSFER_SRC_BIT, "__mlx_pixel_put_pipeline_texture");
_buffer.mapMem(&_buffer_map); m_buffer.MapMem(&_buffer_map);
_cpu_map = std::vector<std::uint32_t>(height * width + 1, 0); m_cpu_map = std::vector<std::uint32_t>(height * width + 1, 0);
_width = width; m_width = width;
_height = height; m_height = height;
} }
void PixelPutPipeline::setPixel(int x, int y, std::uint32_t color) noexcept void PixelPutPipeline::SetPixel(int x, int y, std::uint32_t color) noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(x < 0 || y < 0 || x > static_cast<int>(_width) || y > static_cast<int>(_height)) if(x < 0 || y < 0 || x > static_cast<int>(m_width) || y > static_cast<int>(m_height))
return; return;
_cpu_map[(y * _width) + x] = color; m_cpu_map[(y * m_width) + x] = color;
_has_been_modified = true; m_has_been_modified = true;
} }
void PixelPutPipeline::clear() void PixelPutPipeline::Clear()
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
_cpu_map.assign(_width * _height, 0); m_cpu_map.assign(m_width * m_height, 0);
_has_been_modified = true; m_has_been_modified = true;
} }
void PixelPutPipeline::render(std::array<VkDescriptorSet, 2>& sets, Renderer& renderer) noexcept void PixelPutPipeline::Render(Renderer& renderer) noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(_has_been_modified) if(m_has_been_modified)
{ {
std::memcpy(_buffer_map, _cpu_map.data(), sizeof(std::uint32_t) * _cpu_map.size()); std::memcpy(m_buffer_map, m_cpu_map.data(), sizeof(std::uint32_t) * m_cpu_map.size());
_texture.copyFromBuffer(_buffer); m_texture.CopyFromBuffer(m_buffer);
_has_been_modified = false; m_has_been_modified = false;
} }
_texture.updateSet(0); m_texture.UpdateSet(0);
_texture.render(sets, renderer, 0, 0); m_texture.Render(renderer, 0, 0);
} }
void PixelPutPipeline::destroy() noexcept void PixelPutPipeline::Destroy() noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
_buffer.destroy(); m_buffer.Destroy();
_texture.destroy(); m_texture.Destroy();
} }
PixelPutPipeline::~PixelPutPipeline() {}
} }

199
runtime/Sources/Renderer/Renderer.cpp
View File

@@ -1,192 +1,195 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* renderer.cpp :+: :+: :+: */ /* Renderer.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/18 17:25:16 by maldavid #+# #+# */ /* Created: 2022/12/18 17:25:16 by maldavid #+# #+# */
/* Updated: 2024/03/25 19:03:49 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:58:51 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <pre_compiled.h> #include <PreCompiled.h>
#include <renderer/renderer.h> #include <Renderer/Renderer.h>
#include <renderer/images/texture.h> #include <Renderer/Images/Texture.h>
#include <renderer/core/render_core.h> #include <Renderer/Core/RenderCore.h>
#include <core/profiler.h>
namespace mlx namespace mlx
{ {
void Renderer::init(Texture* render_target) void Renderer::Init(NonOwningPtr<Texture> render_target)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(render_target == nullptr) if(!render_target)
{ {
_surface.create(*this); m_surface.Create(*this);
_swapchain.init(this); m_swapchain.Init(this);
_pass.init(_swapchain.getImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); m_pass.Init(m_swapchain.GetImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
for(std::size_t i = 0; i < _swapchain.getImagesNumber(); i++) for(std::size_t i = 0; i < m_swapchain.GetImagesNumber(); i++)
_framebuffers.emplace_back().init(_pass, _swapchain.getImage(i)); m_framebuffers.emplace_back().Init(m_pass, m_swapchain.GetImage(i));
} }
else else
{ {
_render_target = render_target; m_render_target = render_target;
_render_target->transitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); m_render_target->TransitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
_pass.init(_render_target->getFormat(), _render_target->getLayout()); m_pass.Init(m_render_target->GetFormat(), m_render_target->GetLayout());
_framebuffers.emplace_back().init(_pass, *static_cast<Image*>(_render_target)); m_framebuffers.emplace_back().Init(m_pass, *static_cast<Image*>(m_render_target));
} }
_cmd.init(); m_cmd.Init();
for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
_semaphores[i].init(); {
m_render_finished_semaphores[i].Init();
m_image_available_semaphores[i].Init();
}
_uniform_buffer.reset(new UBO); m_uniform_buffer.reset(new UniformBuffer);
#ifdef DEBUG #ifdef DEBUG
_uniform_buffer->create(this, sizeof(glm::mat4), "__mlx_matrices_uniform_buffer_"); m_uniform_buffer->Create(this, sizeof(glm::mat4), "__mlx_matrices_uniform_buffer_");
#else #else
_uniform_buffer->create(this, sizeof(glm::mat4), nullptr); m_uniform_buffer->Create(this, sizeof(glm::mat4), nullptr);
#endif #endif
_vert_layout.init({ DescriptorSetLayout vert_layout;
DescriptorSetLayout frag_layout;
vert_layout.Init({
{0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER} {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER}
}, VK_SHADER_STAGE_VERTEX_BIT); }, VK_SHADER_STAGE_VERTEX_BIT);
_frag_layout.init({ frag_layout.Init({
{0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER} {0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER}
}, VK_SHADER_STAGE_FRAGMENT_BIT); }, VK_SHADER_STAGE_FRAGMENT_BIT);
_vert_set.init(this, &Render_Core::get().getDescriptorPool(), &_vert_layout); m_vert_set.Init(this, &RenderCore::Get().GetDescriptorPool(), std::move(vert_layout));
_frag_set.init(this, &Render_Core::get().getDescriptorPool(), &_frag_layout); m_frag_set.Init(this, &RenderCore::Get().GetDescriptorPool(), std::move(frag_layout));
_vert_set.writeDescriptor(0, _uniform_buffer.get()); m_vert_set.WriteDescriptor(0, m_uniform_buffer.Get());
_pipeline.init(*this); m_pipeline.Init(*this);
_framebuffer_resized = false; m_framebuffer_resized = false;
} }
bool Renderer::beginFrame() bool Renderer::BeginFrame()
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
auto device = Render_Core::get().getDevice().get(); auto device = RenderCore::Get().GetDevice().Get();
if(_render_target == nullptr) if(!m_render_target)
{ {
_cmd.getCmdBuffer(_current_frame_index).waitForExecution(); m_cmd.GetCmdBuffer(m_current_frame_index).WaitForExecution();
VkResult result = vkAcquireNextImageKHR(device, _swapchain(), UINT64_MAX, _semaphores[_current_frame_index].getImageSemaphore(), VK_NULL_HANDLE, &_image_index); VkResult result = vkAcquireNextImageKHR(device, m_swapchain.Get(), UINT64_MAX, m_image_available_semaphores[m_current_frame_index].Get(), VK_NULL_HANDLE, &m_image_index);
if(result == VK_ERROR_OUT_OF_DATE_KHR) if(result == VK_ERROR_OUT_OF_DATE_KHR)
{ {
recreateRenderData(); RecreateRenderData();
return false; return false;
} }
else if(result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR) else if(result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR)
core::error::report(e_kind::fatal_error, "Vulkan error : failed to acquire swapchain image"); FatalError("Vulkan error : failed to acquire swapchain image");
} }
else else
{ {
_image_index = 0; m_image_index = 0;
if(_render_target->getLayout() != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) if(m_render_target->GetLayout() != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL)
_render_target->transitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); m_render_target->TransitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
} }
_cmd.getCmdBuffer(_current_frame_index).reset(); m_cmd.GetCmdBuffer(m_current_frame_index).Reset();
_cmd.getCmdBuffer(_current_frame_index).beginRecord(); m_cmd.GetCmdBuffer(m_current_frame_index).BeginRecord();
auto& fb = _framebuffers[_image_index]; auto& fb = _framebuffers[_image_index];
_pass.begin(getActiveCmdBuffer(), fb); m_pass.Begin(GetActiveCmdBuffer(), fb);
_pipeline.bindPipeline(_cmd.getCmdBuffer(_current_frame_index)); m_pipeline.BindPipeline(m_cmd.GetCmdBuffer(m_current_frame_index));
VkViewport viewport{}; VkViewport viewport{};
viewport.x = 0.0f; viewport.x = 0.0f;
viewport.y = 0.0f; viewport.y = 0.0f;
viewport.width = static_cast<float>(fb.getWidth()); viewport.width = static_cast<float>(fb.GetWidth());
viewport.height = static_cast<float>(fb.getHeight()); viewport.height = static_cast<float>(fb.GetHeight());
viewport.minDepth = 0.0f; viewport.minDepth = 0.0f;
viewport.maxDepth = 1.0f; viewport.maxDepth = 1.0f;
vkCmdSetViewport(_cmd.getCmdBuffer(_current_frame_index).get(), 0, 1, &viewport); vkCmdSetViewport(m_cmd.GetCmdBuffer(m_current_frame_index).Get(), 0, 1, &viewport);
VkRect2D scissor{}; VkRect2D scissor{};
scissor.offset = { 0, 0 }; scissor.offset = { 0, 0 };
scissor.extent = { fb.getWidth(), fb.getHeight()}; scissor.extent = { fb.GetWidth(), fb.GetHeight()};
vkCmdSetScissor(_cmd.getCmdBuffer(_current_frame_index).get(), 0, 1, &scissor); vkCmdSetScissor(m_cmd.GetCmdBuffer(m_current_frame_index).Get(), 0, 1, &scissor);
return true; return true;
} }
void Renderer::endFrame() void Renderer::EndFrame()
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
_pass.end(getActiveCmdBuffer()); m_pass.End(GetActiveCmdBuffer());
_cmd.getCmdBuffer(_current_frame_index).endRecord(); m_cmd.GetCmdBuffer(m_current_frame_index).EndRecord();
if(_render_target == nullptr) if(!m_render_target)
{ {
_cmd.getCmdBuffer(_current_frame_index).submit(&_semaphores[_current_frame_index]); m_cmd.GetCmdBuffer(m_current_frame_index).Submit(&m_render_finished_semaphores[m_current_frame_index]);
VkSwapchainKHR swapchain = _swapchain(); VkSwapchainKHR swapchain = m_swapchain.Get();
VkSemaphore signalSemaphores[] = { _semaphores[_current_frame_index].getRenderImageSemaphore() }; VkSemaphore signal_semaphores[] = { m_render_finished_semaphores[m_current_frame_index].Get() };
VkPresentInfoKHR presentInfo{}; VkPresentInfoKHR present_info{};
presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
presentInfo.waitSemaphoreCount = 1; present_info.waitSemaphoreCount = 1;
presentInfo.pWaitSemaphores = signalSemaphores; present_info.pWaitSemaphores = signal_semaphores;
presentInfo.swapchainCount = 1; present_info.swapchainCount = 1;
presentInfo.pSwapchains = &swapchain; present_info.pSwapchains = &swapchain;
presentInfo.pImageIndices = &_image_index; present_info.pImageIndices = &m_image_index;
VkResult result = vkQueuePresentKHR(RenderCore::Get().GetQueue().GetPresent(), &present_info);
VkResult result = vkQueuePresentKHR(Render_Core::get().getQueue().getPresent(), &presentInfo); if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || m_framebuffer_resized)
if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || _framebuffer_resized)
{ {
_framebuffer_resized = false; m_framebuffer_resized = false;
recreateRenderData(); RecreateRenderData();
} }
else if(result != VK_SUCCESS) else if(result != VK_SUCCESS)
core::error::report(e_kind::fatal_error, "Vulkan error : failed to present swap chain image"); FatalError("Vulkan error : failed to present swap chain image");
_current_frame_index = (_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT; m_current_frame_index = (m_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT;
} }
else else
{ {
_cmd.getCmdBuffer(_current_frame_index).submitIdle(true); m_cmd.GetCmdBuffer(m_current_frame_index).SubmitIdle(true);
_current_frame_index = 0; m_current_frame_index = 0;
} }
} }
void Renderer::recreateRenderData() void Renderer::RecreateRenderData()
{ {
_swapchain.recreate(); m_swapchain.Recreate();
_pass.destroy(); m_pass.Destroy();
_pass.init(_swapchain.getImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); m_pass.Init(m_swapchain.GetImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
for(auto& fb : _framebuffers) for(auto& fb : m_framebuffers)
fb.destroy(); fb.Destroy();
_framebuffers.clear(); m_framebuffers.clear();
for(std::size_t i = 0; i < _swapchain.getImagesNumber(); i++) for(std::size_t i = 0; i < m_swapchain.GetImagesNumber(); i++)
_framebuffers.emplace_back().init(_pass, _swapchain.getImage(i)); m_framebuffers.emplace_back().Init(m_pass, m_swapchain.GetImage(i));
} }
void Renderer::destroy() void Renderer::Destroy()
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
vkDeviceWaitIdle(Render_Core::get().getDevice().get()); vkDeviceWaitIdle(RenderCore::Get().GetDevice().Get());
_pipeline.destroy(); m_ipeline.Destroy();
_uniform_buffer->destroy(); muniform_buffer->Destroy();
_vert_layout.destroy(); mvert_layout.Destroy();
_frag_layout.destroy(); mfrag_layout.Destroy();
_frag_set.destroy(); mfrag_set.Destroy();
_vert_set.destroy(); mvert_set.Destroy();
_cmd.destroy(); mcmd.Destroy();
_pass.destroy(); mpass.Destroy();
if(_render_target == nullptr) if(!m_render_target)
{ {
_swapchain.destroy(); m_swapchain.Destroy();
_surface.destroy(); m_surface.Destroy();
} }
for(auto& fb : _framebuffers) for(auto& fb : m_framebuffers)
fb.destroy(); fb.Destroy();
for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
_semaphores[i].destroy(); m_semaphores[i].Destroy();
} }
} }

56
runtime/Sources/Renderer/Texts/FontLibrary.cpp
View File

@@ -6,64 +6,62 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/18 09:28:14 by maldavid #+# #+# */ /* Created: 2024/01/18 09:28:14 by maldavid #+# #+# */
/* Updated: 2024/04/23 22:59:16 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:28:40 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <PreCompiled.h> #include <PreCompiled.h>
#include <renderer/texts/font_library.h> #include <Renderer/Texts/FontLibrary.h>
#include <renderer/texts/font.h> #include <Renderer/Texts/Font.h>
#include <core/errors.h> #include <Renderer/Renderer.h>
#include <renderer/renderer.h>
#include <core/profiler.h>
namespace mlx namespace mlx
{ {
std::shared_ptr<Font> FontLibrary::getFontData(FontID id) std::shared_ptr<Font> FontLibrary::GetFontData(FontID id)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(!_cache.count(id) || std::find(_invalid_ids.begin(), _invalid_ids.end(), id) != _invalid_ids.end()) if(!m_cache.count(id) || std::find(m_invalid_ids.begin(), m_invalid_ids.end(), id) != m_invalid_ids.end())
core::error::report(e_kind::fatal_error, "Font Library : wrong font ID '%d'", id); FatalError("Font Library : wrong font ID '%'", id);
return _cache[id]; return m_cache[id];
} }
FontID FontLibrary::addFontToLibrary(std::shared_ptr<Font> font) FontID FontLibrary::AddFontToLibrary(std::shared_ptr<Font> font)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
auto it = std::find_if(_cache.begin(), _cache.end(), [&](const std::pair<FontID, std::shared_ptr<Font>>& v) auto it = std::find_if(m_cache.begin(), m_cache.end(), [&](const std::pair<FontID, std::shared_ptr<Font>>& v)
{ {
return v.second->getScale() == font->getScale() && return v.second->GetScale() == font->GetScale() &&
v.second->getName() == font->getName() && v.second->GetName() == font->GetName() &&
std::find(_invalid_ids.begin(), _invalid_ids.end(), v.first) == _invalid_ids.end(); std::find(m_invalid_ids.begin(), m_invalid_ids.end(), v.first) == m_invalid_ids.end();
}); });
if(it != _cache.end()) if(it != m_cache.end())
return it->first; return it->first;
font->buildFont(); font->BuildFont();
_cache[_current_id] = font; m_cache[m_current_id] = font;
_current_id++; m_current_id++;
return _current_id - 1; return m_current_id - 1;
} }
void FontLibrary::removeFontFromLibrary(FontID id) void FontLibrary::RemoveFontFromLibrary(FontID id)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(!_cache.count(id) || std::find(_invalid_ids.begin(), _invalid_ids.end(), id) != _invalid_ids.end()) if(!m_cache.count(id) || std::find(m_invalid_ids.begin(), m_invalid_ids.end(), id) != m_invalid_ids.end())
{ {
core::error::report(e_kind::warning, "Font Library : trying to remove a font with an unkown or invalid ID '%d'", id); Warning("Font Library : trying to remove a font with an unkown or invalid ID '%'", id);
return; return;
} }
_cache[id]->destroy(); m_cache[id]->Destroy();
_invalid_ids.push_back(id); m_invalid_ids.push_back(id);
} }
void FontLibrary::clearLibrary() void FontLibrary::ClearLibrary()
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
for(auto& [id, font] : _cache) for(auto& [id, font] : m_cache)
{ {
font->destroy(); font->Destroy();
_invalid_ids.push_back(id); m_invalid_ids.push_back(id);
} }
// do not `_cache.clear();` as it releases the fonts and may not destroy the texture atlas that is in use by command buffers // do not `_cache.clear();` as it releases the fonts and may not destroy the texture atlas that is in use by command buffers
} }

55
runtime/Sources/Renderer/Texts/Text.cpp
View File

@@ -1,79 +1,78 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* text.cpp :+: :+: :+: */ /* Text.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/11 00:11:56 by maldavid #+# #+# */ /* Created: 2024/01/11 00:11:56 by maldavid #+# #+# */
/* Updated: 2024/03/25 19:04:01 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:33:58 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <pre_compiled.h> #include <PreCompiled.h>
#include <core/profiler.h> #include <Renderer/Texts/Text.h>
#include <renderer/texts/text.h> #include <Renderer/Renderer.h>
#include <renderer/renderer.h>
namespace mlx namespace mlx
{ {
void Text::init(std::string text, FontID font, std::uint32_t color, std::vector<Vertex> vbo_data, std::vector<std::uint16_t> ibo_data) void Text::Init(std::string text, FontID font, std::uint32_t color, std::vector<Vertex> vbo_data, std::vector<std::uint16_t> ibo_data)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(_is_init) if(m_is_init)
return; return;
_text = std::move(text); m_text = std::move(text);
_color = color; m_color = color;
_font = font; m_font = font;
#ifdef DEBUG #ifdef DEBUG
std::string debug_name = _text; std::string debug_name = m_text;
for(char& c : debug_name) for(char& c : debug_name)
{ {
if(c == ' ' || c == '"' || c == '\'') if(c == ' ' || c == '"' || c == '\'')
c = '_'; c = '_';
} }
for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
_vbo[i].create(sizeof(Vertex) * vbo_data.size(), static_cast<const void*>(vbo_data.data()), debug_name.c_str()); m_vbo[i].Create(sizeof(Vertex) * vbo_data.size(), static_cast<const void*>(vbo_data.data()), debug_name.c_str());
_ibo.create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), debug_name.c_str()); m_ibo.Create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), debug_name.c_str());
#else #else
for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
_vbo[i].create(sizeof(Vertex) * vbo_data.size(), static_cast<const void*>(vbo_data.data()), nullptr); m_vbo[i].Create(sizeof(Vertex) * vbo_data.size(), static_cast<const void*>(vbo_data.data()), nullptr);
_ibo.create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), nullptr); m_ibo.Create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), nullptr);
#endif #endif
_is_init = true; m_is_init = true;
} }
void Text::bind(Renderer& renderer) noexcept void Text::Bind(Renderer& renderer) noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(!_is_init) if(!m_is_init)
return; return;
_vbo[renderer.getActiveImageIndex()].bind(renderer); m_vbo[renderer.GetActiveImageIndex()].Bind(renderer);
_ibo.bind(renderer); m_ibo.Bind(renderer);
} }
void Text::updateVertexData(int frame, std::vector<Vertex> vbo_data) void Text::updateVertexData(int frame, std::vector<Vertex> vbo_data)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(!_is_init) if(!m_is_init)
return; return;
_vbo[frame].setData(sizeof(Vertex) * vbo_data.size(), static_cast<const void*>(vbo_data.data())); m_vbo[frame].SetData(sizeof(Vertex) * vbo_data.size(), static_cast<const void*>(vbo_data.data()));
} }
void Text::destroy() noexcept void Text::destroy() noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(!_is_init) if(!m_is_init)
return; return;
for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
_vbo[i].destroy(); m_vbo[i].Destroy();
_ibo.destroy(); m_ibo.Destroy();
_is_init = false; m_is_init = false;
} }
Text::~Text() Text::~Text()
{ {
destroy(); Destroy();
} }
} }

99
runtime/Sources/Renderer/Texts/TextDescriptor.cpp
View File

@@ -1,61 +1,60 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* text_descriptor.cpp :+: :+: :+: */ /* TextDescriptor.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/11 00:23:11 by maldavid #+# #+# */ /* Created: 2024/01/11 00:23:11 by maldavid #+# #+# */
/* Updated: 2024/03/25 19:04:52 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:38:40 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <pre_compiled.h> #include <Preompiled.h>
#include <core/profiler.h> #include <Renderer/Images/TextureAtlas.h>
#include <renderer/texts/text_descriptor.h> #include <Renderer/Texts/TextDescriptor.h>
#include <renderer/images/texture_atlas.h> #include <Renderer/Texts/Font.h>
#include <renderer/texts/font.h> #include <Renderer/Texts/Text.h>
#include <renderer/texts/text.h>
#define STB_RECT_PACK_IMPLEMENTATION #define STB_RECT_PACK_IMPLEMENTATION
#include <stb_rect_pack.h> #include <stb_rect_pack.h>
#include <core/memory.h> #include <Core/Memory.h>
#define STB_TRUETYPE_IMPLEMENTATION #define STB_TRUETYPE_IMPLEMENTATION
#define STB_malloc(x, u) ((void)(u), MemManager::malloc(x)) #define STB_malloc(x, u) ((void)(u), MemManager::Malloc(x))
#define STB_free(x, u) ((void)(u), MemManager::free(x)) #define STB_free(x, u) ((void)(u), MemManager::Free(x))
#include <stb_truetype.h> #include <stb_truetype.h>
constexpr const int RANGE = 1024; constexpr const int RANGE = 1024;
namespace mlx namespace mlx
{ {
TextDrawDescriptor::TextDrawDescriptor(std::string text, std::uint32_t _color, int _x, int _y) : color(_color), x(_x), y(_y), _text(std::move(text)) TextDrawDescriptor::TextDrawDescriptor(std::string text, std::uint32_t _color, int _x, int _y) : color(_color), x(_x), y(_y), m_text(std::move(text))
{} {}
void TextDrawDescriptor::init(FontID font) noexcept void TextDrawDescriptor::Init(FontID font) noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
std::vector<Vertex> vertexData; std::vector<Vertex> vertex_data;
std::vector<std::uint16_t> indexData; std::vector<std::uint16_t> index_data;
float stb_x = 0.0f; float stb_x = 0.0f;
float stb_y = 0.0f; float stb_y = 0.0f;
{ {
std::shared_ptr<Font> font_data = FontLibrary::get().getFontData(font); std::shared_ptr<Font> font_data = FontLibrary::Get().GetFontData(font);
for(char c : _text) for(char c : m_text)
{ {
if(c < 32) if(c < 32)
continue; continue;
stbtt_aligned_quad q; stbtt_aligned_quad q;
stbtt_GetPackedQuad(font_data->getCharData().data(), RANGE, RANGE, c - 32, &stb_x, &stb_y, &q, 1); stbtt_GetPackedQuad(font_data->GetCharData().data(), RANGE, RANGE, c - 32, &stb_x, &stb_y, &q, 1);
std::size_t index = vertexData.size(); std::size_t index = vertex_data.size();
glm::vec4 vertex_color = { glm::vec4 vertex_color = {
static_cast<float>((color & 0x000000FF)) / 255.f, static_cast<float>((color & 0x000000FF)) / 255.f,
@@ -64,49 +63,45 @@ namespace mlx
static_cast<float>((color & 0xFF000000) >> 24) / 255.f static_cast<float>((color & 0xFF000000) >> 24) / 255.f
}; };
vertexData.emplace_back(glm::vec2{q.x0, q.y0}, vertex_color, glm::vec2{q.s0, q.t0}); vertex_data.emplace_back(glm::vec2{q.x0, q.y0}, vertex_color, glm::vec2{q.s0, q.t0});
vertexData.emplace_back(glm::vec2{q.x1, q.y0}, vertex_color, glm::vec2{q.s1, q.t0}); vertex_data.emplace_back(glm::vec2{q.x1, q.y0}, vertex_color, glm::vec2{q.s1, q.t0});
vertexData.emplace_back(glm::vec2{q.x1, q.y1}, vertex_color, glm::vec2{q.s1, q.t1}); vertex_data.emplace_back(glm::vec2{q.x1, q.y1}, vertex_color, glm::vec2{q.s1, q.t1});
vertexData.emplace_back(glm::vec2{q.x0, q.y1}, vertex_color, glm::vec2{q.s0, q.t1}); vertex_data.emplace_back(glm::vec2{q.x0, q.y1}, vertex_color, glm::vec2{q.s0, q.t1});
indexData.emplace_back(index + 0); index_data.emplace_back(index + 0);
indexData.emplace_back(index + 1); index_data.emplace_back(index + 1);
indexData.emplace_back(index + 2); index_data.emplace_back(index + 2);
indexData.emplace_back(index + 2); index_data.emplace_back(index + 2);
indexData.emplace_back(index + 3); index_data.emplace_back(index + 3);
indexData.emplace_back(index + 0); index_data.emplace_back(index + 0);
} }
} }
std::shared_ptr<Text> text_data = std::make_shared<Text>(); std::shared_ptr<Text> text_data = std::make_shared<Text>();
text_data->init(_text, font, color, std::move(vertexData), std::move(indexData)); text_data->Init(m_text, font, color, std::move(vertex_data), std::move(index_data));
id = TextLibrary::get().addTextToLibrary(text_data); id = TextLibrary::Get().AddTextToLibrary(text_data);
DebugLog("Text put : registered new text to render");
#ifdef DEBUG
core::error::report(e_kind::message, "Text put : registered new text to render");
#endif
} }
void TextDrawDescriptor::render(std::array<VkDescriptorSet, 2>& sets, Renderer& renderer) void TextDrawDescriptor::Render(Renderer& renderer)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
std::shared_ptr<Text> draw_data = TextLibrary::get().getTextData(id); std::shared_ptr<Text> draw_data = TextLibrary::Get().GetTextData(id);
std::shared_ptr<Font> font_data = FontLibrary::get().getFontData(draw_data->getFontInUse()); std::shared_ptr<Font> font_data = FontLibrary::Get().GetFontData(draw_data->GetFontInUse());
TextureAtlas& atlas = const_cast<TextureAtlas&>(font_data->getAtlas()); TextureAtlas& atlas = const_cast<TextureAtlas&>(font_data->GetAtlas());
draw_data->bind(renderer); draw_data->Bind(renderer);
if(!atlas.getSet().isInit()) if(!atlas.GetSet().IsInit())
atlas.setDescriptor(renderer.getFragDescriptorSet().duplicate()); atlas.SetDescriptor(renderer.GetFragDescriptorSet().Duplicate());
if(!atlas.hasBeenUpdated()) if(!atlas.HasBeenUpdated())
atlas.updateSet(0); atlas.UpdateSet(0);
sets[1] = const_cast<TextureAtlas&>(atlas).getVkSet(); atlas.GetSet().Bind();
vkCmdBindDescriptorSets(renderer.getActiveCmdBuffer().get(), VK_PIPELINE_BIND_POINT_GRAPHICS, renderer.getPipeline().getPipelineLayout(), 0, sets.size(), sets.data(), 0, nullptr); atlas.Render(renderer, x, y, draw_data->GetIBOsize());
atlas.render(renderer, x, y, draw_data->getIBOsize());
} }
void TextDrawDescriptor::resetUpdate() void TextDrawDescriptor::ResetUpdate()
{ {
std::shared_ptr<Text> draw_data = TextLibrary::get().getTextData(id); std::shared_ptr<Text> draw_data = TextLibrary::Get().GetTextData(id);
std::shared_ptr<Font> font_data = FontLibrary::get().getFontData(draw_data->getFontInUse()); std::shared_ptr<Font> font_data = FontLibrary::Get().GetFontData(draw_data->GetFontInUse());
TextureAtlas& atlas = const_cast<TextureAtlas&>(font_data->getAtlas()); TextureAtlas& atlas = const_cast<TextureAtlas&>(font_data->GetAtlas());
atlas.resetUpdate(); atlas.ResetUpdate();
} }
} }

54
runtime/Sources/Renderer/Texts/TextLibrary.cpp
View File

@@ -1,64 +1,62 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* text_library.cpp :+: :+: :+: */ /* TextLibrary.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/10 11:59:57 by maldavid #+# #+# */ /* Created: 2023/04/10 11:59:57 by maldavid #+# #+# */
/* Updated: 2024/03/25 19:05:09 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:40:28 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <pre_compiled.h> #include <PreCompiled.h>
#include <renderer/texts/text_library.h> #include <Renderer/Texts/TextLibrary.h>
#include <renderer/texts/text.h> #include <Renderer/Texts/Text.h>
#include <core/errors.h> #include <Renderer/Renderer.h>
#include <renderer/renderer.h>
#include <core/profiler.h>
namespace mlx namespace mlx
{ {
std::shared_ptr<Text> TextLibrary::getTextData(TextID id) std::shared_ptr<Text> TextLibrary::GetTextData(TextID id)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(!_cache.count(id)) if(!m_cache.count(id))
core::error::report(e_kind::fatal_error, "Text Library : wrong text ID '%d'", id); FatalError("Text Library : wrong text ID '%d'", id);
return _cache[id]; return m_cache[id];
} }
TextID TextLibrary::addTextToLibrary(std::shared_ptr<Text> text) TextID TextLibrary::AddTextToLibrary(std::shared_ptr<Text> text)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
auto it = std::find_if(_cache.begin(), _cache.end(), [&](const std::pair<TextID, std::shared_ptr<Text>>& v) auto it = std::find_if(m_cache.begin(), m_cache.end(), [&](const std::pair<TextID, std::shared_ptr<Text>>& v)
{ {
return v.second->getText() == text->getText() && v.second->getColor() == text->getColor(); return v.second->GetText() == text->GetText() && v.second->GetColor() == text->GetColor();
}); });
if(it != _cache.end()) if(it != m_cache.end())
return it->first; return it->first;
_cache[_current_id] = text; m_cache[m_current_id] = text;
_current_id++; m_current_id++;
return _current_id - 1; return m_current_id - 1;
} }
void TextLibrary::removeTextFromLibrary(TextID id) void TextLibrary::RemoveTextFromLibrary(TextID id)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
if(!_cache.count(id)) if(!m_cache.count(id))
{ {
core::error::report(e_kind::warning, "Text Library : trying to remove a text with an unkown or invalid ID '%d'", id); Warning("Text Library : trying to remove a text with an unkown or invalid ID '%d'", id);
return; return;
} }
_cache[id]->destroy(); m_cache[id]->Destroy();
_cache.erase(id); m_cache.erase(id);
} }
void TextLibrary::clearLibrary() void TextLibrary::ClearLibrary()
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
for(auto& [id, text] : _cache) for(auto& [id, text] : m_cache)
text->destroy(); text->Destroy();
_cache.clear(); m_cache.clear();
} }
} }

45
runtime/Sources/Renderer/Texts/TextManager.cpp
View File

@@ -1,34 +1,32 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* text_manager.cpp :+: :+: :+: */ /* TextManager.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/06 16:41:13 by maldavid #+# #+# */ /* Created: 2023/04/06 16:41:13 by maldavid #+# #+# */
/* Updated: 2024/03/25 19:05:13 by maldavid ### ########.fr */ /* Updated: 2024/04/24 01:42:19 by maldavid ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <pre_compiled.h> #include <PreCompiled.h>
#include <renderer/texts/text_descriptor.h> #include <Renderer/Texts/TextDescriptor.h>
#include <renderer/texts/text_library.h> #include <Renderer/Texts/TextLibrary.h>
#include <renderer/texts/text.h> #include <Renderer/Texts/Text.h>
#include <renderer/texts/text_manager.h> #include <Renderer/Texts/TextManager.h>
#include <core/profiler.h> #include <Utils/DogicaTTF.h>
#include <utils/dogica_ttf.h>
namespace mlx namespace mlx
{ {
void TextManager::init(Renderer& renderer) noexcept void TextManager::Init(Renderer& renderer) noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
loadFont(renderer, "default", 6.f); LoadFont(renderer, "default", 6.f);
} }
void TextManager::loadFont(Renderer& renderer, const std::filesystem::path& filepath, float scale) void TextManager::LoadFont(Renderer& renderer, const std::filesystem::path& filepath, float scale)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
std::shared_ptr<Font> font; std::shared_ptr<Font> font;
@@ -36,33 +34,32 @@ namespace mlx
font = std::make_shared<Font>(renderer, "default", dogica_ttf, scale); font = std::make_shared<Font>(renderer, "default", dogica_ttf, scale);
else else
font = std::make_shared<Font>(renderer, filepath, scale); font = std::make_shared<Font>(renderer, filepath, scale);
m_font_in_use = FontLibrary::Get().AddFontToLibrary(font);
_font_in_use = FontLibrary::get().addFontToLibrary(font);
} }
std::pair<DrawableResource*, bool> TextManager::registerText(int x, int y, std::uint32_t color, std::string str) std::pair<DrawableResource*, bool> TextManager::RegisterText(int x, int y, std::uint32_t color, std::string str)
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
auto res = _text_descriptors.emplace(std::move(str), color, x, y); auto res = m_text_descriptors.emplace(std::move(str), color, x, y);
if(res.second) if(res.second)
{ {
const_cast<TextDrawDescriptor&>(*res.first).init(_font_in_use); const_cast<TextDrawDescriptor&>(*res.first).Init(m_font_in_use);
return std::make_pair(static_cast<DrawableResource*>(&const_cast<TextDrawDescriptor&>(*res.first)), true); return std::make_pair(static_cast<DrawableResource*>(&const_cast<TextDrawDescriptor&>(*res.first)), true);
} }
auto text_ptr = TextLibrary::get().getTextData(res.first->id); auto text_ptr = TextLibrary::Get().GetTextData(res.first->id);
if(_font_in_use != text_ptr->getFontInUse()) if(_font_in_use != text_ptr->GetFontInUse())
{ {
// TODO : update text vertex buffers rather than destroying it and recreating it // TODO : update text vertex buffers rather than destroying it and recreating it
TextLibrary::get().removeTextFromLibrary(res.first->id); TextLibrary::Get().RemoveTextFromLibrary(res.first->id);
const_cast<TextDrawDescriptor&>(*res.first).init(_font_in_use); const_cast<TextDrawDescriptor&>(*res.first).Init(_font_in_use);
} }
return std::make_pair(static_cast<DrawableResource*>(&const_cast<TextDrawDescriptor&>(*res.first)), false); return std::make_pair(static_cast<DrawableResource*>(&const_cast<TextDrawDescriptor&>(*res.first)), false);
} }
void TextManager::destroy() noexcept void TextManager::Destroy() noexcept
{ {
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
_text_descriptors.clear(); m_text_descriptors.clear();
} }
} }