From 0127b2dfebcd93d80ce2f129226c572312ee8247 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Fri, 4 Oct 2024 05:58:00 -0400 Subject: [PATCH] Some organization cleanup --- src/engine/EngineContext.cpp | 15 ++++++++++----- src/engine/assets/{ => transfer}/TransferData.cpp | 0 src/engine/assets/{ => transfer}/TransferData.hpp | 0 .../assets/{ => transfer}/TransferManager.cpp | 0 .../assets/{ => transfer}/TransferManager.hpp | 0 src/engine/camera/Camera.cpp | 2 ++ src/engine/camera/CameraRenderer.cpp | 1 + src/engine/{ => math}/Average.hpp | 0 src/engine/math/math.hpp | 7 ------- src/engine/memory/buffers/vector/BufferVector.cpp | 2 +- src/engine/memory/buffers/vector/DeviceVector.hpp | 2 +- src/engine/rendering/SwapChain.cpp | 2 +- src/engine/systems/GuiSystem.cpp | 1 + src/engine/systems/LineDrawer.cpp | 2 +- src/engine/texture/Texture.cpp | 2 +- 15 files changed, 19 insertions(+), 17 deletions(-) rename src/engine/assets/{ => transfer}/TransferData.cpp (100%) rename src/engine/assets/{ => transfer}/TransferData.hpp (100%) rename src/engine/assets/{ => transfer}/TransferManager.cpp (100%) rename src/engine/assets/{ => transfer}/TransferManager.hpp (100%) rename src/engine/{ => math}/Average.hpp (100%) delete mode 100644 src/engine/math/math.hpp diff --git a/src/engine/EngineContext.cpp b/src/engine/EngineContext.cpp index e51de8c..2bc8bd3 100644 --- a/src/engine/EngineContext.cpp +++ b/src/engine/EngineContext.cpp @@ -14,9 +14,9 @@ #include "KeyboardMovementController.hpp" #include "camera/Camera.hpp" #include "camera/CameraManager.hpp" -#include "engine/Average.hpp" -#include "engine/assets/TransferManager.hpp" #include "engine/assets/model/builders/SceneBuilder.hpp" +#include "engine/assets/transfer/TransferManager.hpp" +#include "engine/math/Average.hpp" #include "engine/math/literals/size.hpp" namespace fgl::engine @@ -56,6 +56,7 @@ namespace fgl::engine void EngineContext::tickDeltaTime() { + ZoneScoped; // Get delta time const auto now { fgl::clock::now() }; const std::chrono::duration< double, std::chrono::seconds::period > time_diff { now - last_tick }; @@ -67,6 +68,7 @@ namespace fgl::engine void EngineContext::tickSimulation() { + ZoneScoped; // TODO: This is where we'll start doing physics stuff. // The first step here should be culling things that aren't needed to be ticked. // Perhaps implementing a tick system that doesn't care about the refresh rate might be good? @@ -75,6 +77,7 @@ namespace fgl::engine void EngineContext::renderCameras( FrameInfo frame_info ) { + ZoneScoped; auto& camera_manager { CameraManager::getInstance() }; for ( auto& current_camera_ptr : camera_manager.getCameras() ) { @@ -90,9 +93,9 @@ namespace fgl::engine void EngineContext::renderFrame() { + ZoneScoped; if ( auto& command_buffer = m_renderer.beginFrame(); *command_buffer ) { - ZoneScopedN( "Render" ); const FrameIndex frame_index { m_renderer.getFrameIndex() }; const PresentIndex present_idx { m_renderer.getPresentIndex() }; @@ -181,8 +184,10 @@ namespace fgl::engine { memory::TransferManager::getInstance().submitNow(); - ZoneScopedN( "Poll" ); - glfwPollEvents(); + { + ZoneScopedN( "Poll" ); + glfwPollEvents(); + } const auto new_time { fgl::clock::now() }; diff --git a/src/engine/assets/TransferData.cpp b/src/engine/assets/transfer/TransferData.cpp similarity index 100% rename from src/engine/assets/TransferData.cpp rename to src/engine/assets/transfer/TransferData.cpp diff --git a/src/engine/assets/TransferData.hpp b/src/engine/assets/transfer/TransferData.hpp similarity index 100% rename from src/engine/assets/TransferData.hpp rename to src/engine/assets/transfer/TransferData.hpp diff --git a/src/engine/assets/TransferManager.cpp b/src/engine/assets/transfer/TransferManager.cpp similarity index 100% rename from src/engine/assets/TransferManager.cpp rename to src/engine/assets/transfer/TransferManager.cpp diff --git a/src/engine/assets/TransferManager.hpp b/src/engine/assets/transfer/TransferManager.hpp similarity index 100% rename from src/engine/assets/TransferManager.hpp rename to src/engine/assets/transfer/TransferManager.hpp diff --git a/src/engine/camera/Camera.cpp b/src/engine/camera/Camera.cpp index a1ac5a5..cd74985 100644 --- a/src/engine/camera/Camera.cpp +++ b/src/engine/camera/Camera.cpp @@ -47,6 +47,7 @@ namespace fgl::engine void Camera::updateInfo( const FrameIndex frame_index ) { + ZoneScoped; CameraInfo current_camera_info { .projection = getProjectionMatrix(), .view = getViewMatrix(), .inverse_view = getInverseViewMatrix() }; @@ -68,6 +69,7 @@ namespace fgl::engine void Camera::pass( FrameInfo& frame_info ) { + ZoneScopedN( "Camera::pass" ); if ( m_cold && m_swapchain ) { //TODO: Make some way to destroy the swapchain in a deffered manner. diff --git a/src/engine/camera/CameraRenderer.cpp b/src/engine/camera/CameraRenderer.cpp index f785ade..b14e552 100644 --- a/src/engine/camera/CameraRenderer.cpp +++ b/src/engine/camera/CameraRenderer.cpp @@ -129,6 +129,7 @@ namespace fgl::engine void CameraRenderer::pass( FrameInfo& frame_info, CameraSwapchain& camera_swapchain ) { + ZoneScopedN( "CameraRenderer::pass" ); m_culling_system.startPass( frame_info ); auto& command_buffer { frame_info.command_buffer }; diff --git a/src/engine/Average.hpp b/src/engine/math/Average.hpp similarity index 100% rename from src/engine/Average.hpp rename to src/engine/math/Average.hpp diff --git a/src/engine/math/math.hpp b/src/engine/math/math.hpp deleted file mode 100644 index 930749f..0000000 --- a/src/engine/math/math.hpp +++ /dev/null @@ -1,7 +0,0 @@ -// -// Created by kj16609 on 2/29/24. -// - -#pragma once - -#include "midpoint.hpp" diff --git a/src/engine/memory/buffers/vector/BufferVector.cpp b/src/engine/memory/buffers/vector/BufferVector.cpp index 10bc220..6416025 100644 --- a/src/engine/memory/buffers/vector/BufferVector.cpp +++ b/src/engine/memory/buffers/vector/BufferVector.cpp @@ -4,7 +4,7 @@ #include "BufferVector.hpp" -#include "engine/assets/TransferManager.hpp" +#include "engine/assets/transfer/TransferManager.hpp" #include "engine/memory/buffers/Buffer.hpp" namespace fgl::engine::memory diff --git a/src/engine/memory/buffers/vector/DeviceVector.hpp b/src/engine/memory/buffers/vector/DeviceVector.hpp index 01d464e..1ee9e1f 100644 --- a/src/engine/memory/buffers/vector/DeviceVector.hpp +++ b/src/engine/memory/buffers/vector/DeviceVector.hpp @@ -6,7 +6,7 @@ #include "BufferVector.hpp" #include "concepts.hpp" -#include "engine/assets/TransferManager.hpp" +#include "engine/assets/transfer/TransferManager.hpp" #include "engine/math/literals/size.hpp" #include "engine/debug/logging/logging.hpp" diff --git a/src/engine/rendering/SwapChain.cpp b/src/engine/rendering/SwapChain.cpp index 3aa2bb0..a8aa2b1 100644 --- a/src/engine/rendering/SwapChain.cpp +++ b/src/engine/rendering/SwapChain.cpp @@ -7,7 +7,7 @@ #include #include -#include "engine/assets/TransferManager.hpp" +#include "engine/assets/transfer/TransferManager.hpp" #include "engine/descriptors/DescriptorSet.hpp" #include "pipelines/Attachment.hpp" #include "renderpass/RenderPass.hpp" diff --git a/src/engine/systems/GuiSystem.cpp b/src/engine/systems/GuiSystem.cpp index 0710ac5..2a9af6d 100644 --- a/src/engine/systems/GuiSystem.cpp +++ b/src/engine/systems/GuiSystem.cpp @@ -34,6 +34,7 @@ namespace fgl::engine void GuiSystem::pass( FrameInfo& info ) { + ZoneScopedN( "GuiSystem::pass" ); auto& command_buffer { setupSystem( info ) }; command_buffer.draw( 3, 1, 0, 0 ); diff --git a/src/engine/systems/LineDrawer.cpp b/src/engine/systems/LineDrawer.cpp index 7275ac1..3813260 100644 --- a/src/engine/systems/LineDrawer.cpp +++ b/src/engine/systems/LineDrawer.cpp @@ -49,9 +49,9 @@ namespace fgl::engine void LineDrawer::pass( FrameInfo& info ) { + ZoneScopedN( "LineDrawer::pass" ); debug::drawAxisHelper(); - ZoneScopedN( "Debug line drawing" ); auto& command_buffer { setupSystem( info ) }; TracyVkZone( info.tracy_ctx, *command_buffer, "Draw debug lines" ); diff --git a/src/engine/texture/Texture.cpp b/src/engine/texture/Texture.cpp index ceb57aa..938382e 100644 --- a/src/engine/texture/Texture.cpp +++ b/src/engine/texture/Texture.cpp @@ -7,7 +7,7 @@ #include #include "engine/FrameInfo.hpp" -#include "engine/assets/TransferManager.hpp" +#include "engine/assets/transfer/TransferManager.hpp" #include "engine/descriptors/DescriptorSet.hpp" #include "engine/assets/image/Image.hpp" #include "engine/assets/image/ImageView.hpp"