diff --git a/src/Magnum/Trade/PbrMetallicRoughnessMaterialData.cpp b/src/Magnum/Trade/PbrMetallicRoughnessMaterialData.cpp index 449238902..5291a0b7f 100644 --- a/src/Magnum/Trade/PbrMetallicRoughnessMaterialData.cpp +++ b/src/Magnum/Trade/PbrMetallicRoughnessMaterialData.cpp @@ -55,31 +55,6 @@ bool PbrMetallicRoughnessMaterialData::hasNoneRoughnessMetallicTexture() const { roughnessTextureLayer() == metalnessTextureLayer(); } -bool PbrMetallicRoughnessMaterialData::hasRoughnessMetallicOcclusionTexture() const { - if(!hasAttribute(MaterialAttribute::RoughnessTexture) || - !hasAttribute(MaterialAttribute::MetalnessTexture) || - !hasAttribute(MaterialAttribute::OcclusionTexture)) - return false; - - const UnsignedInt roughnessTexture = attribute(MaterialAttribute::RoughnessTexture); - if(attribute(MaterialAttribute::MetalnessTexture) != roughnessTexture || - attribute(MaterialAttribute::OcclusionTexture) != roughnessTexture || - roughnessTextureSwizzle() != MaterialTextureSwizzle::R || - metalnessTextureSwizzle() != MaterialTextureSwizzle::G || - occlusionTextureSwizzle() != MaterialTextureSwizzle::B) - return false; - - const Matrix3 roughnessTextureMatrix = this->roughnessTextureMatrix(); - const UnsignedInt roughnessTextureCoordinates = this->roughnessTextureCoordinates(); - const UnsignedInt roughnessTextureLayer = this->roughnessTextureLayer(); - return metalnessTextureMatrix() == roughnessTextureMatrix && - occlusionTextureMatrix() == roughnessTextureMatrix && - metalnessTextureCoordinates() == roughnessTextureCoordinates && - occlusionTextureCoordinates() == roughnessTextureCoordinates && - metalnessTextureLayer() == roughnessTextureLayer && - occlusionTextureLayer() == roughnessTextureLayer; -} - bool PbrMetallicRoughnessMaterialData::hasOcclusionRoughnessMetallicTexture() const { if(!hasAttribute(MaterialAttribute::OcclusionTexture) || !hasAttribute(MaterialAttribute::RoughnessTexture) || @@ -105,6 +80,31 @@ bool PbrMetallicRoughnessMaterialData::hasOcclusionRoughnessMetallicTexture() co metalnessTextureLayer() == occlusionTextureLayer; } +bool PbrMetallicRoughnessMaterialData::hasRoughnessMetallicOcclusionTexture() const { + if(!hasAttribute(MaterialAttribute::RoughnessTexture) || + !hasAttribute(MaterialAttribute::MetalnessTexture) || + !hasAttribute(MaterialAttribute::OcclusionTexture)) + return false; + + const UnsignedInt roughnessTexture = attribute(MaterialAttribute::RoughnessTexture); + if(attribute(MaterialAttribute::MetalnessTexture) != roughnessTexture || + attribute(MaterialAttribute::OcclusionTexture) != roughnessTexture || + roughnessTextureSwizzle() != MaterialTextureSwizzle::R || + metalnessTextureSwizzle() != MaterialTextureSwizzle::G || + occlusionTextureSwizzle() != MaterialTextureSwizzle::B) + return false; + + const Matrix3 roughnessTextureMatrix = this->roughnessTextureMatrix(); + const UnsignedInt roughnessTextureCoordinates = this->roughnessTextureCoordinates(); + const UnsignedInt roughnessTextureLayer = this->roughnessTextureLayer(); + return metalnessTextureMatrix() == roughnessTextureMatrix && + occlusionTextureMatrix() == roughnessTextureMatrix && + metalnessTextureCoordinates() == roughnessTextureCoordinates && + occlusionTextureCoordinates() == roughnessTextureCoordinates && + metalnessTextureLayer() == roughnessTextureLayer && + occlusionTextureLayer() == roughnessTextureLayer; +} + bool PbrMetallicRoughnessMaterialData::hasNormalRoughnessMetallicTexture() const { if(!hasAttribute(MaterialAttribute::NormalTexture) || !hasAttribute(MaterialAttribute::RoughnessTexture) ||