From ad6ee9a0e53a380a46e751a2e407dc202973c6d7 Mon Sep 17 00:00:00 2001 From: Anish Bhobe Date: Sat, 15 Feb 2025 15:17:17 +0100 Subject: [PATCH] Aster cleanup. --- aster/CMakeLists.txt | 58 ++++++++++--------- aster/include/aster/aster.h | 8 +++ aster/{ => include/aster/core}/buffer.h | 0 aster/{ => include/aster/core}/config.h | 0 aster/{ => include/aster/core}/constants.h | 0 aster/{ => include/aster/core}/context.h | 0 aster/{ => include/aster/core}/device.h | 0 aster/{ => include/aster/core}/global.h | 2 +- aster/{ => include/aster/core}/image.h | 0 .../aster/core}/physical_device.h | 0 aster/{ => include/aster/core}/pipeline.h | 0 .../aster/core}/queue_allocation.h | 0 aster/{ => include/aster/core}/size.h | 0 aster/{ => include/aster/core}/surface.h | 0 aster/{ => include/aster/core}/swapchain.h | 0 aster/{ => include/aster/core}/window.h | 0 aster/{ => include/aster/util}/logger.h | 2 +- aster/{ => src/aster/core}/buffer.cpp | 4 +- aster/{ => src/aster/core}/context.cpp | 3 +- aster/{ => src/aster/core}/device.cpp | 8 +-- aster/{ => src/aster/core}/global.cpp | 2 +- aster/{ => src/aster/core}/image.cpp | 4 +- .../{ => src/aster/core}/physical_device.cpp | 7 +-- aster/{ => src/aster/core}/pipeline.cpp | 4 +- aster/{ => src/aster/core}/surface.cpp | 6 +- aster/{ => src/aster/core}/swapchain.cpp | 9 ++- aster/{ => src/aster/core}/window.cpp | 6 +- aster/{ => src/aster/util}/logger.cpp | 2 +- samples/00_util/CMakeLists.txt | 12 ++-- samples/00_util/frame.cpp | 5 +- samples/00_util/frame.h | 4 +- samples/00_util/gui.cpp | 30 +++++----- samples/00_util/gui.h | 2 +- samples/00_util/helpers.cpp | 4 +- samples/00_util/helpers.h | 4 +- samples/01_triangle/triangle.cpp | 20 +++---- samples/02_box/box.cpp | 23 ++++---- samples/03_model_render/asset_loader.cpp | 10 ++-- samples/03_model_render/asset_loader.h | 5 +- .../03_model_render/gpu_resource_manager.cpp | 7 ++- .../03_model_render/gpu_resource_manager.h | 2 +- samples/03_model_render/ibl_helpers.cpp | 10 ++-- samples/03_model_render/ibl_helpers.h | 4 +- samples/03_model_render/light_manager.cpp | 2 +- samples/03_model_render/light_manager.h | 2 +- samples/03_model_render/model_render.cpp | 23 ++++---- samples/03_model_render/nodes.h | 4 +- samples/03_model_render/pipeline_utils.cpp | 4 +- samples/03_model_render/pipeline_utils.h | 4 +- samples/04_scenes/asset_loader.cpp | 8 +-- samples/04_scenes/asset_loader.h | 4 +- samples/04_scenes/camera.h | 2 +- samples/04_scenes/core_components.h | 2 +- samples/04_scenes/ibl_helpers.cpp | 10 ++-- samples/04_scenes/ibl_helpers.h | 2 +- samples/04_scenes/light_manager.cpp | 2 +- samples/04_scenes/light_manager.h | 2 +- samples/04_scenes/main.cpp | 15 ++--- samples/04_scenes/pipeline_utils.cpp | 3 +- samples/04_scenes/pipeline_utils.h | 4 +- samples/04_scenes/render_resource_manager.cpp | 7 ++- samples/04_scenes/render_resource_manager.h | 2 +- 62 files changed, 195 insertions(+), 174 deletions(-) create mode 100644 aster/include/aster/aster.h rename aster/{ => include/aster/core}/buffer.h (100%) rename aster/{ => include/aster/core}/config.h (100%) rename aster/{ => include/aster/core}/constants.h (100%) rename aster/{ => include/aster/core}/context.h (100%) rename aster/{ => include/aster/core}/device.h (100%) rename aster/{ => include/aster/core}/global.h (99%) rename aster/{ => include/aster/core}/image.h (100%) rename aster/{ => include/aster/core}/physical_device.h (100%) rename aster/{ => include/aster/core}/pipeline.h (100%) rename aster/{ => include/aster/core}/queue_allocation.h (100%) rename aster/{ => include/aster/core}/size.h (100%) rename aster/{ => include/aster/core}/surface.h (100%) rename aster/{ => include/aster/core}/swapchain.h (100%) rename aster/{ => include/aster/core}/window.h (100%) rename aster/{ => include/aster/util}/logger.h (99%) rename aster/{ => src/aster/core}/buffer.cpp (99%) rename aster/{ => src/aster/core}/context.cpp (99%) rename aster/{ => src/aster/core}/device.cpp (98%) rename aster/{ => src/aster/core}/global.cpp (99%) rename aster/{ => src/aster/core}/image.cpp (99%) rename aster/{ => src/aster/core}/physical_device.cpp (98%) rename aster/{ => src/aster/core}/pipeline.cpp (93%) rename aster/{ => src/aster/core}/surface.cpp (94%) rename aster/{ => src/aster/core}/swapchain.cpp (98%) rename aster/{ => src/aster/core}/window.cpp (97%) rename aster/{ => src/aster/util}/logger.cpp (93%) diff --git a/aster/CMakeLists.txt b/aster/CMakeLists.txt index 6de7829..ccd5fde 100644 --- a/aster/CMakeLists.txt +++ b/aster/CMakeLists.txt @@ -11,41 +11,43 @@ find_package(VulkanMemoryAllocator CONFIG REQUIRED) find_package(EASTL CONFIG REQUIRED) set(HEADER_FILES - "constants.h" - "config.h" - "logger.h" - "global.h" - "context.h" - "window.h" - "physical_device.h" - "device.h" - "swapchain.h" - "pipeline.h" - "queue_allocation.h" - "buffer.h" - "image.h" - "surface.h" - "size.h") + "include/aster/core/global.h" + "include/aster/util/logger.h" + "include/aster/core/constants.h" + "include/aster/core/config.h" + "include/aster/core/context.h" + "include/aster/core/physical_device.h" + "include/aster/core/device.h" + "include/aster/core/swapchain.h" + "include/aster/core/pipeline.h" + "include/aster/core/queue_allocation.h" + "include/aster/core/buffer.h" + "include/aster/core/image.h" + "include/aster/core/surface.h" + "include/aster/core/size.h" + "include/aster/core/window.h" + "include/aster/aster.h") set(SOURCE_FILES - "logger.cpp" - "global.cpp" - "context.cpp" - "window.cpp" - "physical_device.cpp" - "device.cpp" - "swapchain.cpp" - "pipeline.cpp" - "buffer.cpp" - "image.cpp" - "surface.cpp") + "src/aster/core/global.cpp" + "src/aster/util/logger.cpp" + "src/aster/core/context.cpp" + "src/aster/core/physical_device.cpp" + "src/aster/core/device.cpp" + "src/aster/core/swapchain.cpp" + "src/aster/core/pipeline.cpp" + "src/aster/core/buffer.cpp" + "src/aster/core/image.cpp" + "src/aster/core/surface.cpp" + "src/aster/core/window.cpp") add_library(aster_core STATIC ${SOURCE_FILES} ${HEADER_FILES}) set_property(TARGET aster_core PROPERTY CXX_STANDARD 20) -target_precompile_headers(aster_core PUBLIC global.h) +target_precompile_headers(aster_core PUBLIC "include/aster/aster.h") -target_include_directories(aster_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(aster_core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/aster") +target_include_directories(aster_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(aster_core PUBLIC glm::glm-header-only) target_link_libraries(aster_core PRIVATE glfw) diff --git a/aster/include/aster/aster.h b/aster/include/aster/aster.h new file mode 100644 index 0000000..ce6284a --- /dev/null +++ b/aster/include/aster/aster.h @@ -0,0 +1,8 @@ +// ============================================= +// Aster: aster.h +// Copyright (c) 2020-2024 Anish Bhobe +// ============================================= + +#pragma once + +#include "core/global.h" \ No newline at end of file diff --git a/aster/buffer.h b/aster/include/aster/core/buffer.h similarity index 100% rename from aster/buffer.h rename to aster/include/aster/core/buffer.h diff --git a/aster/config.h b/aster/include/aster/core/config.h similarity index 100% rename from aster/config.h rename to aster/include/aster/core/config.h diff --git a/aster/constants.h b/aster/include/aster/core/constants.h similarity index 100% rename from aster/constants.h rename to aster/include/aster/core/constants.h diff --git a/aster/context.h b/aster/include/aster/core/context.h similarity index 100% rename from aster/context.h rename to aster/include/aster/core/context.h diff --git a/aster/device.h b/aster/include/aster/core/device.h similarity index 100% rename from aster/device.h rename to aster/include/aster/core/device.h diff --git a/aster/global.h b/aster/include/aster/core/global.h similarity index 99% rename from aster/global.h rename to aster/include/aster/core/global.h index a020475..07400b8 100644 --- a/aster/global.h +++ b/aster/include/aster/core/global.h @@ -7,7 +7,7 @@ #include "config.h" #include "constants.h" -#include "logger.h" +#include "util/logger.h" #include #include diff --git a/aster/image.h b/aster/include/aster/core/image.h similarity index 100% rename from aster/image.h rename to aster/include/aster/core/image.h diff --git a/aster/physical_device.h b/aster/include/aster/core/physical_device.h similarity index 100% rename from aster/physical_device.h rename to aster/include/aster/core/physical_device.h diff --git a/aster/pipeline.h b/aster/include/aster/core/pipeline.h similarity index 100% rename from aster/pipeline.h rename to aster/include/aster/core/pipeline.h diff --git a/aster/queue_allocation.h b/aster/include/aster/core/queue_allocation.h similarity index 100% rename from aster/queue_allocation.h rename to aster/include/aster/core/queue_allocation.h diff --git a/aster/size.h b/aster/include/aster/core/size.h similarity index 100% rename from aster/size.h rename to aster/include/aster/core/size.h diff --git a/aster/surface.h b/aster/include/aster/core/surface.h similarity index 100% rename from aster/surface.h rename to aster/include/aster/core/surface.h diff --git a/aster/swapchain.h b/aster/include/aster/core/swapchain.h similarity index 100% rename from aster/swapchain.h rename to aster/include/aster/core/swapchain.h diff --git a/aster/window.h b/aster/include/aster/core/window.h similarity index 100% rename from aster/window.h rename to aster/include/aster/core/window.h diff --git a/aster/logger.h b/aster/include/aster/util/logger.h similarity index 99% rename from aster/logger.h rename to aster/include/aster/util/logger.h index 3241613..ed025d9 100644 --- a/aster/logger.h +++ b/aster/include/aster/util/logger.h @@ -5,7 +5,7 @@ #pragma once -#include "constants.h" +#include "core/constants.h" #include #include diff --git a/aster/buffer.cpp b/aster/src/aster/core/buffer.cpp similarity index 99% rename from aster/buffer.cpp rename to aster/src/aster/core/buffer.cpp index d24b918..6a01f5e 100644 --- a/aster/buffer.cpp +++ b/aster/src/aster/core/buffer.cpp @@ -3,9 +3,9 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "buffer.h" +#include "core/buffer.h" -#include "device.h" +#include "core/device.h" void Buffer::Destroy(const Device *device) diff --git a/aster/context.cpp b/aster/src/aster/core/context.cpp similarity index 99% rename from aster/context.cpp rename to aster/src/aster/core/context.cpp index 7b13b27..b93e106 100644 --- a/aster/context.cpp +++ b/aster/src/aster/core/context.cpp @@ -3,7 +3,8 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "context.h" +#include "core/context.h" + #include #include diff --git a/aster/device.cpp b/aster/src/aster/core/device.cpp similarity index 98% rename from aster/device.cpp rename to aster/src/aster/core/device.cpp index e6157f0..132243a 100644 --- a/aster/device.cpp +++ b/aster/src/aster/core/device.cpp @@ -3,11 +3,11 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "device.h" +#include "core/device.h" -#include "context.h" -#include "physical_device.h" -#include "queue_allocation.h" +#include "core/context.h" +#include "core/physical_device.h" +#include "core/queue_allocation.h" #include #include diff --git a/aster/global.cpp b/aster/src/aster/core/global.cpp similarity index 99% rename from aster/global.cpp rename to aster/src/aster/core/global.cpp index 5176b46..da429e2 100644 --- a/aster/global.cpp +++ b/aster/src/aster/core/global.cpp @@ -3,7 +3,7 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "global.h" +#include "core/global.h" #include #include diff --git a/aster/image.cpp b/aster/src/aster/core/image.cpp similarity index 99% rename from aster/image.cpp rename to aster/src/aster/core/image.cpp index e890a8c..88fd737 100644 --- a/aster/image.cpp +++ b/aster/src/aster/core/image.cpp @@ -3,9 +3,9 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "image.h" +#include "core/image.h" -#include "device.h" +#include "core/device.h" void Image::Destroy(const Device *device) diff --git a/aster/physical_device.cpp b/aster/src/aster/core/physical_device.cpp similarity index 98% rename from aster/physical_device.cpp rename to aster/src/aster/core/physical_device.cpp index 8b4606b..18fd006 100644 --- a/aster/physical_device.cpp +++ b/aster/src/aster/core/physical_device.cpp @@ -3,11 +3,10 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "physical_device.h" +#include "core/physical_device.h" -#include "context.h" -#include "surface.h" -#include "window.h" +#include "core/context.h" +#include "core/surface.h" [[nodiscard]] vk::SurfaceCapabilitiesKHR GetSurfaceCapabilities(const vk::PhysicalDevice physicalDevice, const vk::SurfaceKHR surface) diff --git a/aster/pipeline.cpp b/aster/src/aster/core/pipeline.cpp similarity index 93% rename from aster/pipeline.cpp rename to aster/src/aster/core/pipeline.cpp index c9c9a89..d377997 100644 --- a/aster/pipeline.cpp +++ b/aster/src/aster/core/pipeline.cpp @@ -3,9 +3,9 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "pipeline.h" +#include "core/pipeline.h" -#include "device.h" +#include "core/device.h" Pipeline::Pipeline(const Device *device, vk::PipelineLayout layout, vk::Pipeline pipeline, eastl::vector &&setLayouts) diff --git a/aster/surface.cpp b/aster/src/aster/core/surface.cpp similarity index 94% rename from aster/surface.cpp rename to aster/src/aster/core/surface.cpp index 55e8a83..f615f71 100644 --- a/aster/surface.cpp +++ b/aster/src/aster/core/surface.cpp @@ -3,10 +3,10 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "surface.h" +#include "core/surface.h" -#include "context.h" -#include "window.h" +#include "core/context.h" +#include "core/window.h" Surface::Surface(Context *context, const Window *window, cstr name) : m_Context(context) diff --git a/aster/swapchain.cpp b/aster/src/aster/core/swapchain.cpp similarity index 98% rename from aster/swapchain.cpp rename to aster/src/aster/core/swapchain.cpp index a03ba9e..6c38ff3 100644 --- a/aster/swapchain.cpp +++ b/aster/src/aster/core/swapchain.cpp @@ -3,12 +3,11 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================== -#include "swapchain.h" +#include "core/swapchain.h" -#include "device.h" -#include "physical_device.h" -#include "surface.h" -#include "window.h" +#include "core/device.h" +#include "core/physical_device.h" +#include "core/surface.h" [[nodiscard]] vk::Extent2D GetExtent(Size2D size, vk::SurfaceCapabilitiesKHR *surfaceCapabilities); diff --git a/aster/window.cpp b/aster/src/aster/core/window.cpp similarity index 97% rename from aster/window.cpp rename to aster/src/aster/core/window.cpp index 11ae077..34d0907 100644 --- a/aster/window.cpp +++ b/aster/src/aster/core/window.cpp @@ -3,10 +3,10 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "window.h" +#include "core/window.h" -#include "context.h" -#include "logger.h" +#include "core/context.h" +#include "util/logger.h" std::atomic_uint64_t Window::m_WindowCount = 0; std::atomic_bool Window::m_IsGlfwInit = false; diff --git a/aster/logger.cpp b/aster/src/aster/util/logger.cpp similarity index 93% rename from aster/logger.cpp rename to aster/src/aster/util/logger.cpp index d6974ce..bc13fce 100644 --- a/aster/logger.cpp +++ b/aster/src/aster/util/logger.cpp @@ -3,7 +3,7 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "logger.h" +#include "util/logger.h" Logger g_Logger = Logger(); // ReSharper disable once CppInconsistentNaming diff --git a/samples/00_util/CMakeLists.txt b/samples/00_util/CMakeLists.txt index c122983..ba3fbed 100644 --- a/samples/00_util/CMakeLists.txt +++ b/samples/00_util/CMakeLists.txt @@ -5,12 +5,12 @@ cmake_minimum_required(VERSION 3.13) find_package(imgui CONFIG REQUIRED) add_library(util_helper STATIC - helpers.h - helpers.cpp - frame.cpp - frame.h - gui.cpp - gui.h) + "helpers.h" + "helpers.cpp" + "frame.cpp" + "frame.h" + "gui.cpp" + "gui.h") target_link_libraries(util_helper PRIVATE aster_core) target_link_libraries(util_helper PRIVATE imgui::imgui) diff --git a/samples/00_util/frame.cpp b/samples/00_util/frame.cpp index 8fb12e3..1b23936 100644 --- a/samples/00_util/frame.cpp +++ b/samples/00_util/frame.cpp @@ -5,9 +5,10 @@ #include "frame.h" -#include "device.h" +#include "aster/core/device.h" +#include "aster/core/swapchain.h" + #include "helpers.h" -#include "swapchain.h" Frame::Frame(const Device *device, const u32 queueFamilyIndex, const u32 frameCount) : m_FrameIdx(frameCount) diff --git a/samples/00_util/frame.h b/samples/00_util/frame.h index 38e47c4..2c69d49 100644 --- a/samples/00_util/frame.h +++ b/samples/00_util/frame.h @@ -5,10 +5,10 @@ #pragma once -#include "global.h" +#include "aster/aster.h" #include "helpers.h" -#include "size.h" +#include "aster/core/size.h" #include diff --git a/samples/00_util/gui.cpp b/samples/00_util/gui.cpp index cbfedb4..53cdba0 100644 --- a/samples/00_util/gui.cpp +++ b/samples/00_util/gui.cpp @@ -5,10 +5,10 @@ #include "gui.h" -#include "context.h" -#include "device.h" +#include "aster/core/context.h" +#include "aster/core/device.h" +#include "aster/core/window.h" #include "helpers.h" -#include "window.h" #include #include @@ -108,11 +108,11 @@ StartBuild() ImGui_ImplGlfw_NewFrame(); NewFrame(); - // static ImGuiDockNodeFlags dockspaceFlags = ImGuiDockNodeFlags_None | ImGuiDockNodeFlags_PassthruCentralNode; + static ImGuiDockNodeFlags dockspaceFlags = ImGuiDockNodeFlags_None | ImGuiDockNodeFlags_PassthruCentralNode; // We are using the ImGuiWindowFlags_NoDocking flag to make the parent window not dockable into, // because it would be confusing to have two docking targets within each others. - ImGuiWindowFlags windowFlags = ImGuiWindowFlags_None; // ImGuiWindowFlags_NoDocking; + ImGuiWindowFlags windowFlags = ImGuiWindowFlags_None | ImGuiWindowFlags_NoDocking; const ImGuiViewport *viewport = GetMainViewport(); SetNextWindowPos(viewport->WorkPos); @@ -130,18 +130,18 @@ StartBuild() // all active windows docked into it will lose their parent and become undocked. // We cannot preserve the docking relationship between an active window and an inactive docking, otherwise // any change of dockspace/settings would lead to windows being stuck in limbo and never being visible. - // PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); - // Begin("DockSpace Demo", nullptr, windowFlags); - // PopStyleVar(); + PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + Begin("DockSpace Demo", nullptr, windowFlags); + PopStyleVar(); - // PopStyleVar(2); + PopStyleVar(2); - // DockSpace - // if (GetIO().ConfigFlags & ImGuiConfigFlags_DockingEnable) - // { - // const ImGuiID dockspaceId = GetID("MyDockSpace"); - // DockSpace(dockspaceId, ImVec2(0.0f, 0.0f), dockspaceFlags); - // } + // DockSpace + if (GetIO().ConfigFlags & ImGuiConfigFlags_DockingEnable) + { + const ImGuiID dockspaceId = GetID("MyDockSpace"); + DockSpace(dockspaceId, ImVec2(0.0f, 0.0f), dockspaceFlags); + } } void diff --git a/samples/00_util/gui.h b/samples/00_util/gui.h index 24a4c97..d27a98e 100644 --- a/samples/00_util/gui.h +++ b/samples/00_util/gui.h @@ -5,7 +5,7 @@ #pragma once -#include "global.h" +#include "aster/aster.h" #include diff --git a/samples/00_util/helpers.cpp b/samples/00_util/helpers.cpp index 3e9d2a3..0ddd0d6 100644 --- a/samples/00_util/helpers.cpp +++ b/samples/00_util/helpers.cpp @@ -5,8 +5,8 @@ #include "helpers.h" -#include "device.h" -#include "physical_device.h" +#include "aster/core/device.h" +#include "aster/core/physical_device.h" #include diff --git a/samples/00_util/helpers.h b/samples/00_util/helpers.h index f135cb8..6b7aab0 100644 --- a/samples/00_util/helpers.h +++ b/samples/00_util/helpers.h @@ -5,9 +5,9 @@ #pragma once -#include "global.h" +#include "aster/aster.h" -#include "queue_allocation.h" +#include "aster/core/queue_allocation.h" #include "EASTL/span.h" #include diff --git a/samples/01_triangle/triangle.cpp b/samples/01_triangle/triangle.cpp index e921e65..0f8af1b 100644 --- a/samples/01_triangle/triangle.cpp +++ b/samples/01_triangle/triangle.cpp @@ -3,16 +3,16 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "buffer.h" -#include "constants.h" -#include "context.h" -#include "device.h" -#include "physical_device.h" -#include "window.h" +#include "aster/aster.h" -#include "global.h" -#include "pipeline.h" -#include "swapchain.h" +#include "aster/core/buffer.h" +#include "aster/core/constants.h" +#include "aster/core/context.h" +#include "aster/core/device.h" +#include "aster/core/physical_device.h" +#include "aster/core/window.h" +#include "aster/core/pipeline.h" +#include "aster/core/swapchain.h" #include "helpers.h" @@ -74,8 +74,8 @@ main(int, char **) { MIN_LOG_LEVEL(Logger::LogType::eInfo); - Context context = {"Triangle", VERSION}; Window window = {"Triangle (Aster)", {640, 480}}; + Context context = {"Triangle", VERSION}; Surface surface = {&context, &window, "Primary"}; PhysicalDevices physicalDevices = {&surface, &context}; diff --git a/samples/02_box/box.cpp b/samples/02_box/box.cpp index 6442ff6..6e2c145 100644 --- a/samples/02_box/box.cpp +++ b/samples/02_box/box.cpp @@ -3,21 +3,22 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "buffer.h" -#include "constants.h" -#include "context.h" -#include "device.h" -#include "global.h" -#include "physical_device.h" -#include "pipeline.h" -#include "swapchain.h" -#include "window.h" +#include "aster/aster.h" + +#include "aster/core/buffer.h" +#include "aster/core/constants.h" +#include "aster/core/context.h" +#include "aster/core/device.h" +#include "aster/core/physical_device.h" +#include "aster/core/pipeline.h" +#include "aster/core/swapchain.h" +#include "aster/core/window.h" +#include "aster/core/image.h" #include "helpers.h" #define STB_IMAGE_IMPLEMENTATION #include "frame.h" -#include "image.h" #include "stb_image.h" #include @@ -115,8 +116,8 @@ main(int, char **) { MIN_LOG_LEVEL(Logger::LogType::eInfo); - Context context = {"Box", VERSION}; Window window = {"Box (Aster)", {640, 480}}; + Context context = {"Box", VERSION}; Surface surface = {&context, &window, "Primary"}; PhysicalDevices physicalDevices = {&surface, &context}; diff --git a/samples/03_model_render/asset_loader.cpp b/samples/03_model_render/asset_loader.cpp index 078e168..bf0133c 100644 --- a/samples/03_model_render/asset_loader.cpp +++ b/samples/03_model_render/asset_loader.cpp @@ -10,15 +10,15 @@ #define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_WRITE_IMPLEMENTATION -#include "asset_loader.h" +#include "aster/core/buffer.h" +#include "aster/core/device.h" +#include "aster/core/image.h" -#include "EASTL/fixed_vector.h" -#include "buffer.h" -#include "device.h" #include "gpu_resource_manager.h" #include "helpers.h" -#include "image.h" +#include "asset_loader.h" +#include #include #include diff --git a/samples/03_model_render/asset_loader.h b/samples/03_model_render/asset_loader.h index 6c7c936..c0d70f5 100644 --- a/samples/03_model_render/asset_loader.h +++ b/samples/03_model_render/asset_loader.h @@ -5,8 +5,9 @@ #pragma once -#include "buffer.h" -#include "global.h" +#include "aster/aster.h" + +#include "aster/core/buffer.h" #include "gpu_resource_manager.h" #include "nodes.h" diff --git a/samples/03_model_render/gpu_resource_manager.cpp b/samples/03_model_render/gpu_resource_manager.cpp index 525fc0c..ffc050d 100644 --- a/samples/03_model_render/gpu_resource_manager.cpp +++ b/samples/03_model_render/gpu_resource_manager.cpp @@ -5,10 +5,11 @@ #include "gpu_resource_manager.h" -#include "buffer.h" -#include "device.h" #include "helpers.h" -#include "image.h" + +#include "aster/core/buffer.h" +#include "aster/core/device.h" +#include "aster/core/image.h" #include diff --git a/samples/03_model_render/gpu_resource_manager.h b/samples/03_model_render/gpu_resource_manager.h index 7dcc11a..6e2e3cf 100644 --- a/samples/03_model_render/gpu_resource_manager.h +++ b/samples/03_model_render/gpu_resource_manager.h @@ -5,7 +5,7 @@ #pragma once -#include "global.h" +#include "aster/aster.h" #include #include diff --git a/samples/03_model_render/ibl_helpers.cpp b/samples/03_model_render/ibl_helpers.cpp index 3e11e01..164b6ed 100644 --- a/samples/03_model_render/ibl_helpers.cpp +++ b/samples/03_model_render/ibl_helpers.cpp @@ -5,15 +5,17 @@ #include "ibl_helpers.h" -#include "EASTL/fixed_vector.h" -#include "EASTL/tuple.h" +#include "aster/core/device.h" +#include "aster/core/image.h" + #include "asset_loader.h" -#include "device.h" #include "gpu_resource_manager.h" #include "helpers.h" -#include "image.h" #include "pipeline_utils.h" +#include +#include + constexpr cstr EQUIRECT_TO_CUBE_SHADER_FILE = "shader/eqrect_to_cube.cs.hlsl.spv"; constexpr cstr DIFFUSE_IRRADIANCE_SHADER_FILE = "shader/diffuse_irradiance.cs.hlsl.spv"; constexpr cstr PREFILTER_SHADER_FILE = "shader/prefilter.cs.hlsl.spv"; diff --git a/samples/03_model_render/ibl_helpers.h b/samples/03_model_render/ibl_helpers.h index f9b0f5e..85d5eca 100644 --- a/samples/03_model_render/ibl_helpers.h +++ b/samples/03_model_render/ibl_helpers.h @@ -5,11 +5,9 @@ #pragma once -#include "global.h" +#include "aster/aster.h" #include "gpu_resource_manager.h" -#include - struct Pipeline; struct Texture; struct TextureCube; diff --git a/samples/03_model_render/light_manager.cpp b/samples/03_model_render/light_manager.cpp index 195d57b..1c375ff 100644 --- a/samples/03_model_render/light_manager.cpp +++ b/samples/03_model_render/light_manager.cpp @@ -5,7 +5,7 @@ #include "light_manager.h" -#include "buffer.h" +#include "aster/core/buffer.h" #include "glm/ext/matrix_transform.hpp" struct Light diff --git a/samples/03_model_render/light_manager.h b/samples/03_model_render/light_manager.h index e2f0298..5e2bb28 100644 --- a/samples/03_model_render/light_manager.h +++ b/samples/03_model_render/light_manager.h @@ -5,7 +5,7 @@ #pragma once -#include "global.h" +#include "aster/aster.h" // TODO: Separate files so you only import handles. #include "gpu_resource_manager.h" diff --git a/samples/03_model_render/model_render.cpp b/samples/03_model_render/model_render.cpp index 206f6ea..038a99b 100644 --- a/samples/03_model_render/model_render.cpp +++ b/samples/03_model_render/model_render.cpp @@ -3,16 +3,17 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "buffer.h" -#include "constants.h" -#include "context.h" -#include "device.h" -#include "global.h" -#include "image.h" -#include "physical_device.h" -#include "pipeline.h" -#include "swapchain.h" -#include "window.h" +#include "aster/aster.h" + +#include "aster/core/buffer.h" +#include "aster/core/constants.h" +#include "aster/core/context.h" +#include "aster/core/device.h" +#include "aster/core/image.h" +#include "aster/core/physical_device.h" +#include "aster/core/pipeline.h" +#include "aster/core/swapchain.h" +#include "aster/core/window.h" #include "frame.h" #include "helpers.h" @@ -133,8 +134,8 @@ main(int, char **) { MIN_LOG_LEVEL(Logger::LogType::eInfo); - Context context = {"ModelRender", VERSION}; Window window = {"ModelRender (Aster)", {INIT_WIDTH, INIT_HEIGHT}}; + Context context = {"ModelRender", VERSION}; Surface surface = {&context, &window, "Primary Surface"}; PhysicalDevices physicalDevices = {&surface, &context}; diff --git a/samples/03_model_render/nodes.h b/samples/03_model_render/nodes.h index 545f15c..c637c9f 100644 --- a/samples/03_model_render/nodes.h +++ b/samples/03_model_render/nodes.h @@ -5,9 +5,9 @@ #pragma once -#include "global.h" +#include "aster/aster.h" -#include "EASTL/vector.h" +#include struct Nodes { diff --git a/samples/03_model_render/pipeline_utils.cpp b/samples/03_model_render/pipeline_utils.cpp index 10918e1..39af77e 100644 --- a/samples/03_model_render/pipeline_utils.cpp +++ b/samples/03_model_render/pipeline_utils.cpp @@ -5,7 +5,9 @@ #include "pipeline_utils.h" -#include "device.h" +#include "aster/core/device.h" +#include "aster/core/pipeline.h" + #include "gpu_resource_manager.h" #include "helpers.h" diff --git a/samples/03_model_render/pipeline_utils.h b/samples/03_model_render/pipeline_utils.h index bf9b495..fd2695d 100644 --- a/samples/03_model_render/pipeline_utils.h +++ b/samples/03_model_render/pipeline_utils.h @@ -5,12 +5,12 @@ #pragma once -#include "global.h" -#include "pipeline.h" +#include "aster/aster.h" struct GpuResourceManager; struct Swapchain; struct Device; +struct Pipeline; constexpr auto VERTEX_SHADER_FILE = "shader/model.vs.hlsl.spv"; constexpr auto FRAGMENT_SHADER_FILE = "shader/model.ps.hlsl.spv"; diff --git a/samples/04_scenes/asset_loader.cpp b/samples/04_scenes/asset_loader.cpp index 22b177f..88280e3 100644 --- a/samples/04_scenes/asset_loader.cpp +++ b/samples/04_scenes/asset_loader.cpp @@ -12,9 +12,9 @@ #include "asset_loader.h" -#include "buffer.h" -#include "device.h" -#include "image.h" +#include "aster/core/buffer.h" +#include "aster/core/device.h" +#include "aster/core/image.h" #include "core_components.h" #include "helpers.h" @@ -870,7 +870,7 @@ AssetLoader::LoadModelToGpu(cstr path, cstr name) } else if (material->alphaMode == "MASK") { - alphaBlendValue = material->alphaCutoff; + alphaBlendValue = Cast(material->alphaCutoff); } materials.push_back({ diff --git a/samples/04_scenes/asset_loader.h b/samples/04_scenes/asset_loader.h index f842d48..6ef5445 100644 --- a/samples/04_scenes/asset_loader.h +++ b/samples/04_scenes/asset_loader.h @@ -5,9 +5,9 @@ #pragma once -#include "global.h" +#include "aster/aster.h" -#include "buffer.h" +#include "aster/core/buffer.h" #include "render_resource_manager.h" #include "ecs_adapter.h" diff --git a/samples/04_scenes/camera.h b/samples/04_scenes/camera.h index 72ab822..9c7e6cf 100644 --- a/samples/04_scenes/camera.h +++ b/samples/04_scenes/camera.h @@ -3,7 +3,7 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "global.h" +#include "aster/aster.h" struct Camera { diff --git a/samples/04_scenes/core_components.h b/samples/04_scenes/core_components.h index 7bdc91e..3a2864e 100644 --- a/samples/04_scenes/core_components.h +++ b/samples/04_scenes/core_components.h @@ -5,7 +5,7 @@ #pragma once -#include "global.h" +#include "aster/aster.h" template struct CDirty diff --git a/samples/04_scenes/ibl_helpers.cpp b/samples/04_scenes/ibl_helpers.cpp index b52e48e..ed534fe 100644 --- a/samples/04_scenes/ibl_helpers.cpp +++ b/samples/04_scenes/ibl_helpers.cpp @@ -5,15 +5,17 @@ #include "ibl_helpers.h" -#include "EASTL/fixed_vector.h" -#include "EASTL/tuple.h" +#include "aster/core/device.h" +#include "aster/core/image.h" + #include "asset_loader.h" -#include "device.h" #include "render_resource_manager.h" #include "helpers.h" -#include "image.h" #include "pipeline_utils.h" +#include +#include + constexpr cstr EQUIRECT_TO_CUBE_SHADER_FILE = "shader/eqrect_to_cube.cs.hlsl.spv"; constexpr cstr DIFFUSE_IRRADIANCE_SHADER_FILE = "shader/diffuse_irradiance.cs.hlsl.spv"; constexpr cstr PREFILTER_SHADER_FILE = "shader/prefilter.cs.hlsl.spv"; diff --git a/samples/04_scenes/ibl_helpers.h b/samples/04_scenes/ibl_helpers.h index 624b5df..cdf245b 100644 --- a/samples/04_scenes/ibl_helpers.h +++ b/samples/04_scenes/ibl_helpers.h @@ -5,7 +5,7 @@ #pragma once -#include "global.h" +#include "aster/aster.h" #include "render_resource_manager.h" struct Pipeline; diff --git a/samples/04_scenes/light_manager.cpp b/samples/04_scenes/light_manager.cpp index fe10f27..4b0c838 100644 --- a/samples/04_scenes/light_manager.cpp +++ b/samples/04_scenes/light_manager.cpp @@ -5,7 +5,7 @@ #include "light_manager.h" -#include "buffer.h" +#include "aster/core/buffer.h" #include "ibl_helpers.h" #include "glm/ext/matrix_transform.hpp" diff --git a/samples/04_scenes/light_manager.h b/samples/04_scenes/light_manager.h index 5a52e86..802b869 100644 --- a/samples/04_scenes/light_manager.h +++ b/samples/04_scenes/light_manager.h @@ -5,7 +5,7 @@ #pragma once -#include "global.h" +#include "aster/aster.h" // TODO: Separate files so you only import handles. #include "render_resource_manager.h" diff --git a/samples/04_scenes/main.cpp b/samples/04_scenes/main.cpp index 7be38a9..b673304 100644 --- a/samples/04_scenes/main.cpp +++ b/samples/04_scenes/main.cpp @@ -3,13 +3,16 @@ // Copyright (c) 2020-2024 Anish Bhobe // ============================================= -#include "context.h" -#include "device.h" +#include "aster/core/context.h" +#include "aster/core/device.h" +#include "aster/core/physical_device.h" +#include "aster/core/swapchain.h" +#include "aster/core/window.h" +#include "aster/core/image.h" +#include "aster/core/pipeline.h" + #include "helpers.h" -#include "physical_device.h" #include "render_resource_manager.h" -#include "swapchain.h" -#include "window.h" #include "asset_loader.h" #include "camera.h" @@ -19,8 +22,6 @@ #include "ecs_adapter.h" #include "frame.h" #include "ibl_helpers.h" -#include "image.h" -#include "pipeline.h" #include "pipeline_utils.h" diff --git a/samples/04_scenes/pipeline_utils.cpp b/samples/04_scenes/pipeline_utils.cpp index 4ecd5aa..528cf80 100644 --- a/samples/04_scenes/pipeline_utils.cpp +++ b/samples/04_scenes/pipeline_utils.cpp @@ -5,7 +5,8 @@ #include "pipeline_utils.h" -#include "device.h" +#include "aster/core/device.h" + #include "render_resource_manager.h" #include "helpers.h" diff --git a/samples/04_scenes/pipeline_utils.h b/samples/04_scenes/pipeline_utils.h index 9459aaa..21a8107 100644 --- a/samples/04_scenes/pipeline_utils.h +++ b/samples/04_scenes/pipeline_utils.h @@ -5,8 +5,8 @@ #pragma once -#include "global.h" -#include "pipeline.h" +#include "aster/aster.h" +#include "aster/core/pipeline.h" struct RenderResourceManager; struct Swapchain; diff --git a/samples/04_scenes/render_resource_manager.cpp b/samples/04_scenes/render_resource_manager.cpp index 6dc6d0a..32bf78a 100644 --- a/samples/04_scenes/render_resource_manager.cpp +++ b/samples/04_scenes/render_resource_manager.cpp @@ -5,10 +5,11 @@ #include "render_resource_manager.h" -#include "buffer.h" -#include "device.h" +#include "aster/core/buffer.h" +#include "aster/core/device.h" +#include "aster/core/image.h" + #include "helpers.h" -#include "image.h" #include diff --git a/samples/04_scenes/render_resource_manager.h b/samples/04_scenes/render_resource_manager.h index 19d0fc0..36f2146 100644 --- a/samples/04_scenes/render_resource_manager.h +++ b/samples/04_scenes/render_resource_manager.h @@ -5,7 +5,7 @@ #pragma once -#include "global.h" +#include "aster/aster.h" #include #include