v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove premultipliedAlpha from gltf2

pull/1423/head
Daniel Hritzkiv 2017-09-06 23:43:43 -04:00
parent 140b903d7a
commit a438ece655
No known key found for this signature in database
GPG Key ID: D1D19875679D5CBF
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/glTF2Asset.h
View File

@ -998,7 +998,6 @@ namespace glTF2
{ {
std::string copyright; //!< A copyright message suitable for display to credit the content creator. std::string copyright; //!< A copyright message suitable for display to credit the content creator.
std::string generator; //!< Tool that generated this glTF model.Useful for debugging. std::string generator; //!< Tool that generated this glTF model.Useful for debugging.
bool premultipliedAlpha; //!< Specifies if the shaders were generated with premultiplied alpha. (default: false)
struct { struct {
std::string api; //!< Specifies the target rendering API (default: "WebGL") std::string api; //!< Specifies the target rendering API (default: "WebGL")
@ -1009,11 +1008,7 @@ namespace glTF2
void Read(Document& doc); void Read(Document& doc);
AssetMetadata() AssetMetadata() : version("") {}
: premultipliedAlpha(false)
, version("")
{
}
}; };
// //

2
code/glTF2Asset.inl
View File

@ -989,8 +989,6 @@ inline void AssetMetadata::Read(Document& doc)
ReadMember(*obj, "copyright", copyright); ReadMember(*obj, "copyright", copyright);
ReadMember(*obj, "generator", generator); ReadMember(*obj, "generator", generator);
premultipliedAlpha = MemberOrDefault(*obj, "premultipliedAlpha", false);
if (Value* versionString = FindString(*obj, "version")) { if (Value* versionString = FindString(*obj, "version")) {
version = versionString->GetString(); version = versionString->GetString();
} else if (Value* versionNumber = FindNumber (*obj, "version")) { } else if (Value* versionNumber = FindNumber (*obj, "version")) {