From 7a959d1edd7b750c8c6124429e4c07bf8ab777b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 18 Feb 2025 00:18:59 +0100
Subject: [PATCH] Trade: make PbrMetallicRoughnessMaterialData definitions
 match decls.

OcclusionRoughnessMetallic is close to NoneRoughnessMetallic, which is
already done as such in the header, and as of last commit also in the
test.
---
 .../PbrMetallicRoughnessMaterialData.cpp      | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

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<UnsignedInt>(MaterialAttribute::RoughnessTexture);
-    if(attribute<UnsignedInt>(MaterialAttribute::MetalnessTexture) != roughnessTexture ||
-       attribute<UnsignedInt>(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<UnsignedInt>(MaterialAttribute::RoughnessTexture);
+    if(attribute<UnsignedInt>(MaterialAttribute::MetalnessTexture) != roughnessTexture ||
+       attribute<UnsignedInt>(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) ||