Merge pull request #115 from Selmar/serialization_fixes

some serialization fixes
This commit is contained in:
Syoyo Fujita 2018-12-06 02:05:26 +09:00 committed by GitHub
commit 2c5597f591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -455,7 +455,8 @@ struct Sampler {
Sampler()
: wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT),
wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT) {}
wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT),
wrapR(TINYGLTF_TEXTURE_WRAP_REPEAT){}
bool operator==(const Sampler &) const;
};
@ -4815,7 +4816,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
if (writeBinary) {
WriteBinaryGltfFile(filename, output.dump());
} else {
WriteGltfFile(filename, output.dump(prettyPrint ? 2 : 0));
WriteGltfFile(filename, output.dump(prettyPrint ? 2 : -1));
}
return true;