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

Merge pull request #80 from mosra/texture-name

Browse Source 
Import texture names as well
This commit is contained in:
Syoyo Fujita 2018-07-25 13:51:41 +09:00 committed by GitHub
commit a71be9cc98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tiny_gltf.h
View File

@ -456,6 +456,8 @@ struct Image {
}; };
struct Texture { struct Texture {
std::string name;
int sampler; int sampler;
int source; // Required (not specified in the spec ?) int source; // Required (not specified in the spec ?)
Value extras; Value extras;
@ -2224,6 +2226,8 @@ static bool ParseTexture(Texture *texture, std::string *err, const json &o,
ParseExtensionsProperty(&texture->extensions, err, o); ParseExtensionsProperty(&texture->extensions, err, o);
ParseExtrasProperty(&texture->extras, o); ParseExtrasProperty(&texture->extras, o);
ParseStringProperty(&texture->name, err, o, "name", false);
return true; return true;
} }