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

Add missing extras and extensions fields

Browse Source 
Handle extras and extensions in nested “sub-objects”:

animation.channel.target.extras
accessor.sparse.extras
accessor.sparse.extensions
accessor.sparse.indices.extras
accessor.sparse.indices.extensions
accessor.sparse.values.extras
accessor.sparse.values.extensions
This commit is contained in:
David Siegel 2023-06-05 23:28:05 +02:00
parent 22cafa1032
commit d852f50d49
1 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tiny_gltf.h
View File

@ -532,11 +532,13 @@ struct AnimationChannel {
// "rotation", "scale", "weights"] // "rotation", "scale", "weights"]
Value extras; Value extras;
ExtensionMap extensions; ExtensionMap extensions;
Value target_extras;
ExtensionMap target_extensions; ExtensionMap target_extensions;
// Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled. // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
std::string extras_json_string; std::string extras_json_string;
std::string extensions_json_string; std::string extensions_json_string;
std::string target_extras_json_string;
std::string target_extensions_json_string; std::string target_extensions_json_string;
AnimationChannel() : sampler(-1), target_node(-1) {} AnimationChannel() : sampler(-1), target_node(-1) {}
@ -856,19 +858,33 @@ struct Accessor {
std::vector<double> std::vector<double>
maxValues; // optional. integer value is promoted to double maxValues; // optional. integer value is promoted to double
struct { struct Sparse {
int count; int count;
bool isSparse; bool isSparse;
struct { struct {
int byteOffset; int byteOffset;
int bufferView; int bufferView;
int componentType; // a TINYGLTF_COMPONENT_TYPE_ value int componentType; // a TINYGLTF_COMPONENT_TYPE_ value
Value extras;
ExtensionMap extensions;
std::string extras_json_string;
std::string extensions_json_string;
} indices; } indices;
struct { struct {
int bufferView; int bufferView;
int byteOffset; int byteOffset;
Value extras;
ExtensionMap extensions;
std::string extras_json_string;
std::string extensions_json_string;
} values; } values;
} sparse; Value extras;
ExtensionMap extensions;
std::string extras_json_string;
std::string extensions_json_string;
};
Sparse sparse;
/// ///
/// Utility function to compute byteStride for a given bufferView object. /// Utility function to compute byteStride for a given bufferView object.
@ -4441,15 +4457,18 @@ static bool ParseBufferView(
return true; return true;
} }
static bool ParseSparseAccessor(Accessor *accessor, std::string *err, static bool ParseSparseAccessor(Accessor::Sparse *sparse, std::string *err,
const detail::json &o) { const detail::json &o,
accessor->sparse.isSparse = true; bool store_original_json_for_extras_and_extensions) {
sparse->isSparse = true;
int count = 0; int count = 0;
if (!ParseIntegerProperty(&count, err, o, "count", true, "SparseAccessor")) { if (!ParseIntegerProperty(&count, err, o, "count", true, "SparseAccessor")) {
return false; return false;
} }
ParseExtrasAndExtensions(sparse, err, o, store_original_json_for_extras_and_extensions);
detail::json_const_iterator indices_iterator; detail::json_const_iterator indices_iterator;
detail::json_const_iterator values_iterator; detail::json_const_iterator values_iterator;
if (!detail::FindMember(o, "indices", indices_iterator)) { if (!detail::FindMember(o, "indices", indices_iterator)) {
@ -4485,14 +4504,18 @@ static bool ParseSparseAccessor(Accessor *accessor, std::string *err,
ParseIntegerProperty(&values_byte_offset, err, values_obj, "byteOffset", ParseIntegerProperty(&values_byte_offset, err, values_obj, "byteOffset",
false); false);
accessor->sparse.count = count; sparse->count = count;
accessor->sparse.indices.bufferView = indices_buffer_view; sparse->indices.bufferView = indices_buffer_view;
accessor->sparse.indices.byteOffset = indices_byte_offset; sparse->indices.byteOffset = indices_byte_offset;
accessor->sparse.indices.componentType = component_type; sparse->indices.componentType = component_type;
accessor->sparse.values.bufferView = values_buffer_view; ParseExtrasAndExtensions(&sparse->indices, err, indices_obj,
accessor->sparse.values.byteOffset = values_byte_offset; store_original_json_for_extras_and_extensions);
sparse->values.bufferView = values_buffer_view;
sparse->values.byteOffset = values_byte_offset;
ParseExtrasAndExtensions(&sparse->values, err, values_obj,
store_original_json_for_extras_and_extensions);
// TODO(agnat): Parse extras and extensions of the sparse object
return true; return true;
} }
@ -4582,7 +4605,8 @@ static bool ParseAccessor(Accessor *accessor, std::string *err, const detail::js
detail::json_const_iterator iterator; detail::json_const_iterator iterator;
if (detail::FindMember(o, "sparse", iterator)) { if (detail::FindMember(o, "sparse", iterator)) {
// here this accessor has a "sparse" subobject // here this accessor has a "sparse" subobject
return ParseSparseAccessor(accessor, err, detail::GetValue(iterator)); return ParseSparseAccessor(&accessor->sparse, err, detail::GetValue(iterator),
store_original_json_for_extras_and_extensions);
} }
return true; return true;
@ -5081,13 +5105,21 @@ static bool ParseAnimationChannel(
return false; return false;
} }
ParseExtensionsProperty(&channel->target_extensions, err, target_object); ParseExtensionsProperty(&channel->target_extensions, err, target_object);
ParseExtrasProperty(&channel->target_extras, target_object);
if (store_original_json_for_extras_and_extensions) { if (store_original_json_for_extras_and_extensions) {
{
detail::json_const_iterator it; detail::json_const_iterator it;
if (detail::FindMember(target_object, "extensions", it)) { if (detail::FindMember(target_object, "extensions", it)) {
channel->target_extensions_json_string = detail::JsonToString(detail::GetValue(it)); channel->target_extensions_json_string = detail::JsonToString(detail::GetValue(it));
} }
} }
// TODO(agnat): Parse target extras {
detail::json_const_iterator it;
if (detail::FindMember(target_object, "extras", it)) {
channel->target_extras_json_string = detail::JsonToString(detail::GetValue(it));
}
}
}
} }
channel->sampler = samplerIndex; channel->sampler = samplerIndex;