--Object/AO creation refactor and Object/AO Instance save/creation

src/esp/assets/ResourceManager.cpp

@@ -107,6 +107,7 @@ using metadata::managers::AOAttributesManager;
 using metadata::managers::AssetAttributesManager;
 using metadata::managers::ObjectAttributesManager;
 using metadata::managers::PhysicsAttributesManager;
+using metadata::managers::SceneInstanceAttributesManager;
 using metadata::managers::StageAttributesManager;
 using Mn::Trade::MaterialAttribute;
 
@@ -536,8 +537,8 @@ bool ResourceManager::loadStage(
     // Either add with pre-built meshGroup if collision assets are loaded
     // or empty vector for mesh group - this should only be the case if
     // we are using None-type physicsManager.
-    bool sceneSuccess =
-        _physicsManager->addStage(stageAttributes, stageInstanceAttributes);
+    bool sceneSuccess = _physicsManager->addStageInstance(
+        stageAttributes, stageInstanceAttributes);
     if (!sceneSuccess) {
       ESP_ERROR() << "Adding Stage" << stageAttributes->getHandle()
                   << "to PhysicsManager failed. Aborting stage initialization.";
@@ -2996,6 +2997,11 @@ ResourceManager::getPhysicsAttributesManager() const {
   return metadataMediator_->getPhysicsAttributesManager();
 }
 
+metadata::managers::SceneInstanceAttributesManager::ptr
+ResourceManager::getSceneInstanceAttributesManager() const {
+  return metadataMediator_->getSceneInstanceAttributesManager();
+}
+
 metadata::managers::StageAttributesManager::ptr
 ResourceManager::getStageAttributesManager() const {
   return metadataMediator_->getStageAttributesManager();

src/esp/assets/ResourceManager.h

@@ -62,6 +62,7 @@ class AssetAttributesManager;
 class LightLayoutAttributesManager;
 class ObjectAttributesManager;
 class PhysicsAttributesManager;
+class SceneInstanceAttributesManager;
 class StageAttributesManager;
 }  // namespace managers
 }  // namespace metadata
@@ -313,7 +314,14 @@ class ResourceManager {
   getPhysicsAttributesManager() const;
 
   /**
-   * @brief Return manager for construction and access to scene attributes.
+   * @brief Return manager for construction and access to scene instance
+   * attributes.
+   */
+  std::shared_ptr<metadata::managers::SceneInstanceAttributesManager>
+  getSceneInstanceAttributesManager() const;
+
+  /**
+   * @brief Return manager for construction and access to stage attributes.
    */
   std::shared_ptr<metadata::managers::StageAttributesManager>
   getStageAttributesManager() const;