Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-18 16:32:32 +02:00
Code Issues Projects Releases Activity

Load and associate MODELFILE entries

Browse Source
This commit is contained in:
Daniel Evans 2016-09-11 14:46:23 +01:00
parent 996a82c4bf
commit 6888fa3558
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rwengine/src/engine/GameData.cpp
View File

@ -99,6 +99,9 @@ void GameData::loadLevelFile(const std::string& path) {
std::transform(name.begin(), name.end(), name.begin(),
::tolower);
loadTXD(name);
} else if (cmd == "MODELFILE") {
auto path = line.substr(space + 1);
loadModelFile(path);
}
}
}
@ -333,6 +336,42 @@ void GameData::loadDFF(const std::string& name, bool async) {
}
}
void GameData::loadModelFile(const std::string& name) {
LoaderDFF l;
auto file = index.openFilePath(name);
if (!file) {
logger->log("Data", Logger::Error, "Failed to load model file " + name);
return;
}
auto m = l.loadFromMemory(file);
if (!m) {
logger->log("Data", Logger::Error, "Error loading model file " + name);
return;
}
// Associate the frames with models.
for (auto& frame : m->frames) {
/// @todo this is useful elsewhere, please move elsewhere
std::string name = frame->getName();
auto lodpos = name.rfind("_l");
int lod = 0;
if (lodpos != std::string::npos) {
lod = std::atoi(name.substr(lodpos + 1).c_str());
name = name.substr(0, lodpos);
}
for (auto& model : modelinfo) {
auto info = model.second.get();
if (info->type() != ModelDataType::SimpleInfo) {
continue;
}
if (boost::iequals(info->name, name)) {
auto simple = static_cast<SimpleModelInfo*>(info);
simple->setAtomic(m, lod, frame);
}
}
}
}
void GameData::loadIFP(const std::string& name) {
auto f = index.openFile(name);

5
rwengine/src/engine/GameData.hpp
View File

@ -123,6 +123,11 @@ public:
*/
void loadDFF(const std::string& name, bool async = false);
/**
* Loads a DFF and associates its atomics with models.
*/
void loadModelFile(const std::string& name);
/**
* Loads an IFP file containing animations
*/

10
tests/test_data.cpp
View File

@ -83,6 +83,16 @@ BOOST_AUTO_TEST_CASE(test_handling_data_loader) {
BOOST_CHECK_EQUAL(handling.driveType, VehicleHandlingInfo::All);
BOOST_CHECK_EQUAL(handling.engineType, VehicleHandlingInfo::Petrol);
}
BOOST_AUTO_TEST_CASE(test_model_files_loaded) {
auto& d = Global::get().d;
// The weapon models should be associated by the MODELFILE entries
auto ak47 = d->findModelInfo<SimpleModelInfo>(171);
BOOST_CHECK_EQUAL(ak47->name, "ak47");
BOOST_CHECK_NE(ak47->getAtomic(0), nullptr);
}
#endif
BOOST_AUTO_TEST_SUITE_END()