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

Updates asset object (glTF 2.0)

Browse Source
This commit is contained in:
Aurélien Chatelain 2017-05-24 09:54:18 +00:00
parent ab7b218385
commit d48bbdcd90
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tiny_gltf_loader.h
View File

@ -482,12 +482,11 @@ typedef struct {
} Buffer; } Buffer;
typedef struct { typedef struct {
std::string version; // required
std::string generator; std::string generator;
std::string version; std::string minVersion;
std::string profile_api; std::string copyright;
std::string profile_version; ParameterMap extensions;
bool premultipliedAlpha;
char pad[7];
Value extras; Value extras;
} Asset; } Asset;
@ -1347,22 +1346,12 @@ static bool ParseJSONProperty(std::map<std::string, double> *ret, std::string *e
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->generator, err, o, "generator", false); ParseStringProperty(&asset->generator, err, o, "generator", false);
ParseBooleanProperty(&asset->premultipliedAlpha, err, o, "premultipliedAlpha", ParseStringProperty(&asset->minVersion, err, o, "minVersion", false);
false);
ParseStringProperty(&asset->version, err, o, "version", false); // Unity exporter version is added as extra here
ParseExtrasProperty(&(asset->extras), o);
picojson::object::const_iterator profile = o.find("profile");
if (profile != o.end()) {
const picojson::value &v = profile->second;
if (v.contains("api") & v.get("api").is<std::string>()) {
asset->profile_api = v.get("api").get<std::string>();
}
if (v.contains("version") & v.get("version").is<std::string>()) {
asset->profile_version = v.get("version").get<std::string>();
}
}
return true; return true;
} }