18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-20 01:04:59 +01:00

Merge branch 'master' into feat/renderers-cleanup

This commit is contained in:
2026-11-16 21:44:48 +01:00
264 changed files with 41203 additions and 10041 deletions

View File

@@ -1860,26 +1860,29 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic)
m_filename = name;
asBinary = name + ".e3d";
// the files as they're named on the disk, the name given is in lowercase
auto const textfile{FileCased(name + ".t3d")};
auto const binaryfile{FileCased(asBinary)};
// Hirek: Jesli mamy ustawione priorityLoadText3D na yes to wpierw ladujemy t3d
if (Global.priorityLoadText3D && FileExists(name + ".t3d"))
if (Global.priorityLoadText3D && (false == textfile.empty()))
{
WriteLog("Forced loading text model \"" + name + ".t3d\"");
LoadFromTextFile(name + ".t3d", dynamic);
WriteLog("Forced loading text model \"" + textfile + "\"");
LoadFromTextFile(textfile, dynamic);
if (!dynamic)
Init();
assign_lod_ranges(Root, name);
}
else if (FileExists(asBinary))
else if (false == binaryfile.empty())
{
LoadFromBinFile(asBinary, dynamic);
LoadFromBinFile(binaryfile, dynamic);
asBinary = "";
Init();
assign_lod_ranges(Root, name);
}
else if (FileExists(name + ".t3d"))
else if (false == textfile.empty())
{
LoadFromTextFile(name + ".t3d", dynamic);
LoadFromTextFile(textfile, dynamic);
if (!dynamic)
Init();
assign_lod_ranges(Root, name);