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

Merge pull request #99 from Selmar/serialization_fixes

Browse Source 
Pretty print & some (de)serialization fixes
This commit is contained in:
Syoyo Fujita 2018-10-09 02:12:38 +09:00 committed by GitHub
commit 30bbe0fe3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tiny_gltf.h
View File

@ -923,7 +923,8 @@ class TinyGLTF {
/// ///
bool WriteGltfSceneToFile(Model *model, const std::string &filename, bool WriteGltfSceneToFile(Model *model, const std::string &filename,
bool embedImages, bool embedImages,
bool embedBuffers /*, bool writeBinary*/); bool embedBuffers,
bool prettyPrint /*, bool writeBinary*/);
/// ///
/// Set callback to use for loading image data /// Set callback to use for loading image data
@ -2347,7 +2348,12 @@ static bool ParseExtensionsProperty(ExtensionMap *ret, std::string *err,
json::const_iterator extIt = it.value().begin(); json::const_iterator extIt = it.value().begin();
for (; extIt != it.value().end(); extIt++) { for (; extIt != it.value().end(); extIt++) {
if (!extIt.value().is_object()) continue; if (!extIt.value().is_object()) continue;
ParseJsonAsValue(&extensions[extIt.key()], extIt.value()); if (!ParseJsonAsValue(&extensions[extIt.key()], extIt.value())) {
if (!extIt.key().empty()) {
// create empty object so that an extension object is still of type object
extensions[extIt.key()] = Value{ Value::Object{} };
}
}
} }
if (ret) { if (ret) {
(*ret) = extensions; (*ret) = extensions;
@ -4471,7 +4477,7 @@ static void SerializeGltfPerspectiveCamera(const PerspectiveCamera &camera,
static void SerializeGltfCamera(const Camera &camera, json &o) { static void SerializeGltfCamera(const Camera &camera, json &o) {
SerializeStringProperty("type", camera.type, o); SerializeStringProperty("type", camera.type, o);
if (!camera.name.empty()) { if (!camera.name.empty()) {
SerializeStringProperty("name", camera.type, o); SerializeStringProperty("name", camera.name, o);
} }
if (camera.type.compare("orthographic") == 0) { if (camera.type.compare("orthographic") == 0) {
@ -4533,7 +4539,8 @@ static bool WriteGltfFile(const std::string &output,
bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename, bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
bool embedImages = false, bool embedImages = false,
bool embedBuffers = false bool embedBuffers = false,
bool prettyPrint = true
/*, bool writeBinary*/) { /*, bool writeBinary*/) {
json output; json output;
@ -4771,7 +4778,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
} }
// pretty printing with spacing 2 // pretty printing with spacing 2
return WriteGltfFile(filename, output.dump(2)); return WriteGltfFile(filename, output.dump(prettyPrint ? 2 : 0));
} }
} // namespace tinygltf } // namespace tinygltf