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

VOXELFORMAT: apply index offset 

this is always zero in current cases
master
Martin Gerhardy 2022-04-23 21:51:59 +02:00
parent 37684a3eae
commit c4044fbff2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/voxelformat/GLTFFormat.cpp
View File

@ -411,9 +411,9 @@ const tinygltf::Accessor *GLTFFormat::getGltfAccessor(const tinygltf::Model &mod
namespace gltf_priv {
template<typename T>
void copyGltfIndices(const uint8_t *data, size_t count, size_t stride, core::DynamicArray<uint32_t> &indices) {
void copyGltfIndices(const uint8_t *data, size_t count, size_t stride, core::DynamicArray<uint32_t> &indices, uint32_t offset) {
for (size_t i = 0; i < count; i++) {
indices.push_back(*(const T*)data);
indices.push_back((uint32_t)(*(const T*)data) + offset);
data += stride;
}
}
@ -466,24 +466,26 @@ bool GLTFFormat::loadGltfIndices(const tinygltf::Model &model, const tinygltf::P
const size_t offset = accessor->byteOffset + bufferView.byteOffset;
const uint8_t *indexBuf = buffer.data.data() + offset;
const size_t applyOffset = indices.size();
switch (accessor->componentType) {
case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
gltf_priv::copyGltfIndices<uint8_t>(indexBuf, accessor->count, stride, indices);
gltf_priv::copyGltfIndices<uint8_t>(indexBuf, accessor->count, stride, indices, applyOffset);
break;
case TINYGLTF_COMPONENT_TYPE_BYTE:
gltf_priv::copyGltfIndices<int8_t>(indexBuf, accessor->count, stride, indices);
gltf_priv::copyGltfIndices<int8_t>(indexBuf, accessor->count, stride, indices, applyOffset);
break;
case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
gltf_priv::copyGltfIndices<uint16_t>(indexBuf, accessor->count, stride, indices);
gltf_priv::copyGltfIndices<uint16_t>(indexBuf, accessor->count, stride, indices, applyOffset);
break;
case TINYGLTF_COMPONENT_TYPE_SHORT:
gltf_priv::copyGltfIndices<int16_t>(indexBuf, accessor->count, stride, indices);
gltf_priv::copyGltfIndices<int16_t>(indexBuf, accessor->count, stride, indices, applyOffset);
break;
case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
gltf_priv::copyGltfIndices<uint32_t>(indexBuf, accessor->count, stride, indices);
gltf_priv::copyGltfIndices<uint32_t>(indexBuf, accessor->count, stride, indices, applyOffset);
break;
case TINYGLTF_COMPONENT_TYPE_INT:
gltf_priv::copyGltfIndices<int32_t>(indexBuf, accessor->count, stride, indices);
gltf_priv::copyGltfIndices<int32_t>(indexBuf, accessor->count, stride, indices, applyOffset);
break;
default:
Log::error("Unknown component type for indices: %i", accessor->componentType);