Path > fs::path

Author: JohnnyCena123

src/argv.cpp

@@ -34,7 +34,7 @@ void Game::handleArgv(int argc, char* argv[]) {
 			{ 'd', "--desc", printDescription },
 		};
 
-		std::optional<Path> altSaveDir;
+		std::optional<fs::path> altSaveDir;
 		for (size_t i = 1; i < argc; i++) {
 			std::string arg = argv[i];
 			if (arg.starts_with("--")) {

src/basics.cpp

@@ -4,25 +4,25 @@
 int screenWidth = 700;
 int screenHeight = 500;
 
-Path const resourceDir = [] -> Path {
-	Path const exeDir = GetApplicationDirectory();
+fs::path const resourceDir = [] -> fs::path {
+	fs::path const exeDir = GetApplicationDirectory();
 #ifdef _WIN32
 	return exeDir;
 #elif defined(__linux__)
 	if (exeDir.string().starts_with("/usr") && 
 		DirectoryExists("/usr/share/" PROJECT_NAME "/resources")
-	) return Path{"/usr/share"}/PROJECT_NAME/"resources";
+	) return fs::path{"/usr/share"}/PROJECT_NAME/"resources";
 #endif
 	return exeDir/"resources";
 }();
 
-Path saveDir = [] -> Path {
-	Path ret = Path{GetApplicationDirectory()} / "save";
+fs::path saveDir = [] -> fs::path {
+	fs::path ret = fs::path{GetApplicationDirectory()} / "save";
 #ifdef _WIN32
-	Path appData = std::getenv("APPDATA");
+	fs::path appData = std::getenv("APPDATA");
 	ret = appData/PROJECT_NAME;
 #elif defined(__linux__)
-	Path homeDir = std::getenv("HOME");
+	fs::path homeDir = std::getenv("HOME");
 	ret = homeDir/".local"/"share"/PROJECT_NAME;
 #endif
 	if (!DirectoryExists(ret.string().c_str())) 

src/basics.hpp

@@ -4,6 +4,6 @@
 int constexpr START_SCREEN_WIDTH = 700;
 int constexpr START_SCREEN_HEIGHT = 500;
 
-using Path = std::filesystem::path;
-extern Path const resourceDir;
-extern Path saveDir;
+namespace fs = std::filesystem;
+extern fs::path const resourceDir;
+extern fs::path saveDir;

src/game.cpp

@@ -38,7 +38,7 @@ Game::~Game() {
 			localTime->tm_min,
 			localTime->tm_sec
 		);
-		Path logsDir = saveDir/"logs";
+		fs::path logsDir = saveDir/"logs";
 		if (!DirectoryExists(logsDir.string().c_str())) MakeDirectory(logsDir.string().c_str());
 		SaveFileText((logsDir/logFileName).string().c_str(), m_logs.str().c_str());
 	}

src/resource-manager.cpp

@@ -25,8 +25,8 @@ void ResourceManager::uninitialize() {
 	}
 }
 
-bool ResourceManager::loadImage(std::string id, Path relativePath, LoadImageCallback manipulator) {
-	Path const fullPath = resourceDir / relativePath;
+bool ResourceManager::loadImage(std::string id, fs::path relativePath, LoadImageCallback manipulator) {
+	fs::path const fullPath = resourceDir / relativePath;
 	if (!FileExists(fullPath.string().c_str())) {
 		TraceLog(LOG_WARNING, "Image file does not exist [%s]: %s", id.c_str(), fullPath.string().c_str());
 		return false;
@@ -48,7 +48,7 @@ bool ResourceManager::loadImage(std::string id, Path relativePath, LoadImageCall
 	m_images[id] = image;
 	return true;
 }
-bool ResourceManager::loadTexture(std::string id, Path relativePath, LoadImageCallback manipulator) {
+bool ResourceManager::loadTexture(std::string id, fs::path relativePath, LoadImageCallback manipulator) {
 	if (!loadImage(id, relativePath, manipulator)) {
 		TraceLog(LOG_WARNING, "Texture of id %s failed to load", id.c_str());
 		return false;

src/resource-manager.hpp

@@ -17,8 +17,8 @@ class ResourceManager {
 	void initialize();
 	void uninitialize();
 
-	bool loadImage(std::string id, Path relativePath, LoadImageCallback manipulator = dummyImageManipulator);
-	bool loadTexture(std::string id, Path relativePath, LoadImageCallback manipulator = dummyImageManipulator);
+	bool loadImage(std::string id, fs::path relativePath, LoadImageCallback manipulator = dummyImageManipulator);
+	bool loadTexture(std::string id, fs::path relativePath, LoadImageCallback manipulator = dummyImageManipulator);
 
 	Image const& getImage(std::string id) const;
 	Texture2D const& getTexture(std::string id) const;