mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Create separate groups for each data dir / BSA file.

Browse Source
This commit is contained in:
scrawl 2013-04-03 12:28:57 +02:00
parent aac2ba1d5f
commit f0d49fdbd0
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/openmw/engine.cpp
View File

@ -154,26 +154,36 @@ OMW::Engine::~Engine()
void OMW::Engine::loadBSA() void OMW::Engine::loadBSA()
{ {
// We use separate resource groups to handle location priority.
const Files::PathContainer& dataDirs = mFileCollections.getPaths(); const Files::PathContainer& dataDirs = mFileCollections.getPaths();
std::string dataDirectory;
int i=0;
for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter) for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
{ {
dataDirectory = iter->string(); // Last data dir has the highest priority
std::string groupName = "Data" + Ogre::StringConverter::toString(dataDirs.size()-i);
Ogre::ResourceGroupManager::getSingleton ().createResourceGroup (groupName);
std::string dataDirectory = iter->string();
std::cout << "Data dir " << dataDirectory << std::endl; std::cout << "Data dir " << dataDirectory << std::endl;
Bsa::addDir(dataDirectory, mFSStrict); Bsa::addDir(dataDirectory, mFSStrict, groupName);
++i;
} }
// BSA resources are put into a separate group. We want loose files to have priority over BSA resources, and this seems i=0;
// to be the only way to get Ogre to do just that.
Ogre::ResourceGroupManager::getSingleton ().createResourceGroup ("GroupBSA");
for (std::vector<std::string>::const_iterator archive = mArchives.begin(); archive != mArchives.end(); ++archive) for (std::vector<std::string>::const_iterator archive = mArchives.begin(); archive != mArchives.end(); ++archive)
{ {
if (mFileCollections.doesExist(*archive)) if (mFileCollections.doesExist(*archive))
{ {
// Last BSA has the highest priority
std::string groupName = "DataBSA" + Ogre::StringConverter::toString(dataDirs.size()-i);
Ogre::ResourceGroupManager::getSingleton ().createResourceGroup (groupName);
const std::string archivePath = mFileCollections.getPath(*archive).string(); const std::string archivePath = mFileCollections.getPath(*archive).string();
std::cout << "Adding BSA archive " << archivePath << std::endl; std::cout << "Adding BSA archive " << archivePath << std::endl;
Bsa::addBSA(archivePath, "GroupBSA"); Bsa::addBSA(archivePath, groupName);
++i;
} }
else else
{ {