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

Merge pull request #162 from ux3d/master

Browse Source 
add REQUIRE_VERSION to gltf validation and use it as default instead of REQUIRE_ALL
This commit is contained in:
Syoyo Fujita 2019-05-03 15:08:36 +09:00 committed by GitHub
commit ed7bf66255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tiny_gltf.h
View File

@ -826,13 +826,14 @@ class Model {
enum SectionCheck { enum SectionCheck {
NO_REQUIRE = 0x00, NO_REQUIRE = 0x00,
REQUIRE_SCENE = 0x01, REQUIRE_VERSION = 0x01,
REQUIRE_SCENES = 0x02, REQUIRE_SCENE = 0x02,
REQUIRE_NODES = 0x04, REQUIRE_SCENES = 0x04,
REQUIRE_ACCESSORS = 0x08, REQUIRE_NODES = 0x08,
REQUIRE_BUFFERS = 0x10, REQUIRE_ACCESSORS = 0x10,
REQUIRE_BUFFER_VIEWS = 0x20, REQUIRE_BUFFERS = 0x20,
REQUIRE_ALL = 0x3f REQUIRE_BUFFER_VIEWS = 0x40,
REQUIRE_ALL = 0x7f
}; };
/// ///
@ -934,7 +935,7 @@ class TinyGLTF {
/// ///
bool LoadASCIIFromFile(Model *model, std::string *err, std::string *warn, bool LoadASCIIFromFile(Model *model, std::string *err, std::string *warn,
const std::string &filename, const std::string &filename,
unsigned int check_sections = REQUIRE_ALL); unsigned int check_sections = REQUIRE_VERSION);
/// ///
/// Loads glTF ASCII asset from string(memory). /// Loads glTF ASCII asset from string(memory).
@ -945,7 +946,7 @@ class TinyGLTF {
bool LoadASCIIFromString(Model *model, std::string *err, std::string *warn, bool LoadASCIIFromString(Model *model, std::string *err, std::string *warn,
const char *str, const unsigned int length, const char *str, const unsigned int length,
const std::string &base_dir, const std::string &base_dir,
unsigned int check_sections = REQUIRE_ALL); unsigned int check_sections = REQUIRE_VERSION);
/// ///
/// Loads glTF binary asset from a file. /// Loads glTF binary asset from a file.
@ -954,7 +955,7 @@ class TinyGLTF {
/// ///
bool LoadBinaryFromFile(Model *model, std::string *err, std::string *warn, bool LoadBinaryFromFile(Model *model, std::string *err, std::string *warn,
const std::string &filename, const std::string &filename,
unsigned int check_sections = REQUIRE_ALL); unsigned int check_sections = REQUIRE_VERSION);
/// ///
/// Loads glTF binary asset from memory. /// Loads glTF binary asset from memory.
@ -966,7 +967,7 @@ class TinyGLTF {
const unsigned char *bytes, const unsigned char *bytes,
const unsigned int length, const unsigned int length,
const std::string &base_dir = "", const std::string &base_dir = "",
unsigned int check_sections = REQUIRE_ALL); unsigned int check_sections = REQUIRE_VERSION);
/// ///
/// Write glTF to file. /// Write glTF to file.
@ -3814,6 +3815,25 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
return false; return false;
} }
{
bool version_found = false;
json::const_iterator it = v.find("asset");
if ((it != v.end()) && it.value().is_object()) {
json::const_iterator version_it = it.value().find("version");
if ((version_it != it.value().end() && version_it.value().is_string())) {
version_found = true;
}
}
if (version_found) {
// OK
} else if (check_sections & REQUIRE_VERSION) {
if (err) {
(*err) += "\"asset\" object not found in .gltf or not an object type\n";
}
return false;
}
}
// scene is not mandatory. // scene is not mandatory.
// FIXME Maybe a better way to handle it than removing the code // FIXME Maybe a better way to handle it than removing the code