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

Merge pull request #173 from christophe-f8/master

Browse Source 
Adding texture scale reading + asset copyright and texture names to the export
This commit is contained in:
Syoyo Fujita 2019-07-04 15:39:22 +09:00 committed by GitHub
commit 689edcbef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tiny_gltf.h
View File

@ -393,6 +393,17 @@ struct Parameter {
return 0; return 0;
} }
/// Return the scale of a texture if this Parameter is a normal texture map.
/// Returned value is only valid if the parameter represent a normal texture
/// from a material
double TextureScale() const {
const auto it = json_double_value.find("scale");
if (it != std::end(json_double_value)) {
return it->second;
}
return -1;
}
/// Material factor, like the roughness or metalness of a material /// Material factor, like the roughness or metalness of a material
/// Returned value is only valid if the parameter represent a texture from a /// Returned value is only valid if the parameter represent a texture from a
/// material /// material
@ -4838,6 +4849,10 @@ static void SerializeGltfAsset(Asset &asset, json &o) {
SerializeStringProperty("generator", asset.generator, o); SerializeStringProperty("generator", asset.generator, o);
} }
if (!asset.copyright.empty()) {
SerializeStringProperty("copyright", asset.copyright, o);
}
if (!asset.version.empty()) { if (!asset.version.empty()) {
SerializeStringProperty("version", asset.version, o); SerializeStringProperty("version", asset.version, o);
} }
@ -5135,6 +5150,9 @@ static void SerializeGltfTexture(Texture &texture, json &o) {
if (texture.source > -1) { if (texture.source > -1) {
SerializeNumberProperty("source", texture.source, o); SerializeNumberProperty("source", texture.source, o);
} }
if (texture.name.size()) {
SerializeStringProperty("name", texture.name, o);
}
if (texture.extras.Type() != NULL_TYPE) { if (texture.extras.Type() != NULL_TYPE) {
SerializeValue("extras", texture.extras, o); SerializeValue("extras", texture.extras, o);
} }