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

Support loading glTF from memory(string).

Browse Source
This commit is contained in:
Syoyo Fujita 2016-02-06 17:26:44 +09:00
parent d8959696c0
commit 61fb52b57d
1 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tiny_gltf_loader.h
View File

@ -31,6 +31,7 @@
// //
// //
// Version: // Version:
// - v0.9.1 Support loading glTF asset from memory
// - v0.9.0 Initial // - v0.9.0 Initial
// //
// Tiny glTF loader is using following libraries: // Tiny glTF loader is using following libraries:
@ -203,10 +204,17 @@ public:
TinyGLTFLoader(){}; TinyGLTFLoader(){};
~TinyGLTFLoader(){}; ~TinyGLTFLoader(){};
/// Loads GLTF asset from a file. /// Loads glTF asset from a file.
/// Returns false and set error string to `err` if there's and parsing error. /// Returns false and set error string to `err` if there's an error.
bool LoadFromFile(Scene &scene, std::string &err, bool LoadFromFile(Scene &scene, std::string &err,
const std::string &filename); const std::string &filename);
/// Loads glTF asset from string(memory).
/// `length` = strlen(str);
/// Returns false and set error string to `err` if there's an error.
bool LoadFromString(Scene &scene, std::string &err,
const char* str, const unsigned int length, const std::string& baseDir);
}; };
} // namespace tinygltf } // namespace tinygltf
@ -1051,19 +1059,10 @@ bool ParseMaterial(Material &material, std::string &err,
} }
} }
bool TinyGLTFLoader::LoadFromFile(Scene &scene, std::string &err, bool TinyGLTFLoader::LoadFromString(Scene &scene, std::string &err,
const std::string &filename) { const char *str, unsigned int length, const std::string& baseDir) {
std::stringstream ss;
std::ifstream ifs(filename.c_str());
if (!ifs) {
ss << "Failed to open file: " << filename << std::endl;
err = ss.str();
return false;
}
picojson::value v; picojson::value v;
std::string perr = picojson::parse(v, ifs); std::string perr = picojson::parse(v, str, str + length);
if (!perr.empty()) { if (!perr.empty()) {
err = perr; err = perr;
@ -1120,8 +1119,6 @@ bool TinyGLTFLoader::LoadFromFile(Scene &scene, std::string &err,
scene.nodes.clear(); scene.nodes.clear();
scene.defaultScene = ""; scene.defaultScene = "";
std::string basedir = GetBaseDir(filename);
// 0. Parse Asset // 0. Parse Asset
if (v.contains("asset") && v.get("asset").is<picojson::object>()) { if (v.contains("asset") && v.get("asset").is<picojson::object>()) {
const picojson::object &root = v.get("asset").get<picojson::object>(); const picojson::object &root = v.get("asset").get<picojson::object>();
@ -1139,7 +1136,7 @@ bool TinyGLTFLoader::LoadFromFile(Scene &scene, std::string &err,
Buffer buffer; Buffer buffer;
if (!ParseBuffer(buffer, err, (it->second).get<picojson::object>(), if (!ParseBuffer(buffer, err, (it->second).get<picojson::object>(),
basedir)) { baseDir)) {
return false; return false;
} }
@ -1277,7 +1274,7 @@ bool TinyGLTFLoader::LoadFromFile(Scene &scene, std::string &err,
Image image; Image image;
if (!ParseImage(image, err, (it->second).get<picojson::object>(), if (!ParseImage(image, err, (it->second).get<picojson::object>(),
basedir)) { baseDir)) {
return false; return false;
} }
@ -1288,6 +1285,32 @@ bool TinyGLTFLoader::LoadFromFile(Scene &scene, std::string &err,
return true; return true;
} }
bool TinyGLTFLoader::LoadFromFile(Scene &scene, std::string &err,
const std::string &filename) {
std::stringstream ss;
std::ifstream f(filename.c_str());
if (!f) {
ss << "Failed to open file: " << filename << std::endl;
err = ss.str();
return false;
}
f.seekg(0, f.end);
size_t sz = f.tellg();
std::vector<char> buf(sz);
f.seekg(0, f.beg);
f.read(&buf.at(0), sz);
f.close();
std::string basedir = GetBaseDir(filename);
bool ret = LoadFromString(scene, err, &buf.at(0), buf.size(), basedir);
return ret;
}
#endif // TINYGLTF_LOADER_IMPLEMENTATION #endif // TINYGLTF_LOADER_IMPLEMENTATION
#endif // TINY_GLTF_LOADER_H #endif // TINY_GLTF_LOADER_H