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

Merge remote-tracking branch 'origin/master' into serialization_fixes

Browse Source
This commit is contained in:
Selmar Kok 2018-11-09 10:34:55 +01:00
commit 60f97325b1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/glview/premake5.lua
View File

@ -11,6 +11,7 @@ solution "glview"
files { "glview.cc", "../common/trackball.cc" } files { "glview.cc", "../common/trackball.cc" }
includedirs { "./" } includedirs { "./" }
includedirs { "../../" } includedirs { "../../" }
includedirs { "../common/" }
configuration { "linux" } configuration { "linux" }
linkoptions { "`pkg-config --libs glfw3`" } linkoptions { "`pkg-config --libs glfw3`" }

8
tiny_gltf.h
View File

@ -1704,7 +1704,7 @@ bool WriteImageData(const std::string *basepath, const std::string *filename,
} else { } else {
// Write image to disc // Write image to disc
FsCallbacks *fs = reinterpret_cast<FsCallbacks *>(fsPtr); FsCallbacks *fs = reinterpret_cast<FsCallbacks *>(fsPtr);
if (fs != nullptr && fs->WriteWholeFile == nullptr) { if ((fs != nullptr) && (fs->WriteWholeFile != nullptr)) {
const std::string imagefilepath = JoinPath(*basepath, *filename); const std::string imagefilepath = JoinPath(*basepath, *filename);
std::string writeError; std::string writeError;
if (!fs->WriteWholeFile(&writeError, imagefilepath, data, if (!fs->WriteWholeFile(&writeError, imagefilepath, data,
@ -4130,7 +4130,7 @@ static void SerializeExtensionMap(ExtensionMap &extensions, json &o) {
extMap[extIt->first] = ret; extMap[extIt->first] = ret;
} }
if(ret.is_null()) { 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. // create empty object so that an extension name is still included in json.
extMap[extIt->first] = json({}); extMap[extIt->first] = json({});
} }
@ -4598,7 +4598,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
} else { } else {
std::string binSavePath; std::string binSavePath;
std::string binUri; std::string binUri;
if (!model->buffers[i].uri.empty() if (!model->buffers[i].uri.empty()
&& !IsDataURI(model->buffers[i].uri)) { && !IsDataURI(model->buffers[i].uri)) {
binUri = model->buffers[i].uri; binUri = model->buffers[i].uri;
} }
@ -4655,7 +4655,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
json image; json image;
UpdateImageObject(model->images[i], baseDir, int(i), embedImages, 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); SerializeGltfImage(model->images[i], image);
images.push_back(image); images.push_back(image);
} }