From da995b99c857eef91fe503d8092a569fca50daf9 Mon Sep 17 00:00:00 2001 From: antopilo Date: Mon, 16 Sep 2024 20:12:02 -0400 Subject: [PATCH] Renamed textures to Textures --- Editor/src/Commands/Commands/Commands.cpp | 2 +- Editor/src/Windows/MapImporterWindow.cpp | 4 ++-- Nuake/src/Scene/Systems/WadConverter.cpp | 6 +++--- Nuake/src/Vendors/katana-parser/katana.h | 2 +- Nuake/src/Vendors/katana-parser/parser.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Editor/src/Commands/Commands/Commands.cpp b/Editor/src/Commands/Commands/Commands.cpp index 46829eb6..75bc8417 100644 --- a/Editor/src/Commands/Commands/Commands.cpp +++ b/Editor/src/Commands/Commands/Commands.cpp @@ -65,7 +65,7 @@ namespace NuakeEditor "packageformat": { "extension": ".zip", "format": "zip" } }, "textures": { - "root": "textures", + "root": "Textures", "extensions": [ ".jpg", ".png", ".tga" ] }, "entities": { diff --git a/Editor/src/Windows/MapImporterWindow.cpp b/Editor/src/Windows/MapImporterWindow.cpp index 788d7d2e..c6031271 100644 --- a/Editor/src/Windows/MapImporterWindow.cpp +++ b/Editor/src/Windows/MapImporterWindow.cpp @@ -240,7 +240,7 @@ std::vector MapImporterWindow::ScanUsedWads() std::string MapImporterWindow::GetTransformedWadPath(const std::string& path) { - const std::string& baseTextureDir = "/textures/"; + const std::string& baseTextureDir = "/Textures/"; using namespace Nuake; if (m_WadToMaterialMap.find(path) != m_WadToMaterialMap.end()) @@ -285,7 +285,7 @@ std::string MapImporterWindow::GetTransformedWadPath(const std::string& path) if (entry.is_regular_file() && stem == upperInput) { - std::filesystem::path relativePath = std::filesystem::relative(entry.path(), FileSystem::Root + "/textures/"); + std::filesystem::path relativePath = std::filesystem::relative(entry.path(), FileSystem::Root + "/Textures/"); std::filesystem::path pathWithoutExtension = relativePath; pathWithoutExtension = pathWithoutExtension.parent_path(); // Remove the file name diff --git a/Nuake/src/Scene/Systems/WadConverter.cpp b/Nuake/src/Scene/Systems/WadConverter.cpp index 5dfce72f..604ef99d 100644 --- a/Nuake/src/Scene/Systems/WadConverter.cpp +++ b/Nuake/src/Scene/Systems/WadConverter.cpp @@ -358,11 +358,11 @@ namespace Nuake auto pathSplits = String::Split(std::string(wadPath.begin(), wadPath.end() - 4), '/'); pathSplits = String::Split(pathSplits[std::size(pathSplits) - 1], '\\'); WadName = pathSplits[std::size(pathSplits) - 1]; - TargetDirectory = "/textures/" + WadName + "/"; + TargetDirectory = "/Textures/" + WadName + "/"; - if (!FileSystem::DirectoryExists("/textures/")) + if (!FileSystem::DirectoryExists("/Textures/")) { - FileSystem::MakeDirectory("/textures/"); + FileSystem::MakeDirectory("/Textures/"); } if (!FileSystem::DirectoryExists(TargetDirectory)) diff --git a/Nuake/src/Vendors/katana-parser/katana.h b/Nuake/src/Vendors/katana-parser/katana.h index d06d7681..90455b9e 100644 --- a/Nuake/src/Vendors/katana-parser/katana.h +++ b/Nuake/src/Vendors/katana-parser/katana.h @@ -36,7 +36,7 @@ extern "C" { #define KATANA_ERROR_MESSAGE_SIZE 100 typedef enum { - KatanaRuleUnkown, + KatanaRuleUnknown, KatanaRuleStyle, KatanaRuleImport, KatanaRuleMedia, diff --git a/Nuake/src/Vendors/katana-parser/parser.c b/Nuake/src/Vendors/katana-parser/parser.c index 13b89ce6..02065c9f 100644 --- a/Nuake/src/Vendors/katana-parser/parser.c +++ b/Nuake/src/Vendors/katana-parser/parser.c @@ -1376,7 +1376,7 @@ void katana_print_rule(KatanaParser* parser, KatanaRule* rule) break; case KatanaRuleSupports: break; - case KatanaRuleUnkown: + case KatanaRuleUnknown: break; default: