immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SUBMIT PR ON MAIN BRANCH] Support new model format in normal model loader.

coolant-mod
immibis 2020-02-01 17:50:48 +01:00
parent cd49e4a702
commit 346c2ee1f3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/graphics/engine/oldmodelmanager.cpp
View File

@ -57,7 +57,18 @@ bool COldModelManager::LoadModel(const std::string& fileName, bool mirrored, int
if (!stream.is_open()) if (!stream.is_open())
throw CModelIOException(std::string("Could not open file '") + fileName + "'"); throw CModelIOException(std::string("Could not open file '") + fileName + "'");
model = ModelInput::Read(stream, ModelFormat::Old); std::string::size_type extension_index = fileName.find_last_of('.');
if (extension_index == std::string::npos)
throw CModelIOException(std::string("Filename '") + fileName + "' has no extension");
std::string extension = fileName.substr(extension_index + 1);
if (extension == "mod")
model = ModelInput::Read(stream, ModelFormat::Old);
else if (extension == "txt")
model = ModelInput::Read(stream, ModelFormat::Text);
else
throw CModelIOException(std::string("Filename '") + fileName + "' has unknown extension");
} }
catch (const CModelIOException& e) catch (const CModelIOException& e)
{ {