GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-12 19:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update buffer parsing (2.0)

Browse Source
This commit is contained in:
Aurélien Chatelain 2017-05-30 15:03:48 +00:00
parent 40c4a0a60a
commit 0aab1575d5
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tiny_gltf_loader.h
View File

@ -1558,9 +1558,18 @@ static bool ParseBuffer(Buffer *buffer, std::string *err,
return false;
}
// In glTF 2.0, uri is not mandatory anymore
std::string uri;
ParseStringProperty(&uri, err, o, "uri", false, "Buffer");
// having an empty uri for a non embedded image should not be valid
if(!is_binary && uri.empty())
{
if (err) {
(*err) += "'uri' is missing from non binary glTF file buffer.\n";
}
}
picojson::object::const_iterator type = o.find("type");
if (type != o.end()) {
if (type->second.is<std::string>()) {
@ -1574,15 +1583,14 @@ static bool ParseBuffer(Buffer *buffer, std::string *err,
size_t bytes = static_cast<size_t>(byteLength);
if (is_binary) {
// Still binary glTF accepts external dataURI. First try external resources.
bool loaded = false;
if (IsDataURI(uri)) {
loaded = DecodeDataURI(&buffer->data, uri, bytes, true);
} else {
// Assume external .bin file.
loaded = LoadExternalFile(&buffer->data, err, uri, basedir, bytes, true);
}
if (!loaded) {
if(!uri.empty())
{
// External .bin file.
LoadExternalFile(&buffer->data, err, uri, basedir, bytes, true);
}
else
{
// load data from (embedded) binary data
if ((bin_size == 0) || (bin_data == NULL)) {
@ -1603,18 +1611,10 @@ static bool ParseBuffer(Buffer *buffer, std::string *err,
return false;
}
if (uri.compare("data:,") == 0) {
// @todo { check uri }
buffer->data.resize(static_cast<size_t>(byteLength));
memcpy(&(buffer->data.at(0)), bin_data,
static_cast<size_t>(byteLength));
} else {
if (err) {
(*err) += "Invalid URI for binary data in `Buffer'.\n";
}
return false;
}
// Read buffer data
buffer->data.resize(static_cast<size_t>(byteLength));
memcpy(&(buffer->data.at(0)), bin_data,
static_cast<size_t>(byteLength));
}
} else {
@ -2571,7 +2571,7 @@ bool TinyGLTFLoader::LoadBinaryFromMemory(Model *model, std::string *err,
model_length);
is_binary_ = true;
bin_data_ = bytes + 20 + model_length;
bin_data_ = bytes + 20 + model_length + 8; // 4 bytes (buffer_length) + 4 bytes(buffer_format)
bin_size_ =
length - (20 + model_length); // extract header + JSON scene data.