From 2d3b1f6c7f8637dd439b26a2598fb1e6ea836e4e Mon Sep 17 00:00:00 2001 From: kj16609 Date: Sat, 27 Sep 2025 14:51:13 -0400 Subject: [PATCH] Cleanup pass 1 --- src/editor/src/components/GameComponent.cpp | 1 - src/engine/assets/image/Image.hpp | 2 +- src/engine/assets/material/Material.hpp | 12 ++++------ src/engine/assets/model/Model.hpp | 4 ---- src/engine/assets/model/ModelVertex.cpp | 4 ---- src/engine/assets/model/ModelVertex.hpp | 4 ---- src/engine/assets/model/Primitive.hpp | 7 +----- src/engine/assets/model/SimpleVertex.hpp | 3 --- src/engine/assets/model/VertexAttribute.hpp | 4 ---- .../assets/model/builders/ModelBuilder.cpp | 5 ++-- .../assets/model/builders/ModelBuilder.hpp | 3 +-- .../assets/model/builders/SceneBuilder.cpp | 10 ++------ .../assets/model/builders/SceneBuilder.hpp | 4 ---- src/engine/assets/model/builders/loadObj.cpp | 4 ---- src/engine/assets/stores.hpp | 2 +- src/engine/assets/texture/Texture.cpp | 6 ----- src/engine/camera/RenderCamera.hpp | 6 ----- src/engine/concepts/is_bindable.hpp | 8 ++----- src/engine/concepts/is_constant_range.hpp | 4 +--- src/engine/concepts/is_image.hpp | 14 ++++------- src/engine/constants.hpp | 3 --- src/engine/debug/logging/formatters/glm.cpp | 4 ---- .../debug/logging/formatters/matrix.cpp | 4 ---- src/engine/debug/logging/logging.hpp | 8 +------ src/engine/debug/timing/FlameGraph.cpp | 9 ++----- src/engine/descriptors/DescriptorPool.hpp | 1 - src/engine/gameobjects/components/drawers.cpp | 4 ---- .../interface/ComponentEditorInterface.cpp | 4 ---- .../interface/GameObjectComponent.cpp | 4 ---- .../lighting/lights/GlobalIlluminator.cpp | 1 - .../math/intersections/aabb/coordinate.cpp | 2 -- src/engine/math/noise/perlin/generator.cpp | 5 ---- src/engine/math/noise/perlin/generator.hpp | 3 --- src/engine/memory/DefferedCleanup.hpp | 5 ++-- src/engine/memory/buffers/HostSingleT.hpp | 3 ++- src/engine/primitives/Scale.hpp | 3 --- src/engine/primitives/boxes/concepts.hpp | 24 +++++-------------- src/engine/primitives/lines/LineBase.cpp | 3 --- src/engine/primitives/lines/LineBase.hpp | 3 --- src/engine/primitives/matricies/Matrix.hpp | 3 --- .../matricies/MatrixEvolvedTypes.hpp | 4 +--- .../primitives/matricies/RotationMatrix.hpp | 3 --- .../primitives/matricies/mult_operators.cpp | 5 ---- src/engine/primitives/planes/concepts.hpp | 24 +++++-------------- src/engine/primitives/points/Coordinate.hpp | 4 ---- src/engine/primitives/points/concepts.hpp | 14 ++++------- .../primitives/rotation/EulerRotation.hpp | 6 +---- .../primitives/rotation/QuatRotation.cpp | 4 ++-- .../primitives/rotation/QuatRotation.hpp | 4 ---- .../primitives/vectors/NormalVector.hpp | 3 --- src/engine/primitives/vectors/Vector.hpp | 3 --- src/engine/rendering/devices/Device.hpp | 1 + src/engine/rendering/pipelines/Attachment.hpp | 4 ++-- .../rendering/pipelines/shaders/Compiler.cpp | 12 +--------- src/engine/rendering/renderpass/Subpass.hpp | 4 +--- src/engine/systems/concepts.hpp | 16 ++++--------- 56 files changed, 57 insertions(+), 257 deletions(-) diff --git a/src/editor/src/components/GameComponent.cpp b/src/editor/src/components/GameComponent.cpp index 8cf7e13..ef27113 100644 --- a/src/editor/src/components/GameComponent.cpp +++ b/src/editor/src/components/GameComponent.cpp @@ -7,5 +7,4 @@ namespace fgl::engine { - } diff --git a/src/engine/assets/image/Image.hpp b/src/engine/assets/image/Image.hpp index abcf57d..5bb9393 100644 --- a/src/engine/assets/image/Image.hpp +++ b/src/engine/assets/image/Image.hpp @@ -60,7 +60,7 @@ namespace fgl::engine [[nodiscard]] const vk::Extent2D& getExtent() const { return m_extent; } - [[nodiscard]] std::shared_ptr< ImageView > getView( Sampler sampler = {}); + [[nodiscard]] std::shared_ptr< ImageView > getView( Sampler sampler = {} ); [[nodiscard]] vk::ImageMemoryBarrier transitionTo( vk::ImageLayout old_layout, vk::ImageLayout new_layout, const vk::ImageSubresourceRange& range ) const; diff --git a/src/engine/assets/material/Material.hpp b/src/engine/assets/material/Material.hpp index b7cc0c3..e8efb3d 100644 --- a/src/engine/assets/material/Material.hpp +++ b/src/engine/assets/material/Material.hpp @@ -4,20 +4,16 @@ #pragma once +#include +#include + #include -#include "engine/types.hpp" - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#include "glm/vec3.hpp" -#include "glm/vec4.hpp" -#pragma GCC diagnostic pop - #include "engine/constants.hpp" #include "engine/descriptors/Descriptor.hpp" #include "engine/descriptors/DescriptorSetLayout.hpp" #include "engine/memory/buffers/vector/DeviceVector.hpp" +#include "engine/types.hpp" namespace fgl::engine { diff --git a/src/engine/assets/model/Model.hpp b/src/engine/assets/model/Model.hpp index ffde8af..2a3215d 100644 --- a/src/engine/assets/model/Model.hpp +++ b/src/engine/assets/model/Model.hpp @@ -4,11 +4,7 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #include -#pragma GCC diagnostic pop #include #include diff --git a/src/engine/assets/model/ModelVertex.cpp b/src/engine/assets/model/ModelVertex.cpp index 20375aa..4194ea9 100644 --- a/src/engine/assets/model/ModelVertex.cpp +++ b/src/engine/assets/model/ModelVertex.cpp @@ -5,12 +5,8 @@ #include "ModelVertex.hpp" #define GLM_ENABLE_EXPERIMENTAL -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #include #include -#pragma GCC diagnostic pop #include "Model.hpp" #include "ModelInstance.hpp" diff --git a/src/engine/assets/model/ModelVertex.hpp b/src/engine/assets/model/ModelVertex.hpp index b2197d9..06b135a 100644 --- a/src/engine/assets/model/ModelVertex.hpp +++ b/src/engine/assets/model/ModelVertex.hpp @@ -4,13 +4,9 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include #include #include -#pragma GCC diagnostic pop - #include #include "SimpleVertex.hpp" diff --git a/src/engine/assets/model/Primitive.hpp b/src/engine/assets/model/Primitive.hpp index 2354cb9..c9fcfcf 100644 --- a/src/engine/assets/model/Primitive.hpp +++ b/src/engine/assets/model/Primitive.hpp @@ -6,17 +6,12 @@ #include -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#pragma GCC diagnostic ignored "-Weffc++" -#include "objectloaders/tiny_gltf.h" -#pragma GCC diagnostic pop - #include "ModelInstanceInfo.hpp" #include "assets/material/Material.hpp" #include "engine/memory/buffers/vector/DeviceVector.hpp" #include "engine/primitives/boxes/OrientedBoundingBox.hpp" #include "memory/buffers/vector/IndexedVector.hpp" +#include "objectloaders/tiny_gltf.h" namespace fgl::engine { diff --git a/src/engine/assets/model/SimpleVertex.hpp b/src/engine/assets/model/SimpleVertex.hpp index 00ae720..a4c2142 100644 --- a/src/engine/assets/model/SimpleVertex.hpp +++ b/src/engine/assets/model/SimpleVertex.hpp @@ -4,11 +4,8 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include #include -#pragma GCC diagnostic pop #include diff --git a/src/engine/assets/model/VertexAttribute.hpp b/src/engine/assets/model/VertexAttribute.hpp index 3caa33e..224975f 100644 --- a/src/engine/assets/model/VertexAttribute.hpp +++ b/src/engine/assets/model/VertexAttribute.hpp @@ -2,12 +2,8 @@ // Created by kj16609 on 7/5/25. // #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #include #include -#pragma GCC diagnostic pop #include "rendering/RenderingFormats.hpp" diff --git a/src/engine/assets/model/builders/ModelBuilder.cpp b/src/engine/assets/model/builders/ModelBuilder.cpp index cc48949..f122523 100644 --- a/src/engine/assets/model/builders/ModelBuilder.cpp +++ b/src/engine/assets/model/builders/ModelBuilder.cpp @@ -6,8 +6,8 @@ #include -#include "engine/assets/model/Primitive.hpp" #include "engine/assets/model/ModelVertex.hpp" +#include "engine/assets/model/Primitive.hpp" namespace fgl::engine { @@ -23,7 +23,8 @@ namespace fgl::engine throw std::runtime_error( "Unknown model file extension" ); } - void ModelBuilder::loadVerts( const std::vector< ModelVertex >& verts, const std::vector< std::uint32_t >& indicies ) + void ModelBuilder:: + loadVerts( const std::vector< ModelVertex >& verts, const std::vector< std::uint32_t >& indicies ) { ZoneScoped; VertexBufferSuballocation vertex_suballoc { this->m_vertex_buffer, verts }; diff --git a/src/engine/assets/model/builders/ModelBuilder.hpp b/src/engine/assets/model/builders/ModelBuilder.hpp index 0a694b8..aec856a 100644 --- a/src/engine/assets/model/builders/ModelBuilder.hpp +++ b/src/engine/assets/model/builders/ModelBuilder.hpp @@ -24,8 +24,7 @@ namespace fgl::engine ModelBuilder() = delete; - ModelBuilder( - const memory::Buffer& parent_vertex_buffer, const memory::Buffer& parent_index_buffer ) : + ModelBuilder( const memory::Buffer& parent_vertex_buffer, const memory::Buffer& parent_index_buffer ) : m_vertex_buffer( parent_vertex_buffer ), m_index_buffer( parent_index_buffer ) {} diff --git a/src/engine/assets/model/builders/SceneBuilder.cpp b/src/engine/assets/model/builders/SceneBuilder.cpp index 2f9420e..5f90231 100644 --- a/src/engine/assets/model/builders/SceneBuilder.cpp +++ b/src/engine/assets/model/builders/SceneBuilder.cpp @@ -4,15 +4,8 @@ #include "SceneBuilder.hpp" -#include "engine/assets/model/Model.hpp" - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#pragma GCC diagnostic ignored "-Weffc++" -#include "objectloaders/tiny_gltf.h" -#pragma GCC diagnostic pop - #include "assets/model/ModelVertex.hpp" +#include "engine/assets/model/Model.hpp" #include "engine/assets/stores.hpp" #include "engine/camera/RenderCamera.hpp" #include "engine/debug/logging/logging.hpp" @@ -20,6 +13,7 @@ #include "engine/gameobjects/GameObject.hpp" #include "gameobjects/components/TransformComponent.hpp" #include "mikktspace/mikktspace.hpp" +#include "objectloaders/tiny_gltf.h" namespace fgl::engine { diff --git a/src/engine/assets/model/builders/SceneBuilder.hpp b/src/engine/assets/model/builders/SceneBuilder.hpp index a0a03c8..75829ef 100644 --- a/src/engine/assets/model/builders/SceneBuilder.hpp +++ b/src/engine/assets/model/builders/SceneBuilder.hpp @@ -4,14 +4,10 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #define GLM_ENABLE_EXPERIMENTAL #include #include #include -#pragma GCC diagnostic pop #include #include diff --git a/src/engine/assets/model/builders/loadObj.cpp b/src/engine/assets/model/builders/loadObj.cpp index 4d00026..cc271fa 100644 --- a/src/engine/assets/model/builders/loadObj.cpp +++ b/src/engine/assets/model/builders/loadObj.cpp @@ -2,11 +2,7 @@ // Created by kj16609 on 5/18/24. // -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop #include #include diff --git a/src/engine/assets/stores.hpp b/src/engine/assets/stores.hpp index 6530b24..6363f80 100644 --- a/src/engine/assets/stores.hpp +++ b/src/engine/assets/stores.hpp @@ -10,7 +10,7 @@ namespace fgl::engine { class Texture; - using TextureStore = AssetStore< Texture>; + using TextureStore = AssetStore< Texture >; TextureStore& getTextureStore(); diff --git a/src/engine/assets/texture/Texture.cpp b/src/engine/assets/texture/Texture.cpp index 870981b..d1024ec 100644 --- a/src/engine/assets/texture/Texture.cpp +++ b/src/engine/assets/texture/Texture.cpp @@ -10,15 +10,9 @@ #include "engine/debug/logging/logging.hpp" #include "engine/descriptors/DescriptorSet.hpp" #include "engine/math/noise/perlin/generator.hpp" - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wold-style-cast" -#pragma GCC diagnostic ignored "-Wconversion" #include "engine/utility/IDPool.hpp" #include "imgui/backends/imgui_impl_vulkan.h" #include "objectloaders/stb_image.h" -#pragma GCC diagnostic pop namespace fgl::engine { diff --git a/src/engine/camera/RenderCamera.hpp b/src/engine/camera/RenderCamera.hpp index c062291..3bb0971 100644 --- a/src/engine/camera/RenderCamera.hpp +++ b/src/engine/camera/RenderCamera.hpp @@ -4,21 +4,15 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #define GLM_ENABLE_EXPERIMENTAL #include #include -#pragma GCC diagnostic pop #include "CameraViewpoint.hpp" #include "CompositeSwapchain.hpp" #include "GBufferSwapchain.hpp" #include "debug/Track.hpp" #include "engine/descriptors/DescriptorSet.hpp" -#include "engine/memory/buffers/HostSingleT.hpp" -#include "engine/memory/buffers/UniqueFrameSuballocation.hpp" #include "engine/primitives/Frustum.hpp" #include "engine/rendering/types.hpp" diff --git a/src/engine/concepts/is_bindable.hpp b/src/engine/concepts/is_bindable.hpp index 7ef851c..87bd8dd 100644 --- a/src/engine/concepts/is_bindable.hpp +++ b/src/engine/concepts/is_bindable.hpp @@ -10,16 +10,12 @@ namespace fgl::engine { template < typename T > concept is_bindable_buffer = requires( T t ) { - { - t.descriptorInfo() - } -> std::same_as< vk::DescriptorBufferInfo >; + { t.descriptorInfo() } -> std::same_as< vk::DescriptorBufferInfo >; }; template < typename T > concept is_bindable_image = requires( T t ) { - { - t.descriptorInfo() - } -> std::same_as< vk::DescriptorImageInfo >; + { t.descriptorInfo() } -> std::same_as< vk::DescriptorImageInfo >; }; template < typename T > concept is_bindable = is_bindable_image< T > || is_bindable_buffer< T >; diff --git a/src/engine/concepts/is_constant_range.hpp b/src/engine/concepts/is_constant_range.hpp index 1736ebc..fee0c35 100644 --- a/src/engine/concepts/is_constant_range.hpp +++ b/src/engine/concepts/is_constant_range.hpp @@ -10,8 +10,6 @@ namespace fgl::engine { template < typename T > concept is_constant_range = requires( T t ) { - { - t.m_range - } -> std::same_as< const vk::PushConstantRange& >; + { t.m_range } -> std::same_as< const vk::PushConstantRange& >; }; } // namespace fgl::engine \ No newline at end of file diff --git a/src/engine/concepts/is_image.hpp b/src/engine/concepts/is_image.hpp index 2abd3eb..6197b88 100644 --- a/src/engine/concepts/is_image.hpp +++ b/src/engine/concepts/is_image.hpp @@ -9,15 +9,9 @@ namespace fgl::engine template < typename T > concept is_image = requires( T a ) { - { - a.getVkImage() - } -> std::same_as< vk::Image& >; - { - a.format() - } -> std::same_as< vk::Format >; - { - a.extent() - } -> std::same_as< vk::Extent2D >; + { a.getVkImage() } -> std::same_as< vk::Image& >; + { a.format() } -> std::same_as< vk::Format >; + { a.extent() } -> std::same_as< vk::Extent2D >; }; -} \ No newline at end of file +} // namespace fgl::engine \ No newline at end of file diff --git a/src/engine/constants.hpp b/src/engine/constants.hpp index 74883dd..18ea7e9 100644 --- a/src/engine/constants.hpp +++ b/src/engine/constants.hpp @@ -4,11 +4,8 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include #include -#pragma GCC diagnostic pop #include "types.hpp" diff --git a/src/engine/debug/logging/formatters/glm.cpp b/src/engine/debug/logging/formatters/glm.cpp index 91bbe85..64b4ee1 100644 --- a/src/engine/debug/logging/formatters/glm.cpp +++ b/src/engine/debug/logging/formatters/glm.cpp @@ -4,12 +4,8 @@ #include "glm.hpp" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #define GLM_ENABLE_EXPERIMENTAL #include -#pragma GCC diagnostic pop std::format_context::iterator std::formatter< glm::qua< float > >::format( const glm::quat& quat, format_context& ctx ) const diff --git a/src/engine/debug/logging/formatters/matrix.cpp b/src/engine/debug/logging/formatters/matrix.cpp index 9e43611..4c4044e 100644 --- a/src/engine/debug/logging/formatters/matrix.cpp +++ b/src/engine/debug/logging/formatters/matrix.cpp @@ -4,11 +4,7 @@ #include "matrix.hpp" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #include -#pragma GCC diagnostic pop std::format_context::iterator std::formatter< glm::vec4 >::format( const glm::vec4& vec, format_context& ctx ) const { diff --git a/src/engine/debug/logging/logging.hpp b/src/engine/debug/logging/logging.hpp index c0ac1e4..69c5142 100644 --- a/src/engine/debug/logging/logging.hpp +++ b/src/engine/debug/logging/logging.hpp @@ -4,17 +4,11 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -#pragma GCC diagnostic ignored "-Wnoexcept" #include -#pragma GCC diagnostic pop #include "formatters/filesystem.hpp" -#include "formatters/matrix.hpp" #include "formatters/glm.hpp" +#include "formatters/matrix.hpp" namespace fgl::engine::log { diff --git a/src/engine/debug/timing/FlameGraph.cpp b/src/engine/debug/timing/FlameGraph.cpp index 533a548..8c574e4 100644 --- a/src/engine/debug/timing/FlameGraph.cpp +++ b/src/engine/debug/timing/FlameGraph.cpp @@ -5,12 +5,7 @@ #include "FlameGraph.hpp" #include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop #include "engine/FGL_DEFINES.hpp" #include "engine/clock.hpp" @@ -30,9 +25,9 @@ namespace fgl::engine::debug using Duration = ProfilingClock::duration; - Duration getDuration() const { return m_end - m_start; } + [[nodiscard]] Duration getDuration() const { return m_end - m_start; } - Duration getTotalTime() const + [[nodiscard]] Duration getTotalTime() const { if ( m_parent != nullptr ) return m_parent->getTotalTime(); diff --git a/src/engine/descriptors/DescriptorPool.hpp b/src/engine/descriptors/DescriptorPool.hpp index 0b9ed0a..44cc6cb 100644 --- a/src/engine/descriptors/DescriptorPool.hpp +++ b/src/engine/descriptors/DescriptorPool.hpp @@ -17,7 +17,6 @@ namespace fgl::engine namespace fgl::engine::descriptors { - class DescriptorPool { vk::raii::DescriptorPool m_pool; diff --git a/src/engine/gameobjects/components/drawers.cpp b/src/engine/gameobjects/components/drawers.cpp index 0fdb8cb..43ed536 100644 --- a/src/engine/gameobjects/components/drawers.cpp +++ b/src/engine/gameobjects/components/drawers.cpp @@ -4,13 +4,9 @@ #include "drawers.hpp" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wold-style-cast" #include #include "editor/src/gui/helpers.hpp" -#pragma GCC diagnostic pop namespace fgl::engine { diff --git a/src/engine/gameobjects/components/interface/ComponentEditorInterface.cpp b/src/engine/gameobjects/components/interface/ComponentEditorInterface.cpp index 5103ba8..ffa606b 100644 --- a/src/engine/gameobjects/components/interface/ComponentEditorInterface.cpp +++ b/src/engine/gameobjects/components/interface/ComponentEditorInterface.cpp @@ -4,11 +4,7 @@ #include "ComponentEditorInterface.hpp" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wold-style-cast" #include -#pragma GCC diagnostic pop namespace fgl::engine { diff --git a/src/engine/gameobjects/components/interface/GameObjectComponent.cpp b/src/engine/gameobjects/components/interface/GameObjectComponent.cpp index e43d94e..9432ef2 100644 --- a/src/engine/gameobjects/components/interface/GameObjectComponent.cpp +++ b/src/engine/gameobjects/components/interface/GameObjectComponent.cpp @@ -4,11 +4,7 @@ #include "GameObjectComponent.hpp" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wold-style-cast" #include -#pragma GCC diagnostic pop namespace fgl::engine { diff --git a/src/engine/lighting/lights/GlobalIlluminator.cpp b/src/engine/lighting/lights/GlobalIlluminator.cpp index 714e8a8..d2c7f69 100644 --- a/src/engine/lighting/lights/GlobalIlluminator.cpp +++ b/src/engine/lighting/lights/GlobalIlluminator.cpp @@ -3,7 +3,6 @@ // #include "GlobalIlluminator.hpp" - namespace fgl::engine::lights { diff --git a/src/engine/math/intersections/aabb/coordinate.cpp b/src/engine/math/intersections/aabb/coordinate.cpp index cbacfb6..658d3c9 100644 --- a/src/engine/math/intersections/aabb/coordinate.cpp +++ b/src/engine/math/intersections/aabb/coordinate.cpp @@ -20,8 +20,6 @@ namespace fgl::engine::intersections return top_in_range && bottom_in_range; } - - template bool contains< CS::World >( const AxisAlignedBoundingBox< CS::World >&, const Coordinate< CS::World >& ); } // namespace fgl::engine::intersections diff --git a/src/engine/math/noise/perlin/generator.cpp b/src/engine/math/noise/perlin/generator.cpp index b012f56..1a84918 100644 --- a/src/engine/math/noise/perlin/generator.cpp +++ b/src/engine/math/noise/perlin/generator.cpp @@ -4,12 +4,7 @@ #include "generator.hpp" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop - - #include #include diff --git a/src/engine/math/noise/perlin/generator.hpp b/src/engine/math/noise/perlin/generator.hpp index b4ac981..c8f25d7 100644 --- a/src/engine/math/noise/perlin/generator.hpp +++ b/src/engine/math/noise/perlin/generator.hpp @@ -4,10 +4,7 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop #include diff --git a/src/engine/memory/DefferedCleanup.hpp b/src/engine/memory/DefferedCleanup.hpp index 81c9a82..30eef0b 100644 --- a/src/engine/memory/DefferedCleanup.hpp +++ b/src/engine/memory/DefferedCleanup.hpp @@ -6,6 +6,7 @@ namespace fgl::engine::memory { - void deferredDelete( auto&& item ) {} + void deferredDelete( auto&& item ) + {} -} +} // namespace fgl::engine::memory diff --git a/src/engine/memory/buffers/HostSingleT.hpp b/src/engine/memory/buffers/HostSingleT.hpp index d401f81..4177aab 100644 --- a/src/engine/memory/buffers/HostSingleT.hpp +++ b/src/engine/memory/buffers/HostSingleT.hpp @@ -26,7 +26,8 @@ namespace fgl::engine HostSingleT( HostSingleT&& ) = delete; HostSingleT& operator=( const HostSingleT& ) = delete; - HostSingleT( const memory::Buffer& buffer ) : memory::BufferSuballocation( buffer, sizeof( T ), alignof( T ) ) {} + HostSingleT( const memory::Buffer& buffer ) : memory::BufferSuballocation( buffer, sizeof( T ), alignof( T ) ) + {} HostSingleT& operator=( T& t ) { diff --git a/src/engine/primitives/Scale.hpp b/src/engine/primitives/Scale.hpp index ee1556d..bf9ad20 100644 --- a/src/engine/primitives/Scale.hpp +++ b/src/engine/primitives/Scale.hpp @@ -4,10 +4,7 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop #include diff --git a/src/engine/primitives/boxes/concepts.hpp b/src/engine/primitives/boxes/concepts.hpp index 9d0a8b6..7736d68 100644 --- a/src/engine/primitives/boxes/concepts.hpp +++ b/src/engine/primitives/boxes/concepts.hpp @@ -17,29 +17,17 @@ namespace fgl::engine template < typename T > concept has_space_type = requires( const T t ) { - { - T::SpaceType - } -> std::same_as< CoordinateSpace >; + { T::SpaceType } -> std::same_as< CoordinateSpace >; }; template < typename T > concept is_bounding_box = requires( const T t ) { requires has_space_type< T >; - { - t.right() - } -> is_normal_vector; - { - t.up() - } -> is_normal_vector; - { - t.forward() - } -> is_normal_vector; - { - t.topLeftForward() - } -> is_coordinate; - { - t.bottomLeftBack() - } -> is_coordinate; + { t.right() } -> is_normal_vector; + { t.up() } -> is_normal_vector; + { t.forward() } -> is_normal_vector; + { t.topLeftForward() } -> is_coordinate; + { t.bottomLeftBack() } -> is_coordinate; }; } // namespace fgl::engine diff --git a/src/engine/primitives/lines/LineBase.cpp b/src/engine/primitives/lines/LineBase.cpp index 89d64fe..b02ada0 100644 --- a/src/engine/primitives/lines/LineBase.cpp +++ b/src/engine/primitives/lines/LineBase.cpp @@ -4,10 +4,7 @@ #include "LineBase.hpp" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic push namespace fgl::engine { diff --git a/src/engine/primitives/lines/LineBase.hpp b/src/engine/primitives/lines/LineBase.hpp index b52e5bb..ed6c195 100644 --- a/src/engine/primitives/lines/LineBase.hpp +++ b/src/engine/primitives/lines/LineBase.hpp @@ -4,10 +4,7 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop namespace fgl::engine { diff --git a/src/engine/primitives/matricies/Matrix.hpp b/src/engine/primitives/matricies/Matrix.hpp index f738fc9..e29e7f6 100644 --- a/src/engine/primitives/matricies/Matrix.hpp +++ b/src/engine/primitives/matricies/Matrix.hpp @@ -4,12 +4,9 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wduplicated-branches" #define GLM_ENABLE_EXPERIMENTAL #include #include -#pragma GCC diagnostic pop #include "MatrixEvolvedTypes.hpp" diff --git a/src/engine/primitives/matricies/MatrixEvolvedTypes.hpp b/src/engine/primitives/matricies/MatrixEvolvedTypes.hpp index d2c342c..d7da732 100644 --- a/src/engine/primitives/matricies/MatrixEvolvedTypes.hpp +++ b/src/engine/primitives/matricies/MatrixEvolvedTypes.hpp @@ -82,9 +82,7 @@ namespace fgl::engine //! Checks if CType can be evolved by MType. (The input type must match the input matrix type) template < CoordinateSpace CType, MatrixType MType > concept can_be_evolved = requires() { - { - DevolvedType< MType >() == CType - }; + { DevolvedType< MType >() == CType }; }; } // namespace fgl::engine diff --git a/src/engine/primitives/matricies/RotationMatrix.hpp b/src/engine/primitives/matricies/RotationMatrix.hpp index b9c5184..c14a5d9 100644 --- a/src/engine/primitives/matricies/RotationMatrix.hpp +++ b/src/engine/primitives/matricies/RotationMatrix.hpp @@ -4,10 +4,7 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop namespace fgl::engine { diff --git a/src/engine/primitives/matricies/mult_operators.cpp b/src/engine/primitives/matricies/mult_operators.cpp index 33dc9e4..cb3771e 100644 --- a/src/engine/primitives/matricies/mult_operators.cpp +++ b/src/engine/primitives/matricies/mult_operators.cpp @@ -2,10 +2,7 @@ // Created by kj16609 on 2/28/24. // -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop #include "RotationMatrix.hpp" #include "engine/primitives/vectors/NormalVector.hpp" @@ -24,6 +21,4 @@ namespace fgl::engine return Vector( static_cast< glm::mat3 >( rot_mat ) * vec.vec() ); } - - } // namespace fgl::engine diff --git a/src/engine/primitives/planes/concepts.hpp b/src/engine/primitives/planes/concepts.hpp index d5d32ab..6bb315d 100644 --- a/src/engine/primitives/planes/concepts.hpp +++ b/src/engine/primitives/planes/concepts.hpp @@ -21,24 +21,12 @@ namespace fgl::engine template < typename T > concept is_plane = requires( T t ) { - { - T::SpaceType - } -> std::same_as< const CoordinateSpace& >; - { - t.distance() - } -> std::same_as< float >; - { - t.getPosition() - } -> is_coordinate; - { - t.getDirection() - } -> is_normal_vector; - { - t.isForward( std::declval< Coordinate< T::SpaceType > >() ) - } -> std::same_as< bool >; - { - t.mapToPlane( std::declval< Coordinate< T::SpaceType > >() ) - } -> is_coordinate; + { T::SpaceType } -> std::same_as< const CoordinateSpace& >; + { t.distance() } -> std::same_as< float >; + { t.getPosition() } -> is_coordinate; + { t.getDirection() } -> is_normal_vector; + { t.isForward( std::declval< Coordinate< T::SpaceType > >() ) } -> std::same_as< bool >; + { t.mapToPlane( std::declval< Coordinate< T::SpaceType > >() ) } -> is_coordinate; }; } // namespace fgl::engine \ No newline at end of file diff --git a/src/engine/primitives/points/Coordinate.hpp b/src/engine/primitives/points/Coordinate.hpp index 4ff6dee..f9da326 100644 --- a/src/engine/primitives/points/Coordinate.hpp +++ b/src/engine/primitives/points/Coordinate.hpp @@ -4,11 +4,7 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #include -#pragma GCC diagnostic pop #include "engine/constants.hpp" #include "engine/primitives/CoordinateSpace.hpp" diff --git a/src/engine/primitives/points/concepts.hpp b/src/engine/primitives/points/concepts.hpp index b1929ca..794e20f 100644 --- a/src/engine/primitives/points/concepts.hpp +++ b/src/engine/primitives/points/concepts.hpp @@ -11,15 +11,9 @@ namespace fgl::engine template < typename T > concept is_coordinate = requires( T t ) { requires std::is_base_of_v< glm::vec3, T >; - { - t.up() - } -> std::same_as< float& >; - { - t.right() - } -> std::same_as< float& >; - { - t.forward() - } -> std::same_as< float& >; + { t.up() } -> std::same_as< float& >; + { t.right() } -> std::same_as< float& >; + { t.forward() } -> std::same_as< float& >; }; -} +} // namespace fgl::engine diff --git a/src/engine/primitives/rotation/EulerRotation.hpp b/src/engine/primitives/rotation/EulerRotation.hpp index f6c4378..0e797fc 100644 --- a/src/engine/primitives/rotation/EulerRotation.hpp +++ b/src/engine/primitives/rotation/EulerRotation.hpp @@ -3,12 +3,8 @@ // #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#include "glm/vec3.hpp" -#pragma GCC diagnostic pop - #include "QuatRotation.hpp" +#include "glm/vec3.hpp" namespace fgl::engine { diff --git a/src/engine/primitives/rotation/QuatRotation.cpp b/src/engine/primitives/rotation/QuatRotation.cpp index 3fe30da..93667cf 100644 --- a/src/engine/primitives/rotation/QuatRotation.cpp +++ b/src/engine/primitives/rotation/QuatRotation.cpp @@ -13,7 +13,6 @@ namespace fgl::engine { - QuatRotation::QuatRotation() : QuatRotation( 0.0f ) {} @@ -44,7 +43,8 @@ namespace fgl::engine return glm::normalize( q ); } - QuatRotation::QuatRotation( const float x_i, const float y_i, const float z_i ) : glm::quat( toQuat( x_i, y_i, z_i ) ) + QuatRotation::QuatRotation( const float x_i, const float y_i, const float z_i ) : + glm::quat( toQuat( x_i, y_i, z_i ) ) {} QuatRotation::QuatRotation( const float value ) : QuatRotation( value, value, value ) diff --git a/src/engine/primitives/rotation/QuatRotation.hpp b/src/engine/primitives/rotation/QuatRotation.hpp index 13f09cc..09eb60a 100644 --- a/src/engine/primitives/rotation/QuatRotation.hpp +++ b/src/engine/primitives/rotation/QuatRotation.hpp @@ -4,12 +4,8 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wduplicated-branches" #include #include -#pragma GCC diagnostic pop #define GLM_ENABLE_EXPERIMENTAL #include diff --git a/src/engine/primitives/vectors/NormalVector.hpp b/src/engine/primitives/vectors/NormalVector.hpp index 10a72b1..658bbc6 100644 --- a/src/engine/primitives/vectors/NormalVector.hpp +++ b/src/engine/primitives/vectors/NormalVector.hpp @@ -4,11 +4,8 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include #include -#pragma GCC diagnostic pop #include "engine/primitives/CoordinateSpace.hpp" diff --git a/src/engine/primitives/vectors/Vector.hpp b/src/engine/primitives/vectors/Vector.hpp index ccc1db6..dabc071 100644 --- a/src/engine/primitives/vectors/Vector.hpp +++ b/src/engine/primitives/vectors/Vector.hpp @@ -4,10 +4,7 @@ #pragma once -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" #include -#pragma GCC diagnostic pop #include "engine/FGL_DEFINES.hpp" #include "engine/constants.hpp" diff --git a/src/engine/rendering/devices/Device.hpp b/src/engine/rendering/devices/Device.hpp index ddf78f6..5e5c9f2 100644 --- a/src/engine/rendering/devices/Device.hpp +++ b/src/engine/rendering/devices/Device.hpp @@ -104,6 +104,7 @@ namespace fgl::engine vk::PhysicalDeviceProperties m_properties; vk::CommandPoolCreateInfo commandPoolInfo(); + CommandBufferPool& getCmdBufferPool() { return m_command_pool; } Device( Window&, Instance& ); diff --git a/src/engine/rendering/pipelines/Attachment.hpp b/src/engine/rendering/pipelines/Attachment.hpp index 0a65bdc..8097ec9 100644 --- a/src/engine/rendering/pipelines/Attachment.hpp +++ b/src/engine/rendering/pipelines/Attachment.hpp @@ -117,7 +117,7 @@ namespace fgl::engine usage | vk::ImageUsageFlagBits::eInputAttachment | extra_flags, vk::ImageLayout::eUndefined, final_layout ) ) }; - image_views.emplace_back( itter->getView( ) ); + image_views.emplace_back( itter->getView() ); } } @@ -134,7 +134,7 @@ namespace fgl::engine for ( std::uint32_t i = 0; i < count; ++i ) { m_attachment_resources.m_images.emplace_back( image ); - m_attachment_resources.m_image_views.emplace_back( image->getView( ) ); + m_attachment_resources.m_image_views.emplace_back( image->getView() ); } } diff --git a/src/engine/rendering/pipelines/shaders/Compiler.cpp b/src/engine/rendering/pipelines/shaders/Compiler.cpp index 91155fa..32684b3 100644 --- a/src/engine/rendering/pipelines/shaders/Compiler.cpp +++ b/src/engine/rendering/pipelines/shaders/Compiler.cpp @@ -6,19 +6,9 @@ #include #include -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" -#pragma GCC diagnostic ignored "-Wold-style-cast" -#pragma GCC diagnostic ignored "-Wuseless-cast" -#pragma GCC diagnostic ignored "-Wredundant-tags" -#pragma GCC diagnostic ignored "-Wcast-qual" -#pragma GCC diagnostic ignored "-Weffc++" #include #include -#pragma GCC diagnostic pop +#include #include "engine/FGL_DEFINES.hpp" #include "engine/constants.hpp" diff --git a/src/engine/rendering/renderpass/Subpass.hpp b/src/engine/rendering/renderpass/Subpass.hpp index 7511996..51aad44 100644 --- a/src/engine/rendering/renderpass/Subpass.hpp +++ b/src/engine/rendering/renderpass/Subpass.hpp @@ -17,9 +17,7 @@ namespace fgl::engine template < typename T > concept is_subpass = requires( T a ) { - { - a.description() - } -> std::same_as< vk::SubpassDescription >; + { a.description() } -> std::same_as< vk::SubpassDescription >; }; template < typename T > diff --git a/src/engine/systems/concepts.hpp b/src/engine/systems/concepts.hpp index 7730164..b9d0ade 100644 --- a/src/engine/systems/concepts.hpp +++ b/src/engine/systems/concepts.hpp @@ -14,23 +14,15 @@ namespace fgl::engine template < typename T > concept is_system = requires( T t, FrameInfo info ) { - { - t.pass( info ) - }; + { t.pass( info ) }; }; template < typename T > concept is_threaded_system = requires( T t, FrameInfo info ) { requires is_system< T >; - { - t.startPass( info ) - }; - { - t.wait() - }; - { - t.setupSystem( info ) - } -> std::same_as< vk::raii::CommandBuffer& >; + { t.startPass( info ) }; + { t.wait() }; + { t.setupSystem( info ) } -> std::same_as< vk::raii::CommandBuffer& >; }; } // namespace fgl::engine