1 files changed, 24 insertions, 34 deletions

@@ -1,13 +1,12 @@
 #ifndef TOOLS_UTIL_TSCN_H_
 #define TOOLS_UTIL_TSCN_H_
 
-#include <absl/strings/string_view.h>
-
 #include <map>
 #include <memory>
 #include <string>
-#include <string_view>
+#include <utility>
 #include <variant>
+#include <vector>
 
 namespace com::fourisland::lingo2_archipelago {
 
@@ -22,45 +21,36 @@ struct GodotExtResourceRef {
 
 using GodotInstanceType = std::variant<std::monostate, GodotExtResourceRef>;
 
-class GodotNode {
- public:
-  GodotNode(std::string name, GodotInstanceType instance_type)
-      : name_(std::move(name)), instance_type_(std::move(instance_type)) {}
-
-  const std::string& GetName() const { return name_; }
-
-  const GodotInstanceType& GetInstanceType() const { return instance_type_; }
-
-  const GodotNode* GetParent() const { return parent_; }
-  GodotNode* GetParent() { return parent_; }
+struct GodotNode {
+  std::string name;
+  std::string parent;
+  GodotInstanceType instance_type;
 
   std::string GetPath() const;
-
-  void AddChild(GodotNode& child);
-
-  const GodotNode* GetNode(absl::string_view path) const;
-  GodotNode* GetNode(absl::string_view path);
-
-  const std::map<std::string, GodotNode*> GetChildren() const {
-    return children_;
-  }
-
- private:
-  std::string name_;
-  GodotInstanceType instance_type_;
-
-  GodotNode* parent_ = nullptr;
-  std::map<std::string, GodotNode*> children_;
 };
 
 class GodotScene {
  public:
-  virtual const GodotExtResource* GetExtResource(
-      const std::string& id) const = 0;
-  virtual const GodotNode& GetRoot() const = 0;
+  GodotScene(std::map<std::string, GodotExtResource> ext_resources,
+             std::vector<GodotNode> nodes)
+      : ext_resources_(std::move(ext_resources)), nodes_(std::move(nodes)) {}
+
+  const GodotExtResource* GetExtResource(const std::string& id) const {
+    auto it = ext_resources_.find(id);
+    if (it != ext_resources_.end()) {
+      return &it->second;
+    } else {
+      return nullptr;
+    }
+  }
+  const std::vector<GodotNode>& GetNodes() const { return nodes_; }
+
+ private:
+  std::map<std::string, GodotExtResource> ext_resources_;
+  std::vector<GodotNode> nodes_;
 };
 
-std::unique_ptr<GodotScene> ReadGodotSceneFromFile(const std::string& path);
+GodotScene ReadGodotSceneFromFile(const std::string& path);
 
 }  // namespace com::fourisland::lingo2_archipelago