natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ApplicationEntry.cpp, ApplicationProject.h, and TexturingGUI.cppc | code style fixes

Browse Source
This commit is contained in:
Skarn
2022-03-12 20:19:47 +03:00
parent 9240aef1a7
commit 159eb4f0e3
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/noggit/application/ApplicationEntry.cpp
View File

@@ -24,15 +24,15 @@ int main(int argc, char *argv[])
QApplication::setStyle(QStyleFactory::create("Fusion"));
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication qApplication (argc, argv);
qApplication.setApplicationName ("Noggit");
qApplication.setOrganizationName ("Noggit");
QApplication q_application (argc, argv);
q_application.setApplicationName ("Noggit");
q_application.setOrganizationName ("Noggit");
auto noggit = Noggit::Application::NoggitApplication::instance();
noggit->initalize(argc, argv);
auto projectSelectionPage = std::make_unique<Noggit::Ui::Windows::NoggitProjectSelectionWindow>(noggit);
projectSelectionPage->show();
auto project_selection = new Noggit::Ui::Windows::NoggitProjectSelectionWindow(noggit);
project_selection->show();
return qApplication.exec();
return q_application.exec();
}

32
src/noggit/project/ApplicationProject.h
View File

@@ -176,35 +176,35 @@ namespace Noggit::Project
}
std::shared_ptr<NoggitProject> loadProject(std::filesystem::path const& projectPath)
std::shared_ptr<NoggitProject> loadProject(std::filesystem::path const& project_path)
{
auto projectReader = ApplicationProjectReader();
auto project = projectReader.readProject(projectPath);
auto project_reader = ApplicationProjectReader();
auto project = project_reader.readProject(project_path);
assert (project.has_value());
assert(project.has_value());
std::string dbdFileDirectory = _configuration->ApplicationDatabaseDefinitionsPath;
std::string dbd_file_directory = _configuration->ApplicationDatabaseDefinitionsPath;
auto clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
auto clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
auto clientArchiveLocale = BlizzardArchive::Locale::AUTO;
auto client_build = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
auto client_archive_version = BlizzardArchive::ClientVersion::WOTLK;
auto client_archive_locale = BlizzardArchive::Locale::AUTO;
if (project->projectVersion == ProjectVersion::SL)
{
clientArchiveVersion = BlizzardArchive::ClientVersion::SL;
clientBuild = BlizzardDatabaseLib::Structures::Build("9.1.0.39584");
clientArchiveLocale = BlizzardArchive::Locale::enUS;
client_archive_version = BlizzardArchive::ClientVersion::SL;
client_build = BlizzardDatabaseLib::Structures::Build("9.1.0.39584");
client_archive_locale = BlizzardArchive::Locale::enUS;
}
if (project->projectVersion == ProjectVersion::WOTLK)
{
clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
clientArchiveLocale = BlizzardArchive::Locale::AUTO;
client_archive_version = BlizzardArchive::ClientVersion::WOTLK;
client_build = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
client_archive_locale = BlizzardArchive::Locale::AUTO;
}
project->ClientDatabase = std::make_shared<BlizzardDatabaseLib::BlizzardDatabase>(dbdFileDirectory, clientBuild);
project->ClientDatabase = std::make_shared<BlizzardDatabaseLib::BlizzardDatabase>(dbd_file_directory, client_build);
project->ClientData = std::make_shared<BlizzardArchive::ClientData>(
project->ClientPath, clientArchiveVersion, clientArchiveLocale, projectPath.generic_string());
project->ClientPath, client_archive_version, client_archive_locale, project_path.generic_string());
return std::make_shared<NoggitProject>(project.value());

4
src/noggit/ui/TexturingGUI.cpp
View File

@@ -98,8 +98,8 @@ namespace Noggit
{
for ( auto const& entry_abs : std::filesystem::recursive_directory_iterator (prefix))
{
auto entry ( BlizzardArchive::ClientData::normalizeFilenameInternal
(entry_abs.path().string().substr (prefix_size))
auto entry ( BlizzardArchive::ClientData::normalizeFilenameInternal(
entry_abs.path().string().substr(prefix_size))
);
if ( entry.find ("tileset") != std::string::npos