Skip to content

Don't write buffers section if buffer is empty #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danwillm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't write buffers section if buffer is empty #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07c6e6a
Don't write empty buffers
danwillm Jul 1, 2024
09f6869
use empty instead of size
danwillm Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/gltf/GltfModel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,14 @@ class GltfModel {
if (!holder.ptrs.empty()) {
std::vector<json> bits;
for (const auto& ptr : holder.ptrs) {
bits.push_back(ptr->serialize());
json bit = ptr->serialize();
if (!bit.empty()) {
bits.push_back(ptr->serialize());
}
}
if (!bits.empty()) {
glTFJson[key] = bits;
}
glTFJson[key] = bits;
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/gltf/properties/BufferData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ BufferData::BufferData(
: Holdable(), isGlb(false), uri(isEmbedded ? "" : std::move(uri)), binData(binData) {}

json BufferData::serialize() const {
if (binData->empty()) {
return json{};
}

json result{{"byteLength", binData->size()}};
if (!isGlb) {
if (!uri.empty()) {
Expand Down