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

Partial fix of issue 365

Browse Source
This commit is contained in:
Syoyo Fujita 2022-08-02 01:05:34 +09:00
parent 544969b732
commit 81f7dbe53a
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tiny_gltf.h
View File

@ -1424,6 +1424,10 @@ class TinyGLTF {
bool preserve_image_channels_ = false; /// Default false(expand channels to bool preserve_image_channels_ = false; /// Default false(expand channels to
/// RGBA) for backward compatibility. /// RGBA) for backward compatibility.
// Warning & error messages
std::string warn_;
std::string err_;
FsCallbacks fs = { FsCallbacks fs = {
#ifndef TINYGLTF_NO_FS #ifndef TINYGLTF_NO_FS
&tinygltf::FileExists, &tinygltf::ExpandFilePath, &tinygltf::FileExists, &tinygltf::ExpandFilePath,
@ -7525,7 +7529,7 @@ static bool WriteGltfFile(const std::string &output,
return WriteGltfStream(gltfFile, content); return WriteGltfStream(gltfFile, content);
} }
static void WriteBinaryGltfStream(std::ostream &stream, static bool WriteBinaryGltfStream(std::ostream &stream,
const std::string &content, const std::string &content,
const std::vector<unsigned char> &binBuffer) { const std::vector<unsigned char> &binBuffer) {
const std::string header = "glTF"; const std::string header = "glTF";
@ -7579,9 +7583,12 @@ static void WriteBinaryGltfStream(std::ostream &stream,
std::streamsize(padding.size())); std::streamsize(padding.size()));
} }
} }
// TODO: Check error on stream.write
return true;
} }
static void WriteBinaryGltfFile(const std::string &output, static bool WriteBinaryGltfFile(const std::string &output,
const std::string &content, const std::string &content,
const std::vector<unsigned char> &binBuffer) { const std::vector<unsigned char> &binBuffer) {
#ifdef _WIN32 #ifdef _WIN32
@ -7599,7 +7606,7 @@ static void WriteBinaryGltfFile(const std::string &output,
#else #else
std::ofstream gltfFile(output.c_str(), std::ios::binary); std::ofstream gltfFile(output.c_str(), std::ios::binary);
#endif #endif
WriteBinaryGltfStream(gltfFile, content, binBuffer); return WriteBinaryGltfStream(gltfFile, content, binBuffer);
} }
bool TinyGLTF::WriteGltfSceneToStream(Model *model, std::ostream &stream, bool TinyGLTF::WriteGltfSceneToStream(Model *model, std::ostream &stream,
@ -7647,12 +7654,11 @@ bool TinyGLTF::WriteGltfSceneToStream(Model *model, std::ostream &stream,
} }
if (writeBinary) { if (writeBinary) {
WriteBinaryGltfStream(stream, JsonToString(output), binBuffer); return WriteBinaryGltfStream(stream, JsonToString(output), binBuffer);
} else { } else {
WriteGltfStream(stream, JsonToString(output, prettyPrint ? 2 : -1)); return WriteGltfStream(stream, JsonToString(output, prettyPrint ? 2 : -1));
} }
return true;
} }
bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename, bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
@ -7737,12 +7743,11 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
} }
if (writeBinary) { if (writeBinary) {
WriteBinaryGltfFile(filename, JsonToString(output), binBuffer); return WriteBinaryGltfFile(filename, JsonToString(output), binBuffer);
} else { } else {
WriteGltfFile(filename, JsonToString(output, (prettyPrint ? 2 : -1))); return WriteGltfFile(filename, JsonToString(output, (prettyPrint ? 2 : -1)));
} }
return true;
} }
} // namespace tinygltf } // namespace tinygltf