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

Prevent cloning of images in buffers

Browse Source 
Now, in UpdateImageObject, if an image has no URI but had a valid bufferView, it will no longer change the image object or copy the buffer object to an outside file at baseDir. 
(When saving files from streams, this function would previously save textures in buffers as "#.png" in the program's working directory instead of the model file's directory, and create a broken link in the updated image object if the two locations were different.)
This commit is contained in:
FsiGuy00015623 2020-03-09 16:57:21 -05:00 committed by GitHub
parent 96ecea080a
commit db855c6794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tiny_gltf.h
View File

@ -2615,12 +2615,14 @@ static void UpdateImageObject(Image &image, std::string &baseDir, int index,
void *user_data = nullptr) { void *user_data = nullptr) {
std::string filename; std::string filename;
std::string ext; std::string ext;
// If image has uri, use it it as a filename
// If image have uri. Use it it as a filename
if (image.uri.size()) { if (image.uri.size()) {
filename = GetBaseFilename(image.uri); filename = GetBaseFilename(image.uri);
ext = GetFilePathExtension(filename); ext = GetFilePathExtension(filename);
}
else if (image.bufferView != -1) {
//If there's no URI and the data exists in a buffer,
//don't change properties or write images
} else if (image.name.size()) { } else if (image.name.size()) {
ext = MimeToExt(image.mimeType); ext = MimeToExt(image.mimeType);
// Otherwise use name as filename // Otherwise use name as filename
@ -2632,7 +2634,7 @@ static void UpdateImageObject(Image &image, std::string &baseDir, int index,
} }
// If callback is set, modify image data object // If callback is set, modify image data object
if (*WriteImageData != nullptr) { if (*WriteImageData != nullptr && !filename.empty()) {
std::string uri; std::string uri;
(*WriteImageData)(&baseDir, &filename, &image, embedImages, user_data); (*WriteImageData)(&baseDir, &filename, &image, embedImages, user_data);
} }
@ -7340,11 +7342,10 @@ bool TinyGLTF::WriteGltfSceneToStream(Model *model, std::ostream &stream,
json image; json image;
std::string dummystring = ""; std::string dummystring = "";
// UpdateImageObject need baseDir but only uses it if embededImages is // UpdateImageObject need baseDir but only uses it if embeddedImages is
// enable, since we won't write separte images when writing to a stream we // enabled, since we won't write separate images when writing to a stream we
// use a dummystring UpdateImageObject(model->images[i], dummystring, int(i), false,
UpdateImageObject(model->images[i], dummystring, int(i), false, &this->WriteImageData, this->write_image_user_data_);
&this->WriteImageData, this->write_image_user_data_);
SerializeGltfImage(model->images[i], image); SerializeGltfImage(model->images[i], image);
JsonPushBack(images, std::move(image)); JsonPushBack(images, std::move(image));
} }