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

Improve error message.

Browse Source
This commit is contained in:
Syoyo Fujita 2017-10-19 18:48:26 +09:00
parent dfe8c70d9a
commit 57c1018f89
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tiny_gltf.h
View File

@ -1307,12 +1307,16 @@ static bool ParseStringProperty(
static bool ParseStringIntProperty(std::map<std::string, int> *ret, static bool ParseStringIntProperty(std::map<std::string, int> *ret,
std::string *err, const picojson::object &o, std::string *err, const picojson::object &o,
const std::string &property, bool required) { const std::string &property, bool required, const std::string &parent = "") {
picojson::object::const_iterator it = o.find(property); picojson::object::const_iterator it = o.find(property);
if (it == o.end()) { if (it == o.end()) {
if (required) { if (required) {
if (err) { if (err) {
(*err) += "'" + property + "' property is missing.\n"; if (!parent.empty()) {
(*err) += "'" + property + "' property is missing in " + parent + ".\n";
} else {
(*err) += "'" + property + "' property is missing.\n";
}
} }
} }
return false; return false;
@ -1387,9 +1391,9 @@ static bool ParseJSONProperty(std::map<std::string, double> *ret,
static bool ParseAsset(Asset *asset, std::string *err, static bool ParseAsset(Asset *asset, std::string *err,
const picojson::object &o) { const picojson::object &o) {
ParseStringProperty(&asset->version, err, o, "version", true); ParseStringProperty(&asset->version, err, o, "version", true, "Asset");
ParseStringProperty(&asset->generator, err, o, "generator", false); ParseStringProperty(&asset->generator, err, o, "generator", false, "Asset");
ParseStringProperty(&asset->minVersion, err, o, "minVersion", false); ParseStringProperty(&asset->minVersion, err, o, "minVersion", false, "Asset");
// Unity exporter version is added as extra here // Unity exporter version is added as extra here
ParseExtrasProperty(&(asset->extras), o); ParseExtrasProperty(&(asset->extras), o);
@ -1440,7 +1444,7 @@ static bool ParseImage(Image *image, std::string *err,
} }
double buffer_view = -1.0; double buffer_view = -1.0;
if (!ParseNumberProperty(&buffer_view, err, o, "bufferView", true)) { if (!ParseNumberProperty(&buffer_view, err, o, "bufferView", true, "Image")) {
return false; return false;
} }
@ -1478,7 +1482,7 @@ static bool ParseImage(Image *image, std::string *err,
if (!LoadExternalFile(&img, err, uri, basedir, 0, false)) { if (!LoadExternalFile(&img, err, uri, basedir, 0, false)) {
if (err) { if (err) {
(*err) += "Failed to load external 'uri'. for image parameter\n"; (*err) += "Failed to load external 'uri' for image parameter\n";
} }
// If the image cannot be loaded, keep uri as image->uri. // If the image cannot be loaded, keep uri as image->uri.
return true; return true;
@ -1580,7 +1584,7 @@ static bool ParseBuffer(Buffer *buffer, std::string *err,
if (IsDataURI(uri)) { if (IsDataURI(uri)) {
if (!DecodeDataURI(&buffer->data, uri, bytes, true)) { if (!DecodeDataURI(&buffer->data, uri, bytes, true)) {
if (err) { if (err) {
(*err) += "Failed to decode 'uri' : " + uri + "\n"; (*err) += "Failed to decode 'uri' : " + uri + " in Buffer\n";
} }
return false; return false;
} }
@ -1763,7 +1767,7 @@ static bool ParsePrimitive(Primitive *primitive, std::string *err,
ParseNumberProperty(&indices, err, o, "indices", false); ParseNumberProperty(&indices, err, o, "indices", false);
primitive->indices = static_cast<int>(indices); primitive->indices = static_cast<int>(indices);
if (!ParseStringIntProperty(&primitive->attributes, err, o, "attributes", if (!ParseStringIntProperty(&primitive->attributes, err, o, "attributes",
true)) { true, "Primitive")) {
return false; return false;
} }
@ -1986,7 +1990,7 @@ static bool ParseAnimationChannel(AnimationChannel *channel, std::string *err,
const picojson::object &o) { const picojson::object &o) {
double samplerIndex = -1.0; double samplerIndex = -1.0;
double targetIndex = -1.0; double targetIndex = -1.0;
if (!ParseNumberProperty(&samplerIndex, err, o, "sampler", true)) { if (!ParseNumberProperty(&samplerIndex, err, o, "sampler", true, "AnimationChannel")) {
if (err) { if (err) {
(*err) += "`sampler` field is missing in animation channels\n"; (*err) += "`sampler` field is missing in animation channels\n";
} }
@ -2000,7 +2004,7 @@ static bool ParseAnimationChannel(AnimationChannel *channel, std::string *err,
if (!ParseNumberProperty(&targetIndex, err, target_object, "node", true)) { if (!ParseNumberProperty(&targetIndex, err, target_object, "node", true)) {
if (err) { if (err) {
(*err) += "`id` field is missing in animation.channels.target\n"; (*err) += "`node` field is missing in animation.channels.target\n";
} }
return false; return false;
} }