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

fail serialization if a buffer file fails to be written (e.g. due to access rights)

Browse Source
This commit is contained in:
Selmar Kok 2018-10-25 16:45:49 +02:00
parent db7f4e4d04
commit e46774940c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tiny_gltf.h
View File

@ -4077,12 +4077,14 @@ static void SerializeGltfBufferData(const std::vector<unsigned char> &data,
SerializeStringProperty("uri", header + encodedData, o); SerializeStringProperty("uri", header + encodedData, o);
} }
static void SerializeGltfBufferData(const std::vector<unsigned char> &data, static bool SerializeGltfBufferData(const std::vector<unsigned char> &data,
const std::string &binFilename) { const std::string &binFilename) {
std::ofstream output(binFilename.c_str(), std::ofstream::binary); std::ofstream output(binFilename.c_str(), std::ofstream::binary);
if(!output.is_open()) return false;
output.write(reinterpret_cast<const char *>(&data[0]), output.write(reinterpret_cast<const char *>(&data[0]),
std::streamsize(data.size())); std::streamsize(data.size()));
output.close(); output.close();
return true;
} }
static void SerializeParameterMap(ParameterMap &param, json &o) { static void SerializeParameterMap(ParameterMap &param, json &o) {
@ -4257,10 +4259,10 @@ static void SerializeGltfBuffer(Buffer &buffer, json &o) {
} }
} }
static void SerializeGltfBuffer(Buffer &buffer, json &o, static bool SerializeGltfBuffer(Buffer &buffer, json &o,
const std::string &binFilename, const std::string &binFilename,
const std::string &binBaseFilename) { const std::string &binBaseFilename) {
SerializeGltfBufferData(buffer.data, binFilename); if(!SerializeGltfBufferData(buffer.data, binFilename)) return false;
SerializeNumberProperty("byteLength", buffer.data.size(), o); SerializeNumberProperty("byteLength", buffer.data.size(), o);
SerializeStringProperty("uri", binBaseFilename, o); SerializeStringProperty("uri", binBaseFilename, o);
@ -4269,6 +4271,7 @@ static void SerializeGltfBuffer(Buffer &buffer, json &o,
if (buffer.extras.Type() != NULL_TYPE) { if (buffer.extras.Type() != NULL_TYPE) {
SerializeValue("extras", buffer.extras, o); SerializeValue("extras", buffer.extras, o);
} }
return true;
} }
static void SerializeGltfBufferView(BufferView &bufferView, json &o) { static void SerializeGltfBufferView(BufferView &bufferView, json &o) {
@ -4614,8 +4617,10 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
} }
usedUris.push_back(binUri); usedUris.push_back(binUri);
binSavePath = JoinPath(baseDir, binUri); binSavePath = JoinPath(baseDir, binUri);
SerializeGltfBuffer(model->buffers[i], buffer, binSavePath, if(!SerializeGltfBuffer(model->buffers[i], buffer, binSavePath,
binUri); binUri)) {
return false;
}
} }
buffers.push_back(buffer); buffers.push_back(buffer);
} }