--add missing fields to AssetInfo comparator; (#1757)

facebookresearch · May 19, 2022 · 5944ba2 · 5944ba2
1 parent b0d9c1f
commit 5944ba2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/esp/assets/Asset.cpp b/src/esp/assets/Asset.cpp
@@ -35,12 +35,23 @@ bool operator==(const AssetInfo& a, const AssetInfo& b) {
          a.shaderTypeToUse == b.shaderTypeToUse &&
          a.hasSemanticTextures == b.hasSemanticTextures &&
          a.virtualUnitToMeters == b.virtualUnitToMeters &&
+         a.splitInstanceMesh == b.splitInstanceMesh &&
+         a.overridePhongMaterial == b.overridePhongMaterial &&
          a.forceFlatShading == b.forceFlatShading;
 }
 
 bool operator!=(const AssetInfo& a, const AssetInfo& b) {
   return !(a == b);
 }
 
+bool operator==(const PhongMaterialColor& a, const PhongMaterialColor& b) {
+  return a.ambientColor == b.ambientColor && a.diffuseColor == b.diffuseColor &&
+         a.specularColor == b.specularColor;
+}
+
+bool operator!=(const PhongMaterialColor& a, const PhongMaterialColor& b) {
+  return !(a == b);
+}
+
 }  // namespace assets
 }  // namespace esp
diff --git a/src/esp/assets/Asset.h b/src/esp/assets/Asset.h
@@ -38,6 +38,9 @@ struct PhongMaterialColor {
   Magnum::Color4 specularColor{0.2};
 };
 
+bool operator==(const PhongMaterialColor& a, const PhongMaterialColor& b);
+bool operator!=(const PhongMaterialColor& a, const PhongMaterialColor& b);
+
 //! AssetInfo stores information necessary to identify and load an Asset
 struct AssetInfo {
   AssetType type = AssetType::UNKNOWN;