diff --git a/dependencies/glslang b/dependencies/glslang index dffbc79..9a8c5fd 160000 --- a/dependencies/glslang +++ b/dependencies/glslang @@ -1 +1 @@ -Subproject commit dffbc79733f63435ae24e73f64384f1374e0dda2 +Subproject commit 9a8c5fd1f485736d29ef470d1b6981c5de73a365 diff --git a/dependencies/imgui b/dependencies/imgui index dc48a7c..9ca7ea0 160000 --- a/dependencies/imgui +++ b/dependencies/imgui @@ -1 +1 @@ -Subproject commit dc48a7c88eef4a347000d55062d35cc94e00ef70 +Subproject commit 9ca7ea00c80c1cb95b31cb3efa6f88cea33edf2a diff --git a/dependencies/slang b/dependencies/slang index 12b9782..6955616 160000 --- a/dependencies/slang +++ b/dependencies/slang @@ -1 +1 @@ -Subproject commit 12b9782aee6d05d6e8c604b389aff1c670f2db80 +Subproject commit 69556160060c9541f05db56f414f0d3c4c817617 diff --git a/dependencies/tracy b/dependencies/tracy index 0e3b3c5..3258599 160000 --- a/dependencies/tracy +++ b/dependencies/tracy @@ -1 +1 @@ -Subproject commit 0e3b3c57fc696b69c61014a2699e56a063c8978a +Subproject commit 3258599899ecfd0d5d901b577cbc555fa645d6e4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f0ac4f..197e41d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,8 @@ -add_subdirectory(renderer) +#add_subdirectory(renderer) +add_subdirectory(engine) add_subdirectory(objectloaders) -#add_subdirectory(editor) -#add_subdirectory(engine) +add_subdirectory(editor) message("-- Creating SYMLINK ${CMAKE_BINARY_DIR}/shaders -> ${CMAKE_CURRENT_SOURCE_DIR}/shaders") file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/shaders ${CMAKE_BINARY_DIR}/bin/shaders SYMBOLIC) diff --git a/src/editor/src/gui/drawGameObject.cpp b/src/editor/src/gui/drawGameObject.cpp index 0898a3b..18c7235 100644 --- a/src/editor/src/gui/drawGameObject.cpp +++ b/src/editor/src/gui/drawGameObject.cpp @@ -38,10 +38,7 @@ namespace fgl::engine::gui void drawComponentsList( GameObject& game_object ) { ImGui::PushStyleVar( ImGuiStyleVar_ChildRounding, 5.0f ); - ImGui::BeginChild( - "ComponentsList", - ImVec2( 0, 0 ), - ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_Border | ImGuiChildFlags_ResizeY ); + ImGui::BeginChild( "ComponentsList", ImVec2( 0, 0 ), ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_ResizeY ); ImGui::SeparatorText( "Components" ); @@ -55,7 +52,7 @@ namespace fgl::engine::gui ImGui::EndChild(); ImGui::PopStyleVar(); - ImGui::BeginChild( "Selected", ImVec2( 0, 0 ), ImGuiChildFlags_Border ); + ImGui::BeginChild( "Selected", ImVec2( 0, 0 ) ); if ( SELECTED_COMPONENT != nullptr && std::ranges::find( components, SELECTED_COMPONENT ) != components.end() ) { diff --git a/src/editor/src/gui/safe_include.hpp b/src/editor/src/gui/safe_include.hpp index 74abbee..767ffe4 100644 --- a/src/editor/src/gui/safe_include.hpp +++ b/src/editor/src/gui/safe_include.hpp @@ -2,7 +2,6 @@ // Created by kj16609 on 6/5/24. // - // ReSharper disable CppDFAInfiniteRecursion // ReSharper disable CppInconsistentNaming // ReSharper disable CppZeroConstantCanBeReplacedWithNullptr @@ -18,7 +17,8 @@ #include -#include "engine/FGL_DEFINES.hpp" +#include "imgui.h" +#include "libFGL/include/fgl/defines.hpp" namespace ImGui { diff --git a/src/engine/assets/image/Image.hpp b/src/engine/assets/image/Image.hpp index 5bb9393..9798f2a 100644 --- a/src/engine/assets/image/Image.hpp +++ b/src/engine/assets/image/Image.hpp @@ -8,9 +8,9 @@ #include -#include "FGL_DEFINES.hpp" #include "Sampler.hpp" #include "debug/Track.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/assets/image/Sampler.hpp b/src/engine/assets/image/Sampler.hpp index 69df2e2..45ec4fc 100644 --- a/src/engine/assets/image/Sampler.hpp +++ b/src/engine/assets/image/Sampler.hpp @@ -7,7 +7,7 @@ #include #include -#include "engine/FGL_DEFINES.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/assets/texture/Texture.hpp b/src/engine/assets/texture/Texture.hpp index a761b60..67a61c7 100644 --- a/src/engine/assets/texture/Texture.hpp +++ b/src/engine/assets/texture/Texture.hpp @@ -7,6 +7,7 @@ #include #include +#include #include "debug/Track.hpp" #include "engine/assets/AssetManager.hpp" diff --git a/src/engine/assets/transfer/TransferManager.hpp b/src/engine/assets/transfer/TransferManager.hpp index a6b38e3..184fec7 100644 --- a/src/engine/assets/transfer/TransferManager.hpp +++ b/src/engine/assets/transfer/TransferManager.hpp @@ -9,8 +9,8 @@ #include #include "TransferData.hpp" -#include "engine/FGL_DEFINES.hpp" #include "engine/memory/buffers/vector/concepts.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/camera/CompositeSwapchain.hpp b/src/engine/camera/CompositeSwapchain.hpp index c01c6ad..3d9e605 100644 --- a/src/engine/camera/CompositeSwapchain.hpp +++ b/src/engine/camera/CompositeSwapchain.hpp @@ -4,7 +4,6 @@ #pragma once #include -#include "FGL_DEFINES.hpp" #include "engine/rendering/RenderingFormats.hpp" #include "engine/rendering/pipelines/Attachment.hpp" #include "rendering/CommandBufferPool.hpp" diff --git a/src/engine/camera/Swapchain.hpp b/src/engine/camera/Swapchain.hpp index 7dbfe0a..c9372e2 100644 --- a/src/engine/camera/Swapchain.hpp +++ b/src/engine/camera/Swapchain.hpp @@ -8,8 +8,8 @@ #include #include -#include "FGL_DEFINES.hpp" #include "assets/texture/Texture.hpp" +#include "libFGL/include/fgl/defines.hpp" #include "rendering/types.hpp" namespace fgl::engine diff --git a/src/engine/debug/timing/FlameGraph.cpp b/src/engine/debug/timing/FlameGraph.cpp index b109a40..26cd161 100644 --- a/src/engine/debug/timing/FlameGraph.cpp +++ b/src/engine/debug/timing/FlameGraph.cpp @@ -6,9 +6,10 @@ #include -#include "engine/FGL_DEFINES.hpp" #include "engine/clock.hpp" #include "engine/debug/logging/logging.hpp" +#include "imgui.h" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine::debug { diff --git a/src/engine/filesystem/scanner/FileScanner.cpp b/src/engine/filesystem/scanner/FileScanner.cpp index fa4a66c..82c479d 100644 --- a/src/engine/filesystem/scanner/FileScanner.cpp +++ b/src/engine/filesystem/scanner/FileScanner.cpp @@ -10,8 +10,8 @@ #include -#include "engine/FGL_DEFINES.hpp" #include "engine/debug/logging/logging.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine::filesystem { diff --git a/src/engine/math/intersections/helpers.hpp b/src/engine/math/intersections/helpers.hpp index 3c35391..3850a05 100644 --- a/src/engine/math/intersections/helpers.hpp +++ b/src/engine/math/intersections/helpers.hpp @@ -3,7 +3,6 @@ // #pragma once -#include "engine/FGL_DEFINES.hpp" #include "engine/primitives/Frustum.hpp" #include "engine/primitives/vectors/NormalVector.hpp" diff --git a/src/engine/math/raycast/raycast.cpp b/src/engine/math/raycast/raycast.cpp index f770038..4959c2a 100644 --- a/src/engine/math/raycast/raycast.cpp +++ b/src/engine/math/raycast/raycast.cpp @@ -17,13 +17,13 @@ namespace fgl::engine bool rayHit( [[maybe_unused]] const Ray& ray, [[maybe_unused]] const OrientedBoundingBox< CS::World >& obb ) { //TODO: Implement raycasts - FGL_TODO(); + // FGL_TODO(); return false; } bool rayHit( [[maybe_unused]] const Ray& ray, [[maybe_unused]] const AxisAlignedBoundingBox< CS::World >& aabb ) { - FGL_TODO(); + // FGL_TODO(); } } // namespace fgl::engine \ No newline at end of file diff --git a/src/engine/memory/buffers/BufferSuballocationHandle.hpp b/src/engine/memory/buffers/BufferSuballocationHandle.hpp index 30b1290..0b83090 100644 --- a/src/engine/memory/buffers/BufferSuballocationHandle.hpp +++ b/src/engine/memory/buffers/BufferSuballocationHandle.hpp @@ -8,9 +8,9 @@ #include -#include "FGL_DEFINES.hpp" #include "VulkanBuffer.hpp" #include "engine/debug/Track.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace vk::raii { diff --git a/src/engine/memory/buffers/align.hpp b/src/engine/memory/buffers/align.hpp index e60eff9..dc9f664 100644 --- a/src/engine/memory/buffers/align.hpp +++ b/src/engine/memory/buffers/align.hpp @@ -7,8 +7,6 @@ #include #include -#include "FGL_DEFINES.hpp" - namespace fgl::engine::memory { diff --git a/src/engine/primitives/Transform.hpp b/src/engine/primitives/Transform.hpp index 5a5ccdf..522c48d 100644 --- a/src/engine/primitives/Transform.hpp +++ b/src/engine/primitives/Transform.hpp @@ -7,9 +7,9 @@ #include #include "Scale.hpp" -#include "engine/FGL_DEFINES.hpp" #include "engine/debug/logging/logging.hpp" #include "engine/primitives/points/Coordinate.hpp" +#include "libFGL/include/fgl/defines.hpp" #include "rotation/QuatRotation.hpp" #include "rotation/UniversalRotation.hpp" diff --git a/src/engine/primitives/boxes/AxisAlignedBoundingBox.cpp b/src/engine/primitives/boxes/AxisAlignedBoundingBox.cpp index 64914b4..a778439 100644 --- a/src/engine/primitives/boxes/AxisAlignedBoundingBox.cpp +++ b/src/engine/primitives/boxes/AxisAlignedBoundingBox.cpp @@ -7,6 +7,8 @@ #include "OrientedBoundingBox.hpp" #include "engine/primitives/lines/LineSegment.hpp" +#define FGL_NOTNANVEC3( ... ) ; + namespace fgl::engine { diff --git a/src/engine/primitives/boxes/AxisAlignedBoundingBox.hpp b/src/engine/primitives/boxes/AxisAlignedBoundingBox.hpp index 972662f..59d2bcf 100644 --- a/src/engine/primitives/boxes/AxisAlignedBoundingBox.hpp +++ b/src/engine/primitives/boxes/AxisAlignedBoundingBox.hpp @@ -5,11 +5,12 @@ #pragma once #include "BoundingBox.hpp" -#include "engine/FGL_DEFINES.hpp" #include "engine/primitives/Scale.hpp" #include "engine/primitives/points/Coordinate.hpp" #include "engine/primitives/vectors/NormalVector.hpp" +#define FGL_NOTNAN(...) + namespace fgl::engine { template < CoordinateSpace CType > diff --git a/src/engine/primitives/lines/InfiniteLine.hpp b/src/engine/primitives/lines/InfiniteLine.hpp index 8b05439..e9a483f 100644 --- a/src/engine/primitives/lines/InfiniteLine.hpp +++ b/src/engine/primitives/lines/InfiniteLine.hpp @@ -5,11 +5,11 @@ #pragma once #include "LineBase.hpp" -#include "engine/FGL_DEFINES.hpp" #include "engine/primitives/CoordinateSpace.hpp" #include "engine/primitives/planes/concepts.hpp" #include "engine/primitives/points/Coordinate.hpp" #include "engine/primitives/vectors/NormalVector.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/primitives/lines/LineSegment.hpp b/src/engine/primitives/lines/LineSegment.hpp index 0387ca3..dd3db72 100644 --- a/src/engine/primitives/lines/LineSegment.hpp +++ b/src/engine/primitives/lines/LineSegment.hpp @@ -5,7 +5,6 @@ #pragma once #include "LineBase.hpp" -#include "engine/FGL_DEFINES.hpp" #include "engine/primitives/planes/concepts.hpp" #include "engine/primitives/points/Coordinate.hpp" #include "engine/primitives/vectors/NormalVector.hpp" diff --git a/src/engine/primitives/planes/OriginDistancePlane.hpp b/src/engine/primitives/planes/OriginDistancePlane.hpp index 2387b76..c05f557 100644 --- a/src/engine/primitives/planes/OriginDistancePlane.hpp +++ b/src/engine/primitives/planes/OriginDistancePlane.hpp @@ -4,10 +4,10 @@ #pragma once -#include "engine/FGL_DEFINES.hpp" #include "engine/primitives/CoordinateSpace.hpp" #include "engine/primitives/points/Coordinate.hpp" #include "engine/primitives/vectors/NormalVector.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/primitives/planes/PointPlane.hpp b/src/engine/primitives/planes/PointPlane.hpp index 45d9f93..a0103c6 100644 --- a/src/engine/primitives/planes/PointPlane.hpp +++ b/src/engine/primitives/planes/PointPlane.hpp @@ -4,10 +4,10 @@ #pragma once -#include "engine/FGL_DEFINES.hpp" #include "engine/primitives/CoordinateSpace.hpp" #include "engine/primitives/points/Coordinate.hpp" #include "engine/primitives/vectors/NormalVector.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/primitives/rotation/UniversalRotation.hpp b/src/engine/primitives/rotation/UniversalRotation.hpp index 2c155df..680c572 100644 --- a/src/engine/primitives/rotation/UniversalRotation.hpp +++ b/src/engine/primitives/rotation/UniversalRotation.hpp @@ -3,8 +3,8 @@ // #pragma once #include "EulerRotation.hpp" -#include "FGL_DEFINES.hpp" #include "QuatRotation.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/primitives/vectors/Vector.hpp b/src/engine/primitives/vectors/Vector.hpp index dabc071..a7f1adc 100644 --- a/src/engine/primitives/vectors/Vector.hpp +++ b/src/engine/primitives/vectors/Vector.hpp @@ -6,9 +6,9 @@ #include -#include "engine/FGL_DEFINES.hpp" #include "engine/constants.hpp" #include "engine/primitives/CoordinateSpace.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/rendering/CommandBuffer.hpp b/src/engine/rendering/CommandBuffer.hpp index b350e3e..45f37c8 100644 --- a/src/engine/rendering/CommandBuffer.hpp +++ b/src/engine/rendering/CommandBuffer.hpp @@ -4,7 +4,7 @@ #pragma once #include -#include "FGL_DEFINES.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/rendering/CommandBufferPool.hpp b/src/engine/rendering/CommandBufferPool.hpp index 6e82c42..f023916 100644 --- a/src/engine/rendering/CommandBufferPool.hpp +++ b/src/engine/rendering/CommandBufferPool.hpp @@ -7,7 +7,6 @@ #include #include "CommandBuffer.hpp" -#include "FGL_DEFINES.hpp" #include "constants.hpp" #include "devices/PhysicalDevice.hpp" #include "types.hpp" diff --git a/src/engine/rendering/Instance.hpp b/src/engine/rendering/Instance.hpp index f60a6b9..0445c7e 100644 --- a/src/engine/rendering/Instance.hpp +++ b/src/engine/rendering/Instance.hpp @@ -6,7 +6,7 @@ #include -#include "engine/FGL_DEFINES.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/rendering/QueuePool.hpp b/src/engine/rendering/QueuePool.hpp index 504b034..b79443e 100644 --- a/src/engine/rendering/QueuePool.hpp +++ b/src/engine/rendering/QueuePool.hpp @@ -6,7 +6,7 @@ #include #include -#include "engine/FGL_DEFINES.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/rendering/Surface.hpp b/src/engine/rendering/Surface.hpp index 5075181..007628e 100644 --- a/src/engine/rendering/Surface.hpp +++ b/src/engine/rendering/Surface.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "engine/FGL_DEFINES.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/rendering/devices/PhysicalDevice.hpp b/src/engine/rendering/devices/PhysicalDevice.hpp index 8a589fd..2fc80b1 100644 --- a/src/engine/rendering/devices/PhysicalDevice.hpp +++ b/src/engine/rendering/devices/PhysicalDevice.hpp @@ -6,8 +6,8 @@ #include -#include "engine/FGL_DEFINES.hpp" #include "engine/rendering/QueuePool.hpp" +#include "libFGL/include/fgl/defines.hpp" namespace fgl::engine { diff --git a/src/engine/rendering/pipelines/shaders/Compiler.cpp b/src/engine/rendering/pipelines/shaders/Compiler.cpp index 7160859..ef135d1 100644 --- a/src/engine/rendering/pipelines/shaders/Compiler.cpp +++ b/src/engine/rendering/pipelines/shaders/Compiler.cpp @@ -19,9 +19,9 @@ #include #pragma GCC diagnostic pop -#include "engine/FGL_DEFINES.hpp" #include "engine/constants.hpp" #include "engine/debug/logging/logging.hpp" +#include "libFGL/include/fgl/defines.hpp" #include "rendering/pipelines/Shader.hpp" namespace fgl::engine diff --git a/src/engine/rendering/pipelines/v2/PipelineBuilder.hpp b/src/engine/rendering/pipelines/v2/PipelineBuilder.hpp index 3e3c26f..bf58e6e 100644 --- a/src/engine/rendering/pipelines/v2/PipelineBuilder.hpp +++ b/src/engine/rendering/pipelines/v2/PipelineBuilder.hpp @@ -10,7 +10,6 @@ #include #include "descriptors/DescriptorSetLayout.hpp" -#include "engine/FGL_DEFINES.hpp" #include "engine/rendering/pipelines/Shader.hpp" namespace fgl::engine diff --git a/src/renderer/src/vulkan/Vulkan.cpp b/src/renderer/src/vulkan/Vulkan.cpp index a757b8f..1fc0f14 100644 --- a/src/renderer/src/vulkan/Vulkan.cpp +++ b/src/renderer/src/vulkan/Vulkan.cpp @@ -72,11 +72,9 @@ namespace fgl::renderer .apiVersion = VK_API_VERSION_1_4, }; - inline static vk::InstanceCreateInfo s_create_info { - .pApplicationInfo = &s_app_info - }; + inline static vk::InstanceCreateInfo s_create_info { .pApplicationInfo = &s_app_info }; - Vulkan::Vulkan( const std::string_view app_name ) : m_ctx(), , m_instance( m_ctx, s_create_info ) + Vulkan::Vulkan( const std::string_view app_name ) : m_ctx(), m_instance( m_ctx, s_create_info ) {} Vulkan::~Vulkan()