GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-14 05:15:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updates to draco decoding:

Browse Source 
- When injecting draco decoded meshes into accessor data, update count to match the optimized and decoded draco mesh
 - accessor.componentType is now used for extraction of decoded draco meshes.

Fixes #135
This commit is contained in:
Alexander Wood 2019-01-26 08:58:45 -05:00
parent b926195ef8
commit 0d77a291f7
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tiny_gltf.h
View File

@ -1200,7 +1200,8 @@ bool BufferView::operator==(const BufferView &other) const {
return this->buffer == other.buffer && this->byteLength == other.byteLength && return this->buffer == other.buffer && this->byteLength == other.byteLength &&
this->byteOffset == other.byteOffset && this->byteOffset == other.byteOffset &&
this->byteStride == other.byteStride && this->name == other.name && this->byteStride == other.byteStride && this->name == other.name &&
this->target == other.target && this->extras == other.extras; this->target == other.target && this->extras == other.extras &&
this->dracoDecoded == other.dracoDecoded;
} }
bool Camera::operator==(const Camera &other) const { bool Camera::operator==(const Camera &other) const {
return this->name == other.name && this->extensions == other.extensions && return this->name == other.name && this->extensions == other.extensions &&
@ -2865,40 +2866,33 @@ static bool GetAttributeForAllPoints(draco::Mesh* mesh, const draco::PointAttrib
return true; return true;
} }
static bool GetAttributeForAllPoints(draco::Mesh* mesh, const draco::PointAttribute* pAttribute, std::vector<uint8_t>& outBuffer) static bool GetAttributeForAllPoints(uint32_t componentType, draco::Mesh* mesh, const draco::PointAttribute* pAttribute, std::vector<uint8_t>& outBuffer)
{ {
bool decodeResult = false; bool decodeResult = false;
switch (pAttribute->data_type()) switch (componentType)
{ {
case draco::DT_BOOL: case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
case draco::DT_UINT8:
decodeResult = GetAttributeForAllPoints<uint8_t>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<uint8_t>(mesh, pAttribute, outBuffer);
break; break;
case draco::DT_INT8: case TINYGLTF_COMPONENT_TYPE_BYTE:
decodeResult = GetAttributeForAllPoints<int8_t>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<int8_t>(mesh, pAttribute, outBuffer);
break; break;
case draco::DT_UINT16: case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
decodeResult = GetAttributeForAllPoints<uint16_t>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<uint16_t>(mesh, pAttribute, outBuffer);
break; break;
case draco::DT_INT16: case TINYGLTF_COMPONENT_TYPE_SHORT:
decodeResult = GetAttributeForAllPoints<int16_t>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<int16_t>(mesh, pAttribute, outBuffer);
break; break;
case draco::DT_INT32: case TINYGLTF_COMPONENT_TYPE_INT:
decodeResult = GetAttributeForAllPoints<int32_t>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<int32_t>(mesh, pAttribute, outBuffer);
break; break;
case draco::DT_INT64: case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
decodeResult = GetAttributeForAllPoints<int64_t>(mesh, pAttribute, outBuffer);
break;
case draco::DT_UINT32:
decodeResult = GetAttributeForAllPoints<uint32_t>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<uint32_t>(mesh, pAttribute, outBuffer);
break; break;
case draco::DT_UINT64: case TINYGLTF_COMPONENT_TYPE_FLOAT:
decodeResult = GetAttributeForAllPoints<uint64_t>(mesh, pAttribute, outBuffer);
break;
case draco::DT_FLOAT32:
decodeResult = GetAttributeForAllPoints<float>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<float>(mesh, pAttribute, outBuffer);
break; break;
case draco::DT_FLOAT64: case TINYGLTF_COMPONENT_TYPE_DOUBLE:
decodeResult = GetAttributeForAllPoints<double>(mesh, pAttribute, outBuffer); decodeResult = GetAttributeForAllPoints<double>(mesh, pAttribute, outBuffer);
break; break;
default: default:
@ -2960,23 +2954,28 @@ static bool ParseDracoExtension(Primitive *primitive, Model *model, std::string
model->bufferViews.emplace_back(std::move(decodedIndexBufferView)); model->bufferViews.emplace_back(std::move(decodedIndexBufferView));
model->accessors[primitive->indices].bufferView = int(model->bufferViews.size() - 1); model->accessors[primitive->indices].bufferView = int(model->bufferViews.size() - 1);
model->accessors[primitive->indices].count = int(mesh->num_faces() * 3);
} }
for (const auto& attribute : attributesObject) for (const auto& attribute : attributesObject)
{ {
if (!attribute.second.IsInt()) if (!attribute.second.IsInt())
return false; return false;
auto primitiveAttribute = primitive->attributes.find(attribute.first);
if (primitiveAttribute == primitive->attributes.end())
return false;
int dracoAttributeIndex = attribute.second.Get<int>(); int dracoAttributeIndex = attribute.second.Get<int>();
const auto pAttribute = mesh->GetAttributeByUniqueId(dracoAttributeIndex); const auto pAttribute = mesh->GetAttributeByUniqueId(dracoAttributeIndex);
const auto pBuffer = pAttribute->buffer(); const auto pBuffer = pAttribute->buffer();
const auto componentType = model->accessors[primitiveAttribute->second].componentType;
// Create a new buffer for this decoded buffer // Create a new buffer for this decoded buffer
Buffer decodedBuffer; Buffer decodedBuffer;
size_t bufferSize = mesh->num_points() * pAttribute->num_components() * draco::DataTypeLength(pAttribute->data_type()); size_t bufferSize = mesh->num_points() * pAttribute->num_components() * GetComponentSizeInBytes(componentType);
decodedBuffer.data.resize(bufferSize); decodedBuffer.data.resize(bufferSize);
if (!GetAttributeForAllPoints(mesh.get(), pAttribute, decodedBuffer.data)) if (!GetAttributeForAllPoints(componentType, mesh.get(), pAttribute, decodedBuffer.data))
return false; return false;
model->buffers.emplace_back(std::move(decodedBuffer)); model->buffers.emplace_back(std::move(decodedBuffer));
@ -2989,11 +2988,8 @@ static bool ParseDracoExtension(Primitive *primitive, Model *model, std::string
decodedBufferView.target = primitive->indices >= 0 ? TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER : TINYGLTF_TARGET_ARRAY_BUFFER; decodedBufferView.target = primitive->indices >= 0 ? TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER : TINYGLTF_TARGET_ARRAY_BUFFER;
model->bufferViews.emplace_back(std::move(decodedBufferView)); model->bufferViews.emplace_back(std::move(decodedBufferView));
auto primitiveAttribute = primitive->attributes.find(attribute.first); model->accessors[primitiveAttribute->second].bufferView = int(model->bufferViews.size() - 1);
if (primitiveAttribute != primitive->attributes.end()) model->accessors[primitiveAttribute->second].count = int(mesh->num_points());
{
model->accessors[primitiveAttribute->second].bufferView = int(model->bufferViews.size() - 1);
}
} }
return true; return true;
@ -4827,14 +4823,14 @@ static void WriteBinaryGltfFile(const std::string &output,
const int padding_size = content.size() % 4; const int padding_size = content.size() % 4;
// 12 bytes for header, JSON content length, 8 bytes for JSON chunk info, padding // 12 bytes for header, JSON content length, 8 bytes for JSON chunk info, padding
const int length = 12 + 8 + content.size() + padding_size; const int length = 12 + 8 + int(content.size()) + padding_size;
gltfFile.write(header.c_str(), header.size()); gltfFile.write(header.c_str(), header.size());
gltfFile.write(reinterpret_cast<const char *>(&version), sizeof(version)); gltfFile.write(reinterpret_cast<const char *>(&version), sizeof(version));
gltfFile.write(reinterpret_cast<const char *>(&length), sizeof(length)); gltfFile.write(reinterpret_cast<const char *>(&length), sizeof(length));
// JSON chunk info, then JSON data // JSON chunk info, then JSON data
const int model_length = content.size() + padding_size; const int model_length = int(content.size()) + padding_size;
const int model_format = 0x4E4F534A; const int model_format = 0x4E4F534A;
gltfFile.write(reinterpret_cast<const char *>(&model_length), sizeof(model_length)); gltfFile.write(reinterpret_cast<const char *>(&model_length), sizeof(model_length));
gltfFile.write(reinterpret_cast<const char *>(&model_format), sizeof(model_format)); gltfFile.write(reinterpret_cast<const char *>(&model_format), sizeof(model_format));