Added support of saving and loading of embedded blend tree resources.

src/AnimGraph/AnimGraphResource.h

@@ -14,22 +14,16 @@ struct AnimGraphBlendTree;
 struct AnimGraphStateMachine;
 
 struct AnimNodeResource {
+  virtual ~AnimNodeResource() = default;
+
   std::string m_name;
-  std::string m_type_name;
+  std::string m_node_type_name;
   AnimNode* m_anim_node = nullptr;
   NodeDescriptorBase* m_socket_accessor = nullptr;
   float m_position[2] = {0.f, 0.f};
 };
 
-static inline AnimNodeResource AnimNodeResourceFactory(
-    const std::string& node_type_name) {
-  AnimNodeResource result;
-  result.m_type_name = node_type_name;
-  result.m_anim_node = AnimNodeFactory(node_type_name);
-  result.m_socket_accessor =
-      AnimNodeDescriptorFactory(node_type_name, result.m_anim_node);
-  return result;
-}
+static inline AnimNodeResource* AnimNodeResourceFactory(const std::string& node_type_name);
 
 struct BlendTreeConnectionResource {
   size_t source_node_index = -1;
@@ -39,7 +33,7 @@ struct BlendTreeConnectionResource {
 };
 
 struct BlendTreeResource {
-  std::vector<AnimNodeResource> m_nodes;
+  std::vector<AnimNodeResource*> m_nodes;
   std::vector<BlendTreeConnectionResource> m_connections;
 
   ~BlendTreeResource() { CleanupNodes();
@@ -52,27 +46,28 @@ struct BlendTreeResource {
   }
 
   void CleanupNodes() {
-    for (AnimNodeResource& node_resource : m_nodes) {
-      delete node_resource.m_anim_node;
-      delete node_resource.m_socket_accessor;
+    for (AnimNodeResource* node_resource : m_nodes) {
+      delete node_resource->m_anim_node;
+      delete node_resource->m_socket_accessor;
+      delete node_resource;
     }
 
     m_nodes.clear();
   }
 
   void InitGraphConnectors() {
-    m_nodes.push_back(AnimNodeResourceFactory("BlendTree"));
-    m_nodes[0].m_name = "Outputs";
-    m_nodes.push_back(AnimNodeResourceFactory("BlendTree"));
-    m_nodes[1].m_name = "Inputs";
+    m_nodes.push_back(AnimNodeResourceFactory("BlendTreeSockets"));
+    m_nodes[0]->m_name = "Outputs";
+    m_nodes.push_back(AnimNodeResourceFactory("BlendTreeSockets"));
+    m_nodes[1]->m_name = "Inputs";
   }
 
-  AnimNodeResource& GetGraphOutputNode() { return m_nodes[0]; }
-  AnimNodeResource& GetGraphInputNode() { return m_nodes[1]; }
+  [[nodiscard]] AnimNodeResource* GetGraphOutputNode() const { return m_nodes[0]; }
+  [[nodiscard]] AnimNodeResource* GetGraphInputNode() const { return m_nodes[1]; }
 
-  size_t GetNodeIndex(const AnimNodeResource& node_resource) const {
+  size_t GetNodeIndex(const AnimNodeResource* node_resource) const {
     for (size_t i = 0, n = m_nodes.size(); i < n; i++) {
-      if (&m_nodes[i] == &node_resource) {
+      if (m_nodes[i] == node_resource) {
         return i;
       }
     }
@@ -81,38 +76,10 @@ struct BlendTreeResource {
   }
 
   bool ConnectSockets (
-      const AnimNodeResource& source_node,
+      const AnimNodeResource* source_node,
       const std::string& source_socket_name,
-      const AnimNodeResource& target_node,
-      const std::string& target_socket_name) {
-    size_t source_node_index = GetNodeIndex(source_node);
-    size_t target_node_index = GetNodeIndex(target_node);
-
-    if (source_node_index >= m_nodes.size()
-        || target_node_index >= m_nodes.size()) {
-      std::cerr << "Cannot connect nodes: could not find nodes." << std::endl;
-      return false;
-    }
-
-    Socket* source_socket =
-        source_node.m_socket_accessor->GetOutputSocket(source_socket_name.c_str());
-    Socket* target_socket =
-        target_node.m_socket_accessor->GetInputSocket(target_socket_name.c_str());
-
-    if (source_socket == nullptr || target_socket == nullptr) {
-      std::cerr << "Cannot connect nodes: could not find sockets." << std::endl;
-      return false;
-    }
-
-    BlendTreeConnectionResource connection;
-    connection.source_node_index = source_node_index;
-    connection.source_socket_name = source_socket_name;
-    connection.target_node_index = target_node_index;
-    connection.target_socket_name = target_socket_name;
-    m_connections.push_back(connection);
-
-    return true;
-  }
+      const AnimNodeResource* target_node,
+      const std::string& target_socket_name);
 
   std::vector<Socket*> GetConstantNodeInputs(
       std::vector<NodeDescriptorBase*>& instance_node_descriptors) const {
@@ -125,7 +92,7 @@ struct BlendTreeResource {
         Socket& input = instance_node_descriptors[i]->m_inputs[j];
 
         if (*input.m_reference.ptr_ptr == nullptr) {
-          memcpy(&input.m_value, &m_nodes[i].m_socket_accessor->m_inputs[j].m_value, sizeof(Socket::SocketValue));
+          memcpy(&input.m_value, &m_nodes[i]->m_socket_accessor->m_inputs[j].m_value, sizeof(Socket::SocketValue));
           result.push_back(&input);
         }
       }
@@ -147,8 +114,8 @@ struct StateMachineResource {
   std::vector<StateMachineTransitionResources> m_transitions;
 };
 
-struct AnimGraphResource {
-  std::string m_type;
+struct AnimGraphResource: AnimNodeResource {
+  std::string m_graph_type_name;
   std::string m_name;
 
   BlendTreeResource m_blend_tree_resource;
@@ -163,7 +130,6 @@ struct AnimGraphResource {
  private:
   // BlendTree
   bool SaveBlendTreeResourceToFile(const char* filename) const;
-  bool LoadBlendTreeResourceFromJson(nlohmann::json const& json_data);
   void CreateBlendTreeRuntimeNodeInstances(AnimGraphBlendTree& result) const;
   void PrepareBlendTreeIOData(AnimGraphBlendTree& instance) const;
   void SetRuntimeNodeProperties(AnimGraphBlendTree& result) const;
@@ -172,4 +138,30 @@ struct AnimGraphResource {
   bool LoadStateMachineResourceFromJson(nlohmann::json const& json_data);
 };
 
+static inline AnimNodeResource* AnimNodeResourceFactory(
+    const std::string& node_type_name) {
+  AnimNodeResource* result;
+
+  if (node_type_name == "BlendTree") {
+    AnimGraphResource* blend_tree_resource = new AnimGraphResource();
+    blend_tree_resource->m_blend_tree_resource.InitGraphConnectors();
+    result = blend_tree_resource;
+  } else {
+    result = new AnimNodeResource();
+  }
+
+  result->m_node_type_name = node_type_name;
+
+  if (node_type_name == "BlendTreeSockets") {
+    result->m_anim_node = AnimNodeFactory("BlendTree");
+    result->m_socket_accessor = new NodeDescriptorBase();
+  } else {
+    result->m_anim_node = AnimNodeFactory(node_type_name);
+    result->m_socket_accessor =
+        AnimNodeDescriptorFactory(node_type_name, result->m_anim_node);
+  }
+
+  return result;
+}
+
 #endif  //ANIMTESTBED_ANIMGRAPHRESOURCE_H