refactor(utils): moved filesystem

CMakeLists.txt

@@ -30,7 +30,6 @@ if (ASSIMP_FOUND)
     include_directories(${ASSIMP_INCLUDE_DIR})
 endif ()
 
-set(FILESYSTEM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/libs/filesystem/include)
 set(GLM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/libs/glm/include)
 set(GLAD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/libs/glad/include)
 set(STB_IMAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/libs/image/include)
@@ -41,9 +40,6 @@ set(GLAD
 set(STB_IMAGE
         ${CMAKE_CURRENT_SOURCE_DIR}/libs/image/src/stb_image.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/libs/image/include/image/stb_image.h)
-set(FILESYSTEM
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/filesystem/src/filesystem.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/filesystem/include/filesystem/filesystem.h)
 
 file(GLOB_RECURSE IMGUI "libs/imgui/*")
 
@@ -53,7 +49,6 @@ set(COMPILATION_UNIT
         src/main.cpp
         ${GLAD}
         ${STB_IMAGE}
-        ${FILESYSTEM}
         ${IMGUI}
         ${SOURCES}
         )
@@ -62,7 +57,6 @@ add_executable(${PROJECT_NAME} ${COMPILATION_UNIT})
 
 target_include_directories(${PROJECT_NAME} PUBLIC
         ${GLAD_INCLUDE_DIRS}
-        ${FILESYSTEM_INCLUDE_DIRS}
         ${GLM_INCLUDE_DIRS}
         ${STB_IMAGE_INCLUDE_DIRS}
         ${KHR_INCLUDE_DIRS}

libs/filesystem/src/filesystem.cpp → src/utils/filesystem.hpp

@@ -1,7 +1,12 @@
-#include "filesystem/filesystem.h"
+#pragma once
+
 #include <filesystem>
+#include <string>
+
+namespace fs {
 
-std::string fs::path(const std::string& p) {
+inline std::string path(const std::string& p) {
     auto cwd = std::filesystem::current_path().parent_path();
     return cwd.append(p).string();
 }
+}

src/utils/key.hpp

@@ -4,6 +4,7 @@
 #include "glm/glm.hpp"
 
 namespace key {
+
 std::string createFromPosition(const glm::vec3 pos) {
     return std::string(std::to_string(pos.x) + (char)pos.y + (char)pos.z);
 }

src/world/skybox.h

@@ -4,9 +4,9 @@
 #include <string>
 #include <memory>
 #include "glm/glm.hpp"
-#include "filesystem/filesystem.h"
 #include "mesh/texture.h"
 #include "../configs/configs.hpp"
+#include "../utils/filesystem.hpp"
 
 class Shader;
 class SkyboxMesh;

src/world/world.h

@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include "glm/glm.hpp"
 #include "mesh/texture.h"
-#include "filesystem/filesystem.h"
+#include "../utils/filesystem.hpp"
 #include "../configs/configs.hpp"
 
 class Cell;