|
|
|
@ -11,6 +11,7 @@
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
|
|
|
|
#include <apps/launcher/utils/cellnameloader.hpp>
|
|
|
|
|
|
|
|
|
|
#include <components/files/configurationmanager.hpp>
|
|
|
|
|
|
|
|
|
|
#include <components/contentselector/model/esmfile.hpp>
|
|
|
|
@ -22,6 +23,7 @@
|
|
|
|
|
#include <components/settings/settings.hpp>
|
|
|
|
|
#include <components/bsa/compressedbsafile.hpp>
|
|
|
|
|
#include <components/navmeshtool/protocol.hpp>
|
|
|
|
|
#include <components/debug/debuglog.hpp>
|
|
|
|
|
#include <components/vfs/bsaarchive.hpp>
|
|
|
|
|
|
|
|
|
|
#include "utils/textinputdialog.hpp"
|
|
|
|
@ -787,6 +789,7 @@ void Launcher::DataFilesPage::startNavMeshTool()
|
|
|
|
|
ui.navMeshLogPlainTextEdit->clear();
|
|
|
|
|
ui.navMeshProgressBar->setValue(0);
|
|
|
|
|
ui.navMeshProgressBar->setMaximum(1);
|
|
|
|
|
ui.navMeshProgressBar->resetFormat();
|
|
|
|
|
|
|
|
|
|
mNavMeshToolProgress = NavMeshToolProgress {};
|
|
|
|
|
|
|
|
|
@ -813,6 +816,8 @@ void Launcher::DataFilesPage::readNavMeshToolStderr()
|
|
|
|
|
|
|
|
|
|
void Launcher::DataFilesPage::updateNavMeshProgress(int minDataSize)
|
|
|
|
|
{
|
|
|
|
|
if (!mNavMeshToolProgress.mEnabled)
|
|
|
|
|
return;
|
|
|
|
|
QProcess& process = *mNavMeshToolInvoker->getProcess();
|
|
|
|
|
mNavMeshToolProgress.mMessagesData.append(process.readAllStandardError());
|
|
|
|
|
if (mNavMeshToolProgress.mMessagesData.size() < minDataSize)
|
|
|
|
@ -826,14 +831,23 @@ void Launcher::DataFilesPage::updateNavMeshProgress(int minDataSize)
|
|
|
|
|
ui.navMeshProgressBar->maximum(),
|
|
|
|
|
ui.navMeshProgressBar->value(),
|
|
|
|
|
};
|
|
|
|
|
while (true)
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
NavMeshTool::Message message;
|
|
|
|
|
const std::byte* const nextPosition = NavMeshTool::deserialize(position, end, message);
|
|
|
|
|
if (nextPosition == position)
|
|
|
|
|
break;
|
|
|
|
|
position = nextPosition;
|
|
|
|
|
handle = std::visit(handle, NavMeshTool::decode(message));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
catch (const std::exception& e)
|
|
|
|
|
{
|
|
|
|
|
NavMeshTool::Message message;
|
|
|
|
|
const std::byte* const nextPosition = NavMeshTool::deserialize(position, end, message);
|
|
|
|
|
if (nextPosition == position)
|
|
|
|
|
break;
|
|
|
|
|
position = nextPosition;
|
|
|
|
|
handle = std::visit(handle, NavMeshTool::decode(message));
|
|
|
|
|
Log(Debug::Error) << "Failed to deserialize navmeshtool message: " << e.what();
|
|
|
|
|
mNavMeshToolProgress.mEnabled = false;
|
|
|
|
|
ui.navMeshProgressBar->setFormat("Failed to update progress: " + QString(e.what()));
|
|
|
|
|
}
|
|
|
|
|
if (position != begin)
|
|
|
|
|
mNavMeshToolProgress.mMessagesData = mNavMeshToolProgress.mMessagesData.mid(position - begin);
|
|
|
|
@ -861,7 +875,10 @@ void Launcher::DataFilesPage::navMeshToolFinished(int exitCode, QProcess::ExitSt
|
|
|
|
|
updateNavMeshProgress(0);
|
|
|
|
|
ui.navMeshLogPlainTextEdit->appendPlainText(QString::fromUtf8(mNavMeshToolInvoker->getProcess()->readAllStandardOutput()));
|
|
|
|
|
if (exitCode == 0 && exitStatus == QProcess::ExitStatus::NormalExit)
|
|
|
|
|
{
|
|
|
|
|
ui.navMeshProgressBar->setValue(ui.navMeshProgressBar->maximum());
|
|
|
|
|
ui.navMeshProgressBar->resetFormat();
|
|
|
|
|
}
|
|
|
|
|
ui.cancelNavMeshButton->setEnabled(false);
|
|
|
|
|
ui.navMeshProgressBar->setEnabled(false);
|
|
|
|
|
}
|
|
|
|
|