Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VOXELFORMAT: fixed invalid base path handling for vxr files

master
Martin Gerhardy 2021-12-27 10:37:34 +01:00
parent 284b88cdc1
commit 4c701fc59c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/voxelformat/VXRFormat.cpp
View File

@ -98,6 +98,7 @@ bool VXRFormat::importChildOld(const core::String &filename, io::SeekableReadStr
wrapBool(stream.readString(sizeof(id), id, true))
}
// TODO: vxm loading is missing here!
uint32_t dummy;
wrap(stream.readUInt32(dummy))
char buf[1024];
@ -276,16 +277,16 @@ bool VXRFormat::loadGroups(const core::String &filename, io::SeekableReadStream&
for (int32_t i = 0; i < modelCount; ++i) {
char id[1024];
wrapBool(stream.readString(sizeof(id), id, true))
char filename[1024];
wrapBool(stream.readString(sizeof(filename), filename, true))
if (filename[0] != '\0') {
core::String modelPath = filename;
char vxmFilename[1024];
wrapBool(stream.readString(sizeof(vxmFilename), vxmFilename, true))
if (vxmFilename[0] != '\0') {
core::String modelPath = core::string::extractPath(filename);
if (!modelPath.empty()) {
modelPath.append("/");
}
modelPath.append(filename);
modelPath.append(vxmFilename);
if (!loadChildVXM(modelPath, volumes)) {
Log::warn("Failed to attach model for %s with filename %s", id, filename);
Log::warn("Failed to attach model for %s with filename %s", id, modelPath.c_str());
}
}
}