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

Merge pull request #211 from Selmar/add_missing_serialization

Browse Source 
small serialization additions
This commit is contained in:
Syoyo Fujita 2019-10-19 15:18:19 +09:00 committed by GitHub
commit 83bb1a48d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tiny_gltf.h
View File

@ -739,7 +739,7 @@ struct PbrMetallicRoughness {
Value extras; Value extras;
ExtensionMap extensions; ExtensionMap extensions;
PbrMetallicRoughness() : metallicFactor(1.0), roughnessFactor(1.0) {} PbrMetallicRoughness() : baseColorFactor(std::vector<double>{ 1.0,1.0,1.0,1.0 }), metallicFactor(1.0), roughnessFactor(1.0) {}
PbrMetallicRoughness(const PbrMetallicRoughness &) = default; PbrMetallicRoughness(const PbrMetallicRoughness &) = default;
PbrMetallicRoughness &operator=(const PbrMetallicRoughness &) = default; PbrMetallicRoughness &operator=(const PbrMetallicRoughness &) = default;
PbrMetallicRoughness(PbrMetallicRoughness &&rhs) noexcept PbrMetallicRoughness(PbrMetallicRoughness &&rhs) noexcept
@ -1903,7 +1903,8 @@ bool Material::operator==(const Material &other) const {
} }
bool Mesh::operator==(const Mesh &other) const { bool Mesh::operator==(const Mesh &other) const {
return this->extensions == other.extensions && this->extras == other.extras && return this->extensions == other.extensions && this->extras == other.extras &&
this->name == other.name && this->primitives == other.primitives; this->name == other.name && Equals(this->weights, other.weights) &&
this->primitives == other.primitives;
} }
bool Model::operator==(const Model &other) const { bool Model::operator==(const Model &other) const {
return this->accessors == other.accessors && return this->accessors == other.accessors &&
@ -4411,11 +4412,8 @@ static bool ParsePbrMetallicRoughness(PbrMetallicRoughness *pbr,
} }
return false; return false;
} }
} else { pbr->baseColorFactor = baseColorFactor;
// fill with default values
baseColorFactor = {1.0, 1.0, 1.0, 1.0};
} }
pbr->baseColorFactor = baseColorFactor;
{ {
json_const_iterator it; json_const_iterator it;
@ -5958,11 +5956,11 @@ static void SerializeParameterMap(ParameterMap &param, json &o) {
} }
#endif #endif
static void SerializeExtensionMap(ExtensionMap &extensions, json &o) { static void SerializeExtensionMap(const ExtensionMap &extensions, json &o) {
if (!extensions.size()) return; if (!extensions.size()) return;
json extMap; json extMap;
for (ExtensionMap::iterator extIt = extensions.begin(); for (ExtensionMap::const_iterator extIt = extensions.begin();
extIt != extensions.end(); ++extIt) { extIt != extensions.end(); ++extIt) {
// Allow an empty object for extension(#97) // Allow an empty object for extension(#97)
json ret; json ret;
@ -6388,6 +6386,8 @@ static void SerializeGltfMesh(Mesh &mesh, json &o) {
JsonAddMember(primitive, "targets", std::move(targets)); JsonAddMember(primitive, "targets", std::move(targets));
} }
SerializeExtensionMap(gltfPrimitive.extensions, o);
if (gltfPrimitive.extras.Type() != NULL_TYPE) { if (gltfPrimitive.extras.Type() != NULL_TYPE) {
SerializeValue("extras", gltfPrimitive.extras, primitive); SerializeValue("extras", gltfPrimitive.extras, primitive);
} }
@ -6405,6 +6405,7 @@ static void SerializeGltfMesh(Mesh &mesh, json &o) {
SerializeStringProperty("name", mesh.name, o); SerializeStringProperty("name", mesh.name, o);
} }
SerializeExtensionMap(mesh.extensions, o);
if (mesh.extras.Type() != NULL_TYPE) { if (mesh.extras.Type() != NULL_TYPE) {
SerializeValue("extras", mesh.extras, o); SerializeValue("extras", mesh.extras, o);
} }
@ -6414,6 +6415,9 @@ static void SerializeSpotLight(SpotLight &spot, json &o) {
SerializeNumberProperty("innerConeAngle", spot.innerConeAngle, o); SerializeNumberProperty("innerConeAngle", spot.innerConeAngle, o);
SerializeNumberProperty("outerConeAngle", spot.outerConeAngle, o); SerializeNumberProperty("outerConeAngle", spot.outerConeAngle, o);
SerializeExtensionMap(spot.extensions, o); SerializeExtensionMap(spot.extensions, o);
if (spot.extras.Type() != NULL_TYPE) {
SerializeValue("extras", spot.extras, o);
}
} }
static void SerializeGltfLight(Light &light, json &o) { static void SerializeGltfLight(Light &light, json &o) {
@ -6427,6 +6431,10 @@ static void SerializeGltfLight(Light &light, json &o) {
SerializeSpotLight(light.spot, spot); SerializeSpotLight(light.spot, spot);
JsonAddMember(o, "spot", std::move(spot)); JsonAddMember(o, "spot", std::move(spot));
} }
SerializeExtensionMap(light.extensions, o);
if (light.extras.Type() != NULL_TYPE) {
SerializeValue("extras", light.extras, o);
}
} }
static void SerializeGltfNode(Node &node, json &o) { static void SerializeGltfNode(Node &node, json &o) {