From 2f14b265a8d289a4252b9513cf503ef96881433c Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 4 Feb 2014 20:24:08 -0800 Subject: [PATCH] make sure SVO files with version details are supported --- interface/src/renderer/FBXReader.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/interface/src/renderer/FBXReader.cpp b/interface/src/renderer/FBXReader.cpp index e2c3bfafdd..5a27b51b70 100644 --- a/interface/src/renderer/FBXReader.cpp +++ b/interface/src/renderer/FBXReader.cpp @@ -1632,7 +1632,18 @@ FBXGeometry readSVO(const QByteArray& model) { VoxelTree tree; ReadBitstreamToTreeParams args(WANT_COLOR, NO_EXISTS_BITS); - tree.readBitstreamToTree((unsigned char*)model.data(), model.size(), args); + + unsigned char* dataAt = (unsigned char*)model.data(); + size_t dataSize = model.size(); + + if (tree.getWantSVOfileVersions()) { + // skip the type/version + dataAt += sizeof(PacketType); + dataSize -= sizeof(PacketType); + dataAt += sizeof(PacketVersion); + dataSize -= sizeof(PacketVersion); + } + tree.readBitstreamToTree(dataAt, dataSize, args); tree.recurseTreeWithOperation(addMeshVoxelsOperation, &mesh); geometry.meshes.append(mesh);