diff --git a/runtime/Includes/Renderer/Images/TextureAtlas.h b/runtime/Includes/Renderer/Images/TextureAtlas.h index dc53e3c..34802fa 100644 --- a/runtime/Includes/Renderer/Images/TextureAtlas.h +++ b/runtime/Includes/Renderer/Images/TextureAtlas.h @@ -6,7 +6,7 @@ /* 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; 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 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; } diff --git a/runtime/Includes/Renderer/PixelPut.h b/runtime/Includes/Renderer/PixelPut.h index 9101643..c16d7c9 100644 --- a/runtime/Includes/Renderer/PixelPut.h +++ b/runtime/Includes/Renderer/PixelPut.h @@ -6,7 +6,7 @@ /* 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 SetPixel(int x, int y, std::uint32_t color) noexcept; - void Render(std::array& sets, class Renderer& renderer) noexcept; + void Render(class Renderer& renderer) noexcept; void Clear(); void Destroy() noexcept; - ~PixelPutPipeline(); + ~PixelPutPipeline() = default; private: Texture m_texture; diff --git a/runtime/Includes/Renderer/Renderer.h b/runtime/Includes/Renderer/Renderer.h index ac6e58e..9a0767f 100644 --- a/runtime/Includes/Renderer/Renderer.h +++ b/runtime/Includes/Renderer/Renderer.h @@ -6,7 +6,7 @@ /* 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 window) { m_window = window; } inline Surface& GetSurface() noexcept { return m_surface; } - inline CmdPool& GetCmdPool() noexcept { return m_cmd.GetCmdPool(); } inline NonOwningPtr GetUniformBuffer() noexcept { return m_uniform_buffer.get(); } 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 GraphicPipeline& GetPipeline() noexcept { return m_pipeline; } - inline CmdBuffer& GetCmdBuffer(int i) noexcept { return m_cmd.GetCmdBuffer(i); } - inline CmdBuffer& GetActiveCmdBuffer() noexcept { return m_cmd.GetCmdBuffer(m_current_frame_index); } + inline CommandBuffer& GetCmdBuffer(int i) noexcept { return m_cmd.GetCmdBuffer(i); } + inline CommandBuffer& GetActiveCmdBuffer() noexcept { return m_cmd.GetCmdBuffer(m_current_frame_index); } inline FrameBuffer& GetFrameBuffer(int i) noexcept { return m_framebuffers[i]; } inline DescriptorSet& GetVertDescriptorSet() noexcept { return m_vert_set; } inline DescriptorSet& GetFragDescriptorSet() noexcept { return m_frag_set; } @@ -68,11 +66,12 @@ namespace mlx private: GraphicPipeline m_pipeline; - CmdManager m_cmd; + CommandManager m_cmd; RenderPass m_pass; Surface m_surface; SwapChain m_swapchain; - std::array m_semaphores; + std::array m_render_finished_semaphores; + std::array m_image_available_semaphores; std::vector m_framebuffers; DescriptorSet m_vert_set; diff --git a/runtime/Sources/Renderer/PixelPut.cpp b/runtime/Sources/Renderer/PixelPut.cpp index 32c0ae3..f9743a6 100644 --- a/runtime/Sources/Renderer/PixelPut.cpp +++ b/runtime/Sources/Renderer/PixelPut.cpp @@ -1,70 +1,67 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* pixel_put.cpp :+: :+: :+: */ +/* PixelPut.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ /* 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 +#include -#include -#include +#include 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(); - _texture.create(nullptr, width, height, VK_FORMAT_R8G8B8A8_UNORM, "__mlx_pixel_put_pipeline_texture", true); - _texture.setDescriptor(renderer.getFragDescriptorSet().duplicate()); + m_texture.Create(nullptr, width, height, VK_FORMAT_R8G8B8A8_UNORM, "__mlx_pixel_put_pipeline_texture", true); + 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"); - _buffer.mapMem(&_buffer_map); - _cpu_map = std::vector(height * width + 1, 0); - _width = width; - _height = height; + m_buffer.Create(BufferType::HighDynamic, sizeof(std::uint32_t) * (width * height), VK_BUFFER_USAGE_TRANSFER_SRC_BIT, "__mlx_pixel_put_pipeline_texture"); + m_buffer.MapMem(&_buffer_map); + m_cpu_map = std::vector(height * width + 1, 0); + m_width = width; + 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(); - if(x < 0 || y < 0 || x > static_cast(_width) || y > static_cast(_height)) + if(x < 0 || y < 0 || x > static_cast(m_width) || y > static_cast(m_height)) return; - _cpu_map[(y * _width) + x] = color; - _has_been_modified = true; + m_cpu_map[(y * m_width) + x] = color; + m_has_been_modified = true; } - void PixelPutPipeline::clear() + void PixelPutPipeline::Clear() { MLX_PROFILE_FUNCTION(); - _cpu_map.assign(_width * _height, 0); - _has_been_modified = true; + m_cpu_map.assign(m_width * m_height, 0); + m_has_been_modified = true; } - void PixelPutPipeline::render(std::array& sets, Renderer& renderer) noexcept + void PixelPutPipeline::Render(Renderer& renderer) noexcept { 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()); - _texture.copyFromBuffer(_buffer); - _has_been_modified = false; + std::memcpy(m_buffer_map, m_cpu_map.data(), sizeof(std::uint32_t) * m_cpu_map.size()); + m_texture.CopyFromBuffer(m_buffer); + m_has_been_modified = false; } - _texture.updateSet(0); - _texture.render(sets, renderer, 0, 0); + m_texture.UpdateSet(0); + m_texture.Render(renderer, 0, 0); } - void PixelPutPipeline::destroy() noexcept + void PixelPutPipeline::Destroy() noexcept { MLX_PROFILE_FUNCTION(); - _buffer.destroy(); - _texture.destroy(); + m_buffer.Destroy(); + m_texture.Destroy(); } - - PixelPutPipeline::~PixelPutPipeline() {} } diff --git a/runtime/Sources/Renderer/Renderer.cpp b/runtime/Sources/Renderer/Renderer.cpp index 85102ef..0c131d0 100644 --- a/runtime/Sources/Renderer/Renderer.cpp +++ b/runtime/Sources/Renderer/Renderer.cpp @@ -1,192 +1,195 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* renderer.cpp :+: :+: :+: */ +/* Renderer.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ /* 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 +#include -#include -#include -#include -#include +#include +#include +#include namespace mlx { - void Renderer::init(Texture* render_target) + void Renderer::Init(NonOwningPtr render_target) { MLX_PROFILE_FUNCTION(); - if(render_target == nullptr) + if(!render_target) { - _surface.create(*this); - _swapchain.init(this); - _pass.init(_swapchain.getImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); - for(std::size_t i = 0; i < _swapchain.getImagesNumber(); i++) - _framebuffers.emplace_back().init(_pass, _swapchain.getImage(i)); + m_surface.Create(*this); + m_swapchain.Init(this); + m_pass.Init(m_swapchain.GetImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); + for(std::size_t i = 0; i < m_swapchain.GetImagesNumber(); i++) + m_framebuffers.emplace_back().Init(m_pass, m_swapchain.GetImage(i)); } else { - _render_target = render_target; - _render_target->transitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); - _pass.init(_render_target->getFormat(), _render_target->getLayout()); - _framebuffers.emplace_back().init(_pass, *static_cast(_render_target)); + m_render_target = render_target; + m_render_target->TransitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); + m_pass.Init(m_render_target->GetFormat(), m_render_target->GetLayout()); + m_framebuffers.emplace_back().Init(m_pass, *static_cast(m_render_target)); } - _cmd.init(); + m_cmd.Init(); 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 - _uniform_buffer->create(this, sizeof(glm::mat4), "__mlx_matrices_uniform_buffer_"); + m_uniform_buffer->Create(this, sizeof(glm::mat4), "__mlx_matrices_uniform_buffer_"); #else - _uniform_buffer->create(this, sizeof(glm::mat4), nullptr); + m_uniform_buffer->Create(this, sizeof(glm::mat4), nullptr); #endif - _vert_layout.init({ + DescriptorSetLayout vert_layout; + DescriptorSetLayout frag_layout; + + vert_layout.Init({ {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER} }, VK_SHADER_STAGE_VERTEX_BIT); - _frag_layout.init({ + frag_layout.Init({ {0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER} }, VK_SHADER_STAGE_FRAGMENT_BIT); - _vert_set.init(this, &Render_Core::get().getDescriptorPool(), &_vert_layout); - _frag_set.init(this, &Render_Core::get().getDescriptorPool(), &_frag_layout); + m_vert_set.Init(this, &RenderCore::Get().GetDescriptorPool(), std::move(vert_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(); - 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(); - VkResult result = vkAcquireNextImageKHR(device, _swapchain(), UINT64_MAX, _semaphores[_current_frame_index].getImageSemaphore(), VK_NULL_HANDLE, &_image_index); + m_cmd.GetCmdBuffer(m_current_frame_index).WaitForExecution(); + 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) { - recreateRenderData(); + RecreateRenderData(); return false; } 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 { - _image_index = 0; - if(_render_target->getLayout() != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) - _render_target->transitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); + m_image_index = 0; + if(m_render_target->GetLayout() != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) + m_render_target->TransitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); } - _cmd.getCmdBuffer(_current_frame_index).reset(); - _cmd.getCmdBuffer(_current_frame_index).beginRecord(); + m_cmd.GetCmdBuffer(m_current_frame_index).Reset(); + m_cmd.GetCmdBuffer(m_current_frame_index).BeginRecord(); 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{}; viewport.x = 0.0f; viewport.y = 0.0f; - viewport.width = static_cast(fb.getWidth()); - viewport.height = static_cast(fb.getHeight()); + viewport.width = static_cast(fb.GetWidth()); + viewport.height = static_cast(fb.GetHeight()); viewport.minDepth = 0.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{}; scissor.offset = { 0, 0 }; - scissor.extent = { fb.getWidth(), fb.getHeight()}; - vkCmdSetScissor(_cmd.getCmdBuffer(_current_frame_index).get(), 0, 1, &scissor); + scissor.extent = { fb.GetWidth(), fb.GetHeight()}; + vkCmdSetScissor(m_cmd.GetCmdBuffer(m_current_frame_index).Get(), 0, 1, &scissor); return true; } - void Renderer::endFrame() + void Renderer::EndFrame() { MLX_PROFILE_FUNCTION(); - _pass.end(getActiveCmdBuffer()); - _cmd.getCmdBuffer(_current_frame_index).endRecord(); + m_pass.End(GetActiveCmdBuffer()); + 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(); - VkSemaphore signalSemaphores[] = { _semaphores[_current_frame_index].getRenderImageSemaphore() }; + VkSwapchainKHR swapchain = m_swapchain.Get(); + VkSemaphore signal_semaphores[] = { m_render_finished_semaphores[m_current_frame_index].Get() }; - VkPresentInfoKHR presentInfo{}; - presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; - presentInfo.waitSemaphoreCount = 1; - presentInfo.pWaitSemaphores = signalSemaphores; - presentInfo.swapchainCount = 1; - presentInfo.pSwapchains = &swapchain; - presentInfo.pImageIndices = &_image_index; - - VkResult result = vkQueuePresentKHR(Render_Core::get().getQueue().getPresent(), &presentInfo); - - if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || _framebuffer_resized) + VkPresentInfoKHR present_info{}; + present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; + present_info.waitSemaphoreCount = 1; + present_info.pWaitSemaphores = signal_semaphores; + present_info.swapchainCount = 1; + present_info.pSwapchains = &swapchain; + present_info.pImageIndices = &m_image_index; + VkResult result = vkQueuePresentKHR(RenderCore::Get().GetQueue().GetPresent(), &present_info); + if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || m_framebuffer_resized) { - _framebuffer_resized = false; - recreateRenderData(); + m_framebuffer_resized = false; + RecreateRenderData(); } else if(result != VK_SUCCESS) - core::error::report(e_kind::fatal_error, "Vulkan error : failed to present swap chain image"); - _current_frame_index = (_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT; + FatalError("Vulkan error : failed to present swap chain image"); + m_current_frame_index = (m_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT; } else { - _cmd.getCmdBuffer(_current_frame_index).submitIdle(true); - _current_frame_index = 0; + m_cmd.GetCmdBuffer(m_current_frame_index).SubmitIdle(true); + m_current_frame_index = 0; } } - void Renderer::recreateRenderData() + void Renderer::RecreateRenderData() { - _swapchain.recreate(); - _pass.destroy(); - _pass.init(_swapchain.getImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); - for(auto& fb : _framebuffers) - fb.destroy(); - _framebuffers.clear(); - for(std::size_t i = 0; i < _swapchain.getImagesNumber(); i++) - _framebuffers.emplace_back().init(_pass, _swapchain.getImage(i)); + m_swapchain.Recreate(); + m_pass.Destroy(); + m_pass.Init(m_swapchain.GetImagesFormat(), VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); + for(auto& fb : m_framebuffers) + fb.Destroy(); + m_framebuffers.clear(); + for(std::size_t i = 0; i < m_swapchain.GetImagesNumber(); i++) + m_framebuffers.emplace_back().Init(m_pass, m_swapchain.GetImage(i)); } - void Renderer::destroy() + void Renderer::Destroy() { MLX_PROFILE_FUNCTION(); - vkDeviceWaitIdle(Render_Core::get().getDevice().get()); + vkDeviceWaitIdle(RenderCore::Get().GetDevice().Get()); - _pipeline.destroy(); - _uniform_buffer->destroy(); - _vert_layout.destroy(); - _frag_layout.destroy(); - _frag_set.destroy(); - _vert_set.destroy(); - _cmd.destroy(); - _pass.destroy(); - if(_render_target == nullptr) + m_ipeline.Destroy(); + muniform_buffer->Destroy(); + mvert_layout.Destroy(); + mfrag_layout.Destroy(); + mfrag_set.Destroy(); + mvert_set.Destroy(); + mcmd.Destroy(); + mpass.Destroy(); + if(!m_render_target) { - _swapchain.destroy(); - _surface.destroy(); + m_swapchain.Destroy(); + m_surface.Destroy(); } - for(auto& fb : _framebuffers) - fb.destroy(); + for(auto& fb : m_framebuffers) + fb.Destroy(); for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) - _semaphores[i].destroy(); + m_semaphores[i].Destroy(); } } diff --git a/runtime/Sources/Renderer/Texts/FontLibrary.cpp b/runtime/Sources/Renderer/Texts/FontLibrary.cpp index ec712b2..eed3b60 100644 --- a/runtime/Sources/Renderer/Texts/FontLibrary.cpp +++ b/runtime/Sources/Renderer/Texts/FontLibrary.cpp @@ -6,64 +6,62 @@ /* 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 -#include -#include -#include -#include -#include +#include +#include +#include namespace mlx { - std::shared_ptr FontLibrary::getFontData(FontID id) + std::shared_ptr FontLibrary::GetFontData(FontID id) { MLX_PROFILE_FUNCTION(); - if(!_cache.count(id) || std::find(_invalid_ids.begin(), _invalid_ids.end(), id) != _invalid_ids.end()) - core::error::report(e_kind::fatal_error, "Font Library : wrong font ID '%d'", id); - return _cache[id]; + if(!m_cache.count(id) || std::find(m_invalid_ids.begin(), m_invalid_ids.end(), id) != m_invalid_ids.end()) + FatalError("Font Library : wrong font ID '%'", id); + return m_cache[id]; } - FontID FontLibrary::addFontToLibrary(std::shared_ptr font) + FontID FontLibrary::AddFontToLibrary(std::shared_ptr font) { MLX_PROFILE_FUNCTION(); - auto it = std::find_if(_cache.begin(), _cache.end(), [&](const std::pair>& v) + auto it = std::find_if(m_cache.begin(), m_cache.end(), [&](const std::pair>& v) { - return v.second->getScale() == font->getScale() && - v.second->getName() == font->getName() && - std::find(_invalid_ids.begin(), _invalid_ids.end(), v.first) == _invalid_ids.end(); + return v.second->GetScale() == font->GetScale() && + v.second->GetName() == font->GetName() && + 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; - font->buildFont(); - _cache[_current_id] = font; - _current_id++; - return _current_id - 1; + font->BuildFont(); + m_cache[m_current_id] = font; + m_current_id++; + return m_current_id - 1; } - void FontLibrary::removeFontFromLibrary(FontID id) + void FontLibrary::RemoveFontFromLibrary(FontID id) { 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; } - _cache[id]->destroy(); - _invalid_ids.push_back(id); + m_cache[id]->Destroy(); + m_invalid_ids.push_back(id); } - void FontLibrary::clearLibrary() + void FontLibrary::ClearLibrary() { MLX_PROFILE_FUNCTION(); - for(auto& [id, font] : _cache) + for(auto& [id, font] : m_cache) { - font->destroy(); - _invalid_ids.push_back(id); + font->Destroy(); + 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 } diff --git a/runtime/Sources/Renderer/Texts/Text.cpp b/runtime/Sources/Renderer/Texts/Text.cpp index f5e3687..162307a 100644 --- a/runtime/Sources/Renderer/Texts/Text.cpp +++ b/runtime/Sources/Renderer/Texts/Text.cpp @@ -1,79 +1,78 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* text.cpp :+: :+: :+: */ +/* Text.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ /* 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 +#include -#include -#include -#include +#include +#include namespace mlx { - void Text::init(std::string text, FontID font, std::uint32_t color, std::vector vbo_data, std::vector ibo_data) + void Text::Init(std::string text, FontID font, std::uint32_t color, std::vector vbo_data, std::vector ibo_data) { MLX_PROFILE_FUNCTION(); - if(_is_init) + if(m_is_init) return; - _text = std::move(text); - _color = color; - _font = font; + m_text = std::move(text); + m_color = color; + m_font = font; #ifdef DEBUG - std::string debug_name = _text; + std::string debug_name = m_text; for(char& c : debug_name) { if(c == ' ' || c == '"' || c == '\'') c = '_'; } for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) - _vbo[i].create(sizeof(Vertex) * vbo_data.size(), static_cast(vbo_data.data()), debug_name.c_str()); - _ibo.create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), debug_name.c_str()); + m_vbo[i].Create(sizeof(Vertex) * vbo_data.size(), static_cast(vbo_data.data()), debug_name.c_str()); + m_ibo.Create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), debug_name.c_str()); #else for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) - _vbo[i].create(sizeof(Vertex) * vbo_data.size(), static_cast(vbo_data.data()), nullptr); - _ibo.create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), nullptr); + m_vbo[i].Create(sizeof(Vertex) * vbo_data.size(), static_cast(vbo_data.data()), nullptr); + m_ibo.Create(sizeof(std::uint16_t) * ibo_data.size(), ibo_data.data(), nullptr); #endif - _is_init = true; + m_is_init = true; } - void Text::bind(Renderer& renderer) noexcept + void Text::Bind(Renderer& renderer) noexcept { MLX_PROFILE_FUNCTION(); - if(!_is_init) + if(!m_is_init) return; - _vbo[renderer.getActiveImageIndex()].bind(renderer); - _ibo.bind(renderer); + m_vbo[renderer.GetActiveImageIndex()].Bind(renderer); + m_ibo.Bind(renderer); } void Text::updateVertexData(int frame, std::vector vbo_data) { MLX_PROFILE_FUNCTION(); - if(!_is_init) + if(!m_is_init) return; - _vbo[frame].setData(sizeof(Vertex) * vbo_data.size(), static_cast(vbo_data.data())); + m_vbo[frame].SetData(sizeof(Vertex) * vbo_data.size(), static_cast(vbo_data.data())); } void Text::destroy() noexcept { MLX_PROFILE_FUNCTION(); - if(!_is_init) + if(!m_is_init) return; for(int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) - _vbo[i].destroy(); - _ibo.destroy(); - _is_init = false; + m_vbo[i].Destroy(); + m_ibo.Destroy(); + m_is_init = false; } Text::~Text() { - destroy(); + Destroy(); } } diff --git a/runtime/Sources/Renderer/Texts/TextDescriptor.cpp b/runtime/Sources/Renderer/Texts/TextDescriptor.cpp index 4637bd7..b4a3208 100644 --- a/runtime/Sources/Renderer/Texts/TextDescriptor.cpp +++ b/runtime/Sources/Renderer/Texts/TextDescriptor.cpp @@ -1,61 +1,60 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* text_descriptor.cpp :+: :+: :+: */ +/* TextDescriptor.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ /* 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 +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #define STB_RECT_PACK_IMPLEMENTATION #include -#include +#include #define STB_TRUETYPE_IMPLEMENTATION -#define STB_malloc(x, u) ((void)(u), MemManager::malloc(x)) -#define STB_free(x, u) ((void)(u), MemManager::free(x)) +#define STB_malloc(x, u) ((void)(u), MemManager::Malloc(x)) +#define STB_free(x, u) ((void)(u), MemManager::Free(x)) #include constexpr const int RANGE = 1024; 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(); - std::vector vertexData; - std::vector indexData; + std::vector vertex_data; + std::vector index_data; float stb_x = 0.0f; float stb_y = 0.0f; { - std::shared_ptr font_data = FontLibrary::get().getFontData(font); + std::shared_ptr font_data = FontLibrary::Get().GetFontData(font); - for(char c : _text) + for(char c : m_text) { if(c < 32) continue; 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 = { static_cast((color & 0x000000FF)) / 255.f, @@ -64,49 +63,45 @@ namespace mlx static_cast((color & 0xFF000000) >> 24) / 255.f }; - vertexData.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}); - vertexData.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.y0}, vertex_color, glm::vec2{q.s0, q.t0}); + vertex_data.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.y1}, vertex_color, glm::vec2{q.s1, 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); - indexData.emplace_back(index + 1); - indexData.emplace_back(index + 2); - indexData.emplace_back(index + 2); - indexData.emplace_back(index + 3); - indexData.emplace_back(index + 0); + index_data.emplace_back(index + 0); + index_data.emplace_back(index + 1); + index_data.emplace_back(index + 2); + index_data.emplace_back(index + 2); + index_data.emplace_back(index + 3); + index_data.emplace_back(index + 0); } } std::shared_ptr text_data = std::make_shared(); - text_data->init(_text, font, color, std::move(vertexData), std::move(indexData)); - id = TextLibrary::get().addTextToLibrary(text_data); - - #ifdef DEBUG - core::error::report(e_kind::message, "Text put : registered new text to render"); - #endif + text_data->Init(m_text, font, color, std::move(vertex_data), std::move(index_data)); + id = TextLibrary::Get().AddTextToLibrary(text_data); + DebugLog("Text put : registered new text to render"); } - void TextDrawDescriptor::render(std::array& sets, Renderer& renderer) + void TextDrawDescriptor::Render(Renderer& renderer) { MLX_PROFILE_FUNCTION(); - std::shared_ptr draw_data = TextLibrary::get().getTextData(id); - std::shared_ptr font_data = FontLibrary::get().getFontData(draw_data->getFontInUse()); - TextureAtlas& atlas = const_cast(font_data->getAtlas()); - draw_data->bind(renderer); - if(!atlas.getSet().isInit()) - atlas.setDescriptor(renderer.getFragDescriptorSet().duplicate()); - if(!atlas.hasBeenUpdated()) - atlas.updateSet(0); - sets[1] = const_cast(atlas).getVkSet(); - 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()); + std::shared_ptr draw_data = TextLibrary::Get().GetTextData(id); + std::shared_ptr font_data = FontLibrary::Get().GetFontData(draw_data->GetFontInUse()); + TextureAtlas& atlas = const_cast(font_data->GetAtlas()); + draw_data->Bind(renderer); + if(!atlas.GetSet().IsInit()) + atlas.SetDescriptor(renderer.GetFragDescriptorSet().Duplicate()); + if(!atlas.HasBeenUpdated()) + atlas.UpdateSet(0); + atlas.GetSet().Bind(); + atlas.Render(renderer, x, y, draw_data->GetIBOsize()); } - void TextDrawDescriptor::resetUpdate() + void TextDrawDescriptor::ResetUpdate() { - std::shared_ptr draw_data = TextLibrary::get().getTextData(id); - std::shared_ptr font_data = FontLibrary::get().getFontData(draw_data->getFontInUse()); - TextureAtlas& atlas = const_cast(font_data->getAtlas()); - atlas.resetUpdate(); + std::shared_ptr draw_data = TextLibrary::Get().GetTextData(id); + std::shared_ptr font_data = FontLibrary::Get().GetFontData(draw_data->GetFontInUse()); + TextureAtlas& atlas = const_cast(font_data->GetAtlas()); + atlas.ResetUpdate(); } } diff --git a/runtime/Sources/Renderer/Texts/TextLibrary.cpp b/runtime/Sources/Renderer/Texts/TextLibrary.cpp index 9ed7d4c..5f995d9 100644 --- a/runtime/Sources/Renderer/Texts/TextLibrary.cpp +++ b/runtime/Sources/Renderer/Texts/TextLibrary.cpp @@ -1,64 +1,62 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* text_library.cpp :+: :+: :+: */ +/* TextLibrary.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ /* 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 +#include -#include -#include -#include -#include -#include +#include +#include +#include namespace mlx { - std::shared_ptr TextLibrary::getTextData(TextID id) + std::shared_ptr TextLibrary::GetTextData(TextID id) { MLX_PROFILE_FUNCTION(); - if(!_cache.count(id)) - core::error::report(e_kind::fatal_error, "Text Library : wrong text ID '%d'", id); - return _cache[id]; + if(!m_cache.count(id)) + FatalError("Text Library : wrong text ID '%d'", id); + return m_cache[id]; } - TextID TextLibrary::addTextToLibrary(std::shared_ptr text) + TextID TextLibrary::AddTextToLibrary(std::shared_ptr text) { MLX_PROFILE_FUNCTION(); - auto it = std::find_if(_cache.begin(), _cache.end(), [&](const std::pair>& v) + auto it = std::find_if(m_cache.begin(), m_cache.end(), [&](const std::pair>& 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; - _cache[_current_id] = text; - _current_id++; - return _current_id - 1; + m_cache[m_current_id] = text; + m_current_id++; + return m_current_id - 1; } - void TextLibrary::removeTextFromLibrary(TextID id) + void TextLibrary::RemoveTextFromLibrary(TextID id) { 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; } - _cache[id]->destroy(); - _cache.erase(id); + m_cache[id]->Destroy(); + m_cache.erase(id); } - void TextLibrary::clearLibrary() + void TextLibrary::ClearLibrary() { MLX_PROFILE_FUNCTION(); - for(auto& [id, text] : _cache) - text->destroy(); - _cache.clear(); + for(auto& [id, text] : m_cache) + text->Destroy(); + m_cache.clear(); } } diff --git a/runtime/Sources/Renderer/Texts/TextManager.cpp b/runtime/Sources/Renderer/Texts/TextManager.cpp index 5430e2e..b660ea2 100644 --- a/runtime/Sources/Renderer/Texts/TextManager.cpp +++ b/runtime/Sources/Renderer/Texts/TextManager.cpp @@ -1,34 +1,32 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* text_manager.cpp :+: :+: :+: */ +/* TextManager.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ /* 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 +#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include namespace mlx { - void TextManager::init(Renderer& renderer) noexcept + void TextManager::Init(Renderer& renderer) noexcept { 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(); std::shared_ptr font; @@ -36,33 +34,32 @@ namespace mlx font = std::make_shared(renderer, "default", dogica_ttf, scale); else font = std::make_shared(renderer, filepath, scale); - - _font_in_use = FontLibrary::get().addFontToLibrary(font); + m_font_in_use = FontLibrary::Get().AddFontToLibrary(font); } - std::pair TextManager::registerText(int x, int y, std::uint32_t color, std::string str) + std::pair TextManager::RegisterText(int x, int y, std::uint32_t color, std::string str) { 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) { - const_cast(*res.first).init(_font_in_use); + const_cast(*res.first).Init(m_font_in_use); return std::make_pair(static_cast(&const_cast(*res.first)), true); } - auto text_ptr = TextLibrary::get().getTextData(res.first->id); - if(_font_in_use != text_ptr->getFontInUse()) + auto text_ptr = TextLibrary::Get().GetTextData(res.first->id); + if(_font_in_use != text_ptr->GetFontInUse()) { // TODO : update text vertex buffers rather than destroying it and recreating it - TextLibrary::get().removeTextFromLibrary(res.first->id); - const_cast(*res.first).init(_font_in_use); + TextLibrary::Get().RemoveTextFromLibrary(res.first->id); + const_cast(*res.first).Init(_font_in_use); } return std::make_pair(static_cast(&const_cast(*res.first)), false); } - void TextManager::destroy() noexcept + void TextManager::Destroy() noexcept { MLX_PROFILE_FUNCTION(); - _text_descriptors.clear(); + m_text_descriptors.clear(); } }