celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-04 11:35:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Map importer now handles maps with multiple wads + remove the //Game type and replace with projects type. Also made it faster an async

Browse Source
This commit is contained in:
Antoine Pilote
2024-07-29 23:12:56 -04:00
parent 69d59266b9
commit 5fd8b3ead9
3 changed files with 93 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
Editor/src/Windows/MapImporterWindow.cpp
View File

@@ -5,6 +5,7 @@
#include <src/Core/Logger.h>
#include <regex>
#include <src/Threading/JobSystem.h>
#include <Engine.h>
void MapImporterWindow::Draw()
{
@@ -35,7 +36,7 @@ void MapImporterWindow::Draw()
{
std::string selectedFile = FileDialog::OpenFile("*.map");
std::string relativePath = FileSystem::AbsoluteToRelative(selectedFile);
if (FileSystem::FileExists(relativePath))
if (!selectedFile.empty() && FileSystem::FileExists(relativePath))
{
if (Ref<File> file = FileSystem::GetFile(relativePath); file)
{
@@ -70,11 +71,16 @@ void MapImporterWindow::Draw()
m_MapToImport = nullptr;
}
for (auto& w : ScanUsedWads())
//for (auto& w : ScanUsedWads())
//{
// auto pathSplits = String::Split(std::string(w.begin(), w.end() - 4), '/');
// std::string WadName = pathSplits[std::size(pathSplits) - 1];
// std::string TargetDirectory = "/Materials/" + WadName + "/";
//}
if (m_Working)
{
auto pathSplits = String::Split(std::string(w.begin(), w.end() - 4), '/');
std::string WadName = pathSplits[std::size(pathSplits) - 1];
std::string TargetDirectory = "/Materials/" + WadName + "/";
ImGui::BeginDisabled();
}
if (Nuake::UI::PrimaryButton("Export"))
@@ -89,43 +95,77 @@ void MapImporterWindow::Draw()
m_OutputFile = FileSystem::AbsoluteToRelative(outputFile);
}
m_Percentage = 0;
std::string mapContent = m_MapToImport->Read();
std::istringstream stream(mapContent);
JobSystem::Get().Dispatch([this, mapContent]() {
m_Working = true;
std::string fileContent = mapContent;
std::istringstream stream(fileContent);
std::ostringstream modifiedMapContent;
std::ostringstream modifiedMapContent;
std::regex pattern(R"(\(\s*-?\d+\s*-?\d+\s*-?\d+\s*\)\s*\(\s*-?\d+\s*-?\d+\s*-?\d+\s*\)\s*\(\s*-?\d+\s*-?\d+\s*-?\d+\s*\)\s*([^\s]+))");
std::string pattern = R"(\(\s*-?\d+(\.\d+)?\s*-?\d+(\.\d+)?\s*-?\d+(\.\d+)?\s*\)\s*\(\s*-?\d+(\.\d+)?\s*-?\d+(\.\d+)?\s*-?\d+(\.\d+)?\s*\)\s*\(\s*-?\d+(\.\d+)?\s*-?\d+(\.\d+)?\s*-?\d+(\.\d+)?\s*\)\s*([^\s]+))";
std::regex regexPattern(pattern);
std::string line;
while (std::getline(stream, line))
{
std::smatch match;
if (std::regex_search(line, match, pattern))
std::string line;
int lines = std::count(fileContent.begin(), fileContent.end(), '\n');
int lineEdited = 0;
while (std::getline(stream, line))
{
// If a match is found, return the captured value
std::string result = match[1].str();
std::string result2 = match[0].str();
result2.erase(result2.end() - result.length(), result2.end());
std::string transformWad = GetTransformedWadPath(result);
if (transformWad.empty())
if (String::BeginsWith(line, "// Game:"))
{
Logger::Log("Couldn't find texture: " + result, "map importer", CRITICAL);
line = "// Game: " + String::RemoveWhiteSpace(Nuake::Engine::GetProject()->Name);
}
else
{
std::smatch match;
if (std::regex_search(line, match, regexPattern))
{
// If a match is found, return the captured value
std::string result = match[10].str();
std::string result2 = match[0].str();
result2.erase(result2.end() - result.length(), result2.end());
std::string transformWad = GetTransformedWadPath(result);
if (transformWad.empty())
{
Logger::Log("Couldn't find texture: " + result, "map importer", CRITICAL);
}
line = result2 + std::regex_replace(line, regexPattern, transformWad);
}
}
line = result2 + std::regex_replace(line, pattern, transformWad);
modifiedMapContent << line << std::endl;
lineEdited++;
int newPercentage = ((float)lineEdited / (float)lines) * 100;
if (newPercentage != m_Percentage)
{
m_Percentage.store(newPercentage, std::memory_order_relaxed);
}
}
modifiedMapContent << line << std::endl;
}
FileSystem::BeginWriteFile(m_OutputFile);
FileSystem::WriteLine(modifiedMapContent.str());
FileSystem::EndWriteFile();
FileSystem::BeginWriteFile(m_OutputFile);
FileSystem::WriteLine(modifiedMapContent.str());
FileSystem::EndWriteFile();
}, [this]() {
m_Working = false;
});
m_MapToImport = nullptr;
}
if (m_Working)
{
ImGui::EndDisabled();
}
ImGui::SameLine();
ImGui::TextUnformatted(m_OutputFile.c_str());
@@ -140,6 +180,13 @@ void MapImporterWindow::Draw()
m_OutputFile = FileSystem::AbsoluteToRelative(outputFile);
}
if (m_Working)
{
ImGui::SameLine();
ImGui::TextUnformatted((std::string("Progress: ") + std::to_string(m_Percentage) + "%").c_str());
}
}
ImGui::End();
}
@@ -183,6 +230,14 @@ std::string MapImporterWindow::GetTransformedWadPath(const std::string& path)
const std::string& baseTextureDir = "/textures/";
using namespace Nuake;
if (m_WadToMaterialMap.find(path) != m_WadToMaterialMap.end())
{
const std::string resolvedPath = m_WadToMaterialMap[path];
Logger::Log("Map importer found matching material: " + resolvedPath, "map importer", VERBOSE);
return resolvedPath;
return resolvedPath;
}
std::regex backslash_pattern("\\\\");
for (const auto& entry : std::filesystem::recursive_directory_iterator(FileSystem::Root + baseTextureDir))
{
@@ -190,6 +245,8 @@ std::string MapImporterWindow::GetTransformedWadPath(const std::string& path)
const std::string stem = String::ToLower(entry.path().stem().string());
std::string upperInput = String::ToLower(path);
upperInput = String::Split(upperInput, '/')[String::Split(upperInput, '/').size() - 1];
std::string prefix = "";
if (String::BeginsWith(upperInput, "*"))
{
@@ -222,9 +279,12 @@ std::string MapImporterWindow::GetTransformedWadPath(const std::string& path)
pathWithoutExtension /= relativePath.stem(); // Add the file name without extension
Logger::Log("Map importer found matching material: " + pathWithoutExtension.string(), "map importer", VERBOSE);
return std::regex_replace(pathWithoutExtension.string(), backslash_pattern, "/");
const std::string& foundMaterialPath = std::regex_replace(pathWithoutExtension.string(), backslash_pattern, "/");
m_WadToMaterialMap[path] = foundMaterialPath;
return foundMaterialPath;
}
}
Logger::Log("Map importer failed to find material: " + path, "map importer", VERBOSE);
return std::string();
}

5
Editor/src/Windows/MapImporterWindow.h
View File

@@ -2,6 +2,7 @@
#include <src/Core/FileSystem.h>
#include <src/Core/FileSystem.h>
#include <atomic>
class MapImporterWindow
{
@@ -17,7 +18,9 @@ private:
std::vector<std::string> m_DetectedWads;
std::string m_OutputFile = "";
std::vector<std::string> ScanUsedWads();
std::map<std::string, std::string> m_WadToMaterialMap;
std::atomic<bool> m_Working = false;
std::atomic<int> m_Percentage;
std::string GetTransformedWadPath(const std::string& path);
};

7
Nuake/src/Resource/FGD/FGDFile.cpp
View File

@@ -20,13 +20,6 @@ namespace Nuake {
this->BaseEntities = std::vector<FGDBaseEntity>();
this->BrushEntities = std::vector<FGDBrushEntity>();
this->PointEntities = std::vector<FGDPointEntity>();
// TODO: Remove this, debugging stuff.
FGDPointEntity newEnt;
newEnt.Name = "Light";
newEnt.Description = "A Nuake PBR light";
this->PointEntities.push_back(newEnt);
}