diff --git a/tiny_gltf.h b/tiny_gltf.h index cbda873..ba837ed 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -4131,7 +4131,7 @@ static void SerializeExtensionMap(ExtensionMap &extensions, json &o) { extMap[extIt->first] = ret; } if(ret.is_null()) { - if (!(extIt->first.empty())) { // name should not be empty, but for sure + if (!(extIt->first.empty())) { // name should not be empty, but for sure // create empty object so that an extension name is still included in json. extMap[extIt->first] = json({}); } @@ -4442,6 +4442,7 @@ static void SerializeGltfNode(Node &node, json &o) { static void SerializeGltfSampler(Sampler &sampler, json &o) { SerializeNumberProperty("magFilter", sampler.magFilter, o); SerializeNumberProperty("minFilter", sampler.minFilter, o); + SerializeNumberProperty("wrapR", sampler.wrapR, o); SerializeNumberProperty("wrapS", sampler.wrapS, o); SerializeNumberProperty("wrapT", sampler.wrapT, o); @@ -4627,7 +4628,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename, } else { std::string binSavePath; std::string binUri; - if (!model->buffers[i].uri.empty() + if (!model->buffers[i].uri.empty() && !IsDataURI(model->buffers[i].uri)) { binUri = model->buffers[i].uri; } @@ -4684,7 +4685,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename, json image; UpdateImageObject(model->images[i], baseDir, int(i), embedImages, - &this->WriteImageData, &this->write_image_user_data_); + &this->WriteImageData, this->write_image_user_data_); SerializeGltfImage(model->images[i], image); images.push_back(image); }