TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

* BugFix: Corrections to the VFS dumpDirectories function to properly honor the depth parameter.

Browse source
This commit is contained in:
Robert MacGregor 2021-12-19 01:51:19 -05:00
parent 46b8c3d15d
commit b63122ea76
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/core/volume.cpp
View file

@ -608,9 +608,13 @@ bool MountSystem::_dumpDirectories(DirectoryRef directory, Vector<StringTableEnt
if (noBasePath) if (noBasePath)
{ {
Path newDirectoryPath; Path newDirectoryPath;
for (U32 iteration = basePath.getDirectoryCount() + 1; iteration < directoryPath.getDirectoryCount(); ++iteration) for (U32 iteration = basePath.getDirectoryCount(); iteration < directoryPath.getDirectoryCount(); ++iteration)
{ {
newDirectoryPath.appendPath(directoryPath.getDirectory(iteration)); if (iteration > basePath.getDirectoryCount())
{
newDirectoryPath.setPath(newDirectoryPath.getPath() + "/");
}
newDirectoryPath.setPath(newDirectoryPath.getPath() + directoryPath.getDirectory(iteration));
} }
newDirectoryPath.setFileName(directoryPath.getFileName()); newDirectoryPath.setFileName(directoryPath.getFileName());
@ -621,7 +625,9 @@ bool MountSystem::_dumpDirectories(DirectoryRef directory, Vector<StringTableEnt
directories.push_back(StringTable->insert(directoryPathString, true)); directories.push_back(StringTable->insert(directoryPathString, true));
if (currentDepth <= depth) if (currentDepth <= depth)
{ {
DirectoryRef nextDirectory = OpenDirectory(directoryPaths[iteration]); const String subdirectoryPath = directoryPath.getFullPath() + "/";
DirectoryRef nextDirectory = OpenDirectory(subdirectoryPath);
_dumpDirectories(nextDirectory, directories, depth, noBasePath, currentDepth + 1, basePath); _dumpDirectories(nextDirectory, directories, depth, noBasePath, currentDepth + 1, basePath);
} }
} }
@ -637,7 +643,7 @@ bool MountSystem::dumpDirectories(const Path& path, Vector<StringTableEntry>& di
} }
DirectoryRef sourceDirectory = openDirectory(path); DirectoryRef sourceDirectory = openDirectory(path);
return _dumpDirectories(sourceDirectory, directories, depth, noBasePath, 0, path); return _dumpDirectories(sourceDirectory, directories, depth, noBasePath, 1, path);
} }
FileRef MountSystem::createFile(const Path& path) FileRef MountSystem::createFile(const Path& path)