-Dev: added Ninja as build system to cmake config

AEspinosaDev · AEspinosaDev · commit 256aa2f431d4 · 2025-04-17T17:14:13.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 
 
 # Set the platform (e.g., x64)
-set(CMAKE_GENERATOR_PLATFORM x64) # or Win32, as needed
+# set(CMAKE_GENERATOR_PLATFORM x64) # or Win32, as needed
 
 # Use C++17
 set(CMAKE_CXX_STANDARD 17)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,82 @@
+
+{
+    "version": 3,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 16,
+        "patch": 0
+    },
+    
+    "configurePresets": [
+        {
+            "name": "ninja-debug",
+            "displayName": "Ninja (Debug)",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/ninja-debug",
+            "cacheVariables": {
+                "CMAKE_CXX_COMPILER": "clang++",         
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_STANDARD": "17",
+                "CMAKE_CXX_STANDARD_REQUIRED": "ON",
+                "CMAKE_CXX_EXTENSIONS": "OFF",
+                "CMAKE_BUILD_TYPE": "Debug"
+              }
+           
+        },
+        {
+            "name": "ninja-release",
+            "displayName": "Ninja (Release)",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/ninja-release",
+            "cacheVariables": {
+                "CMAKE_CXX_COMPILER": "clang++",         
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_STANDARD": "17",
+                "CMAKE_CXX_STANDARD_REQUIRED": "ON",
+                "CMAKE_CXX_EXTENSIONS": "OFF",
+                "CMAKE_BUILD_TYPE": "Release"
+              }
+        },
+        {
+            "name": "vs2022-x64-debug",
+            "displayName": "Visual Studio 2022 (x64) (Debug)",
+            "generator": "Visual Studio 17 2022",
+            "architecture": "x64", 
+            "binaryDir": "${sourceDir}/build/vs2022-x64-debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "vs2022-x64-release",
+            "displayName": "Visual Studio 2022 (x64) (Release)",
+            "generator": "Visual Studio 17 2022",
+            "architecture": "x64", 
+            "binaryDir": "${sourceDir}/build/vs2022-x64-release",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        }
+    ],
+    
+    "buildPresets": [
+        {
+            "name": "ninja-debug",
+            "configurePreset": "ninja-debug"
+        },
+        {
+            "name": "ninja-release",
+            "configurePreset": "ninja-release"
+        },
+        {
+            "name": "vs2022-x64-release",
+            "configurePreset": "vs2022-x64-release",
+            "configuration": "Release"
+        },
+        {
+            "name": "vs2022-x64-debug",
+            "configurePreset": "vs2022-x64-debug",
+            "configuration": "Debug"
+        }
+    ]
+}
diff --git a/examples/sponza/application.cpp b/examples/sponza/application.cpp
@@ -73,7 +73,7 @@ void Application::setup_gui() {
     explorerPanel->add_child(new Tools::Space());
     explorerPanel->add_child(new Tools::ControllerWidget(m_controller));
     explorerPanel->add_child(new Tools::Separator());
-    explorerPanel->add_child(new Tools::TextLine(" Application average"));
+    explorerPanel->add_child(new Tools::TextLine("Application average"));
     explorerPanel->add_child(new Tools::Profiler());
     explorerPanel->add_child(new Tools::Space());
 
diff --git a/include/engine/core/passes/pass.h b/include/engine/core/passes/pass.h
@@ -87,6 +87,8 @@ class BasePass
                    : m_framebuffers.resize(m_device->get_swapchain().get_present_images().size());
         m_imageExtent = extent;
     }
+    virtual ~BasePass(){
+    }
 
 #pragma region Getters & Setters
 
diff --git a/include/engine/core/scene/light.h b/include/engine/core/scene/light.h
@@ -54,6 +54,8 @@ class Light : public Object3D
             m_nonRaytraceCount++;
     }
 
+    virtual ~Light(){}
+
     virtual inline Vec3 get_color() const {
         return m_color;
     }
diff --git a/include/engine/core/scene/scene.h b/include/engine/core/scene/scene.h
@@ -54,8 +54,12 @@ class Scene : public Object3D
             break;
         case ObjectType::LIGHT:
             m_lights.push_back(static_cast<Light*>(obj));
+            break;
+        default:
+            
             break;
         }
+
         for (auto child : obj->get_children())
             classify_object(child);
     }
diff --git a/include/engine/systems/renderers/renderer.h b/include/engine/systems/renderers/renderer.h
@@ -97,14 +97,11 @@ class BaseRenderer
     inline void set_depth_format(ColorFormatType d) {
         m_settings.depthFormat = d;
     }
-    inline void set_enable_gui(bool op) {
-        m_settings.enableUI = op;
-    }
     inline std::vector<Core::BasePass*> get_render_passes() const {
         return m_passes;
     }
     inline void enable_gui_overlay(bool op) {
-        m_settings.enableUI;
+        m_settings.enableUI = op;
     }
     inline void set_sync_type(SyncType sync) {
         m_settings.screenSync = sync;
diff --git a/setup/build_debug_MSVC.bat b/setup/build_debug_MSVC.bat
diff --git a/setup/build_debug_ninja.bat b/setup/build_debug_ninja.bat
@@ -0,0 +1,22 @@
+@echo off
+
+cd ..
+mkdir build
+
+REM 
+set BUILD_DIR=build
+
+REM 
+where ninja >nul 2>&1
+if %ERRORLEVEL% EQU 0 (
+    echo ✅ Ninja found. Generating build files with Ninja...
+    cmake -G Ninja -S . -B %BUILD_DIR%
+) else (
+    echo ⚠️ Ninja not found. Falling back to Visual Studio 2022...
+    cmake -G "Visual Studio 17 2022" -A x64 -S . -B %BUILD_DIR%
+)
+
+cmake --build build --config Debug
+
+pause>nul
+exit
diff --git a/setup/build_release_MSVC.bat b/setup/build_release_MSVC.bat
diff --git a/setup/build_release_ninja.bat b/setup/build_release_ninja.bat
@@ -0,0 +1,22 @@
+@echo off
+
+cd ..
+mkdir build
+
+REM 
+set BUILD_DIR=build
+
+REM 
+where ninja >nul 2>&1
+if %ERRORLEVEL% EQU 0 (
+    echo ✅ Ninja found. Generating build files with Ninja...
+    cmake -G Ninja -S . -B %BUILD_DIR%
+) else (
+    echo ⚠️ Ninja not found. Falling back to Visual Studio 2022...
+    cmake -G "Visual Studio 17 2022" -A x64 -S . -B %BUILD_DIR%
+)
+
+cmake --build build --config Release
+
+pause>nul
+exit
diff --git a/src/tools/gui.cpp b/src/tools/gui.cpp
@@ -1,10 +1,8 @@
 #include <engine/tools/gui.h>
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
-namespace Tools
-{
-void GUIOverlay::render()
-{
+namespace Tools {
+void GUIOverlay::render() {
     PROFILING_EVENT()
 
     if (ImGui::GetCurrentContext())
@@ -21,6 +19,8 @@ void GUIOverlay::render()
         case CLASSIC:
             ImGui::StyleColorsClassic();
             break;
+        default:
+            break;
         }
 
         ImGui_ImplVulkan_NewFrame();
diff --git a/src/tools/loaders.cpp b/src/tools/loaders.cpp
@@ -208,7 +208,6 @@ void VKFW::Tools::Loaders::load_OBJ2(Core::Mesh* const mesh,
                 vertex.texCoord = {
                     attrib.texcoords[2 * index.texcoord_index + 0], attrib.texcoords[2 * index.texcoord_index + 1]};
             }
-            
 
             if (unique_vertices.count(vertex.pos) == 0)
             {
@@ -826,6 +825,9 @@ void VKFW::Tools::Loaders::load_PNG(Core::Texture* const texture,
         case TEXTURE_FORMAT_HDR:
             texture->set_format(SRGBA_16F);
             break;
+        case TEXTURE_FORMAT_DEPTH:
+            texture->set_format(DEPTH_16F);
+            break;
         }
     } else
     {
@@ -892,6 +894,9 @@ void VKFW::Tools::Loaders::load_3D_texture(Core::ITexture* const texture,
         case TEXTURE_FORMAT_HDR:
             texture->set_format(SRGBA_16F);
             break;
+        case TEXTURE_FORMAT_DEPTH:
+            texture->set_format(DEPTH_16F);
+            break;
         }
     } else
     {
@@ -1416,25 +1421,32 @@ void VKFW::Tools::Loaders::SceneLoader::save_children(tinyxml2::XMLElement* pare
             tinyxml2::XMLElement* influenceElement = nullptr;
             switch (light->get_light_type())
             {
-            case LightType::POINT:
+            case LightType::POINT: {
                 lightElement->SetAttribute("type", "point");
-                influenceElement = doc->NewElement("influence");
+                auto* influenceElement = doc->NewElement("influence");
                 influenceElement->SetAttribute("value", static_cast<Core::PointLight*>(light)->get_area_of_effect());
                 lightElement->InsertEndChild(influenceElement);
                 break;
-            case LightType::DIRECTIONAL:
+            }
+
+            case LightType::DIRECTIONAL: {
                 lightElement->SetAttribute("type", "directional");
-                directionElement = doc->NewElement("direction");
-                Vec3 direction   = static_cast<Core::DirectionalLight*>(light)->get_direction();
+                auto* directionElement = doc->NewElement("direction");
+                Vec3  direction        = static_cast<Core::DirectionalLight*>(light)->get_direction();
                 directionElement->SetAttribute("x", direction.x);
                 directionElement->SetAttribute("y", direction.y);
                 directionElement->SetAttribute("z", direction.z);
                 lightElement->InsertEndChild(directionElement);
                 break;
-            case LightType::SPOT:
+            }
+
+            case LightType::SPOT: {
                 lightElement->SetAttribute("type", "spot");
                 break;
             }
+            case LightType::AREA: {
+            }
+            }
             lightElement->SetAttribute("name", light->get_name().c_str());
 
             // Save transform

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ class BasePass`
`87`	`87`	`: m_framebuffers.resize(m_device->get_swapchain().get_present_images().size());`
`88`	`88`	`m_imageExtent = extent;`
`89`	`89`	`}`
	`90`	`+ virtual ~BasePass(){`
	`91`	`+ }`
`90`	`92`
`91`	`93`	`#pragma region Getters & Setters`
`92`	`94`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ class Light : public Object3D`
`54`	`54`	`m_nonRaytraceCount++;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ virtual ~Light(){}`
	`58`	`+`
`57`	`59`	`virtual inline Vec3 get_color() const {`
`58`	`60`	`return m_color;`
`59`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,12 @@ class Scene : public Object3D`
`54`	`54`	`break;`
`55`	`55`	`case ObjectType::LIGHT:`
`56`	`56`	`m_lights.push_back(static_cast<Light*>(obj));`
	`57`	`+ break;`
	`58`	`+ default:`
	`59`	`+`
`57`	`60`	`break;`
`58`	`61`	`}`
	`62`	`+`
`59`	`63`	`for (auto child : obj->get_children())`
`60`	`64`	`classify_object(child);`
`61`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,14 +97,11 @@ class BaseRenderer`
`97`	`97`	`inline void set_depth_format(ColorFormatType d) {`
`98`	`98`	`m_settings.depthFormat = d;`
`99`	`99`	`}`
`100`		`- inline void set_enable_gui(bool op) {`
`101`		`- m_settings.enableUI = op;`
`102`		`- }`
`103`	`100`	`inline std::vector<Core::BasePass*> get_render_passes() const {`
`104`	`101`	`return m_passes;`
`105`	`102`	`}`
`106`	`103`	`inline void enable_gui_overlay(bool op) {`
`107`		`- m_settings.enableUI;`
	`104`	`+ m_settings.enableUI = op;`
`108`	`105`	`}`
`109`	`106`	`inline void set_sync_type(SyncType sync) {`
`110`	`107`	`m_settings.screenSync = sync;`