--add ref to MaterialAttributesManager;Simplify

facebookresearch · Nov 18, 2022 · 0270f77 · 0270f77
1 parent 376938c
commit 0270f77
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/src/esp/bindings/AttributesBindings.cpp b/src/esp/bindings/AttributesBindings.cpp
@@ -9,6 +9,7 @@
 #include "esp/core/managedContainers/AbstractManagedObject.h"
 #include "esp/metadata/attributes/AttributesBase.h"
 #include "esp/metadata/attributes/LightLayoutAttributes.h"
+#include "esp/metadata/attributes/MaterialAttributes.h"
 #include "esp/metadata/attributes/ObjectAttributes.h"
 #include "esp/metadata/attributes/PhysicsManagerAttributes.h"
 #include "esp/metadata/attributes/PrimitiveAssetAttributes.h"

diff --git a/src/esp/metadata/CMakeLists.txt b/src/esp/metadata/CMakeLists.txt
@@ -28,6 +28,8 @@ set(
   managers/AssetAttributesManager.cpp
   managers/LightLayoutAttributesManager.h
   managers/LightLayoutAttributesManager.cpp
+  managers/MaterialAttributesManager.h
+  managers/MaterialAttributesManager.cpp
   managers/ObjectAttributesManager.h
   managers/ObjectAttributesManager.cpp
   managers/PhysicsAttributesManager.h

diff --git a/src/esp/metadata/attributes/MaterialAttributes.cpp b/src/esp/metadata/attributes/MaterialAttributes.cpp
@@ -70,16 +70,13 @@ void PBRMetallicRoughnessAttributes::writeValuesToJson(
     io::JsonGenericValue& jsonObj,
     io::JsonAllocator& allocator) const {
   if (hasSubconfig("baseColorTexture")) {
-    MaterialTextureAttributes::cptr bctSubConfig =
-        getSubconfigCopy<const MaterialTextureAttributes>("baseColorTexture");
+    MaterialTextureAttributes::cptr bctSubConfig = getBaseColorTexture();
     auto bctJsonObj = bctSubConfig->writeToJsonObject(allocator);
     jsonObj.AddMember("baseColorTexture", bctJsonObj, allocator);
   }
   writeValueToJson("baseColorFactor", jsonObj, allocator);
   if (hasSubconfig("metallicRoughnessTexture")) {
-    MaterialTextureAttributes::cptr mrSubConfig =
-        getSubconfigCopy<const MaterialTextureAttributes>(
-            "metallicRoughnessTexture");
+    MaterialTextureAttributes::cptr mrSubConfig = getMetallicRoughnessTexture();
     auto mrJsonObj = mrSubConfig->writeToJsonObject(allocator);
     jsonObj.AddMember("metallicRoughnessTexture", mrJsonObj, allocator);
   }
@@ -90,17 +87,14 @@ void PBRMetallicRoughnessAttributes::writeValuesToJson(
 std::string PBRMetallicRoughnessAttributes::getObjectInfoInternal() const {
   std::string res("");
   if (hasSubconfig("baseColorTexture")) {
-    MaterialTextureAttributes::cptr bctSubConfig =
-        getSubconfigCopy<const MaterialTextureAttributes>("baseColorTexture");
+    MaterialTextureAttributes::cptr bctSubConfig = getBaseColorTexture();
     Cr::Utility::formatInto(res, res.size(), "{},",
                             bctSubConfig->getObjectInfo());
   }
   Cr::Utility::formatInto(res, res.size(), "{},",
                           getAsString("baseColorFactor"));
   if (hasSubconfig("metallicRoughnessTexture")) {
-    MaterialTextureAttributes::cptr mrSubConfig =
-        getSubconfigCopy<const MaterialTextureAttributes>(
-            "metallicRoughnessTexture");
+    MaterialTextureAttributes::cptr mrSubConfig = getMetallicRoughnessTexture();
     Cr::Utility::formatInto(res, res.size(), "{},",
                             mrSubConfig->getObjectInfo());
   }
@@ -114,16 +108,13 @@ std::string PBRMetallicRoughnessAttributes::getObjectInfoHeaderInternal()
     const {
   std::string res("");
   if (hasSubconfig("baseColorTexture")) {
-    MaterialTextureAttributes::cptr bctSubConfig =
-        getSubconfigCopy<const MaterialTextureAttributes>("baseColorTexture");
+    MaterialTextureAttributes::cptr bctSubConfig = getBaseColorTexture();
     Cr::Utility::formatInto(res, res.size(), "{},",
                             bctSubConfig->getObjectInfoHeader());
   }
   Cr::Utility::formatInto(res, res.size(), "Base Color Factor,");
   if (hasSubconfig("metallicRoughnessTexture")) {
-    MaterialTextureAttributes::cptr mrSubConfig =
-        getSubconfigCopy<const MaterialTextureAttributes>(
-            "metallicRoughnessTexture");
+    MaterialTextureAttributes::cptr mrSubConfig = getMetallicRoughnessTexture();
     Cr::Utility::formatInto(res, res.size(), "{},",
                             mrSubConfig->getObjectInfoHeader());
   }

diff --git a/src/esp/metadata/managers/MaterialAttributesManager.h b/src/esp/metadata/managers/MaterialAttributesManager.h
@@ -113,16 +113,6 @@ class MaterialAttributesManager
    */
   void resetFinalize() override {}
 
-  /**
-   * @brief Material Attributes has no reason to check this value
-   * @param handle String name of primitive asset attributes desired
-   * @return whether handle exists or not in asset attributes library
-   */
-  bool isValidPrimitiveAttributes(
-      CORRADE_UNUSED const std::string& handle) override {
-    return false;
-  }
-
  public:
   ESP_SMART_POINTERS(MaterialAttributesManager)