flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-29 12:45:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #17 Report errors for unsupported CSL formats

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-10 22:02:24 +01:00
parent 54a590a3c3
commit 3ea0c7f2a5
1 changed files with 25 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -383,122 +383,33 @@ namespace BlackMisc
return line; return line;
} }
bool CAircraftModelLoaderXPlane::parseObjectCommand(const QStringList &tokens, CSLPackage &package, const QString &path, int lineNum) bool CAircraftModelLoaderXPlane::parseObjectCommand(const QStringList &, CSLPackage &package, const QString &path, int lineNum)
{ {
package.planes.push_back(CSLPlane()); package.planes.push_back(CSLPlane());
if (tokens.size() != 2) const auto m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Unsupported legacy CSL format.") << path << lineNum;
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : OBJECT command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m); m_loadingMessages.push_back(m);
return false; return false;
} }
QString relativePath(tokens[1]); bool CAircraftModelLoaderXPlane::parseTextureCommand(const QStringList &, CSLPackage &package, const QString &path, int lineNum)
normalizePath(relativePath);
QString fullPath(relativePath);
if (!doPackageSub(fullPath))
{ {
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : package not found.") << path << lineNum; if (!package.planes.isEmpty() && !package.planes.back().hasErrors)
{
const auto m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Unsupported legacy CSL format.") << path << lineNum;
m_loadingMessages.push_back(m); m_loadingMessages.push_back(m);
}
return false; return false;
} }
// Get obj header bool CAircraftModelLoaderXPlane::parseAircraftCommand(const QStringList &, CSLPackage &package, const QString &path, int lineNum)
QFile objFile(fullPath);
if (!objFile.open(QIODevice::ReadOnly | QIODevice::Text))
{ {
const CStatusMessage m = CStatusMessage(this).error(u"XPlane object '%1' does not exist.") << fullPath; package.planes.push_back(CSLPlane());
const auto m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Unsupported legacy CSL format.") << path << lineNum;
m_loadingMessages.push_back(m); m_loadingMessages.push_back(m);
return false; return false;
} }
QTextStream ts(&objFile);
// First line is about line endings. We don't need it.
readLineFrom(ts);
// Version number.
QString versionLine = readLineFrom(ts);
if (versionLine.isNull()) { return false; }
QString version = splitStringRefs(versionLine, [](QChar c) { return c.isSpace(); }).value(0).toString();
// For version 7, there is another line 'obj'
if (version == "700") { readLineFrom(ts); }
// Texture
QString textureLine = readLineFrom(ts);
if (textureLine.isNull()) { return false; }
QString texture = splitStringRefs(textureLine, [](QChar c) { return c.isSpace(); }).value(0).toString();
objFile.close();
QFileInfo fileInfo(fullPath);
QStringList dirNames;
dirNames.append(relativePath.split('/', Qt::SkipEmptyParts));
// Replace the first one being the package name with the package root dir
QString packageRootDir = package.path.mid(package.path.lastIndexOf('/') + 1);
dirNames.replace(0, packageRootDir);
// Remove the last one being the obj itself
dirNames.removeLast();
package.planes.back().dirNames = dirNames;
package.planes.back().objectName = fileInfo.completeBaseName();
package.planes.back().textureName = texture;
package.planes.back().filePath = fullPath;
package.planes.back().objectVersion = CSLPlane::OBJ7;
return true;
}
bool CAircraftModelLoaderXPlane::parseTextureCommand(const QStringList &tokens, CSLPackage &package, const QString &path, int lineNum)
{
if (tokens.size() != 2)
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : TEXTURE command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m);
return false;
}
// Load regular texture
QString relativeTexPath = tokens[1];
normalizePath(relativeTexPath);
QString absoluteTexPath(relativeTexPath);
if (!doPackageSub(absoluteTexPath))
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : package not found.") << path << lineNum;
m_loadingMessages.push_back(m);
return false;
}
QFileInfo fileInfo(absoluteTexPath);
if (!fileInfo.exists())
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Texture '%3' does not exist.") << path << lineNum << absoluteTexPath;
m_loadingMessages.push_back(m);
return false;
}
package.planes.back().textureName = fileInfo.completeBaseName();
return true;
}
bool CAircraftModelLoaderXPlane::parseAircraftCommand(const QStringList &tokens, CSLPackage &package, const QString &path, int lineNum)
{
Q_UNUSED(package)
// AIRCAFT <min> <max> <path>
if (tokens.size() != 4)
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : AIRCRAFT command requires 3 arguments.") << path << lineNum;
m_loadingMessages.push_back(m);
return false;
}
// Flyable aircrafts are parsed by a different method. We don't know any aircraft files in CSL packages.
// If there is one, implement this method here.
CLogMessage(this).warning(u"Not implemented yet.");
return true;
}
bool CAircraftModelLoaderXPlane::parseObj8AircraftCommand(const QStringList &tokens, CSLPackage &package, const QString &path, int lineNum) bool CAircraftModelLoaderXPlane::parseObj8AircraftCommand(const QStringList &tokens, CSLPackage &package, const QString &path, int lineNum)
{ {
@@ -522,11 +433,19 @@ namespace BlackMisc
bool CAircraftModelLoaderXPlane::parseObj8Command(const QStringList &tokens, CSLPackage &package, const QString &path, int lineNum) bool CAircraftModelLoaderXPlane::parseObj8Command(const QStringList &tokens, CSLPackage &package, const QString &path, int lineNum)
{ {
// OBJ8 <group> <animate YES|NO> <filename> {<texture filename> {<lit texture filename>}} // OBJ8 <group> <animate YES|NO> <filename>
if (tokens.size() < 4 || tokens.size() > 6) if (tokens.size() != 4)
{ {
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : OBJ8 command takes 3-5 arguments.") << path << lineNum; if (tokens.size() == 5 || tokens.size() == 6)
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Unsupported IVAO CSL format - consider using CSL2XSB.") << path << lineNum;
m_loadingMessages.push_back(m); m_loadingMessages.push_back(m);
}
else
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : OBJ8 command takes 3 arguments.") << path << lineNum;
m_loadingMessages.push_back(m);
}
return false; return false;
} }
@@ -552,33 +471,6 @@ namespace BlackMisc
package.planes.back().dirNames = dirNames; package.planes.back().dirNames = dirNames;
package.planes.back().filePath = fullPath; package.planes.back().filePath = fullPath;
if (tokens.size() >= 5)
{
// Load regular texture
// Replace package root dir again back to package name
dirNames.replace(0, package.name);
QString relativeTexPath = dirNames.join('/') + '/' + tokens[4];
normalizePath(relativeTexPath);
QString absoluteTexPath(relativeTexPath);
if (!doPackageSub(absoluteTexPath))
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : package not found.") << path << lineNum;
m_loadingMessages.push_back(m);
return false;
}
QFileInfo texFileInfo(absoluteTexPath);
if (!texFileInfo.exists())
{
const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Texture '%3' does not exist.") << path << lineNum << absoluteTexPath;
m_loadingMessages.push_back(m);
return false;
}
package.planes.back().textureName = texFileInfo.completeBaseName();
}
return true; return true;
} }