New propagation, including N-1 splitters and mergers and locking, mostly done

ficsit-companion/include/app.hpp

@@ -27,6 +27,51 @@ class App
     /// @brief Save current session (should NOT require an active ImGui context)
     void SaveSession();
 
+private:
+    /// @brief Used in saved files to track when format change. Used to update files saved with previous versions
+    static constexpr int SAVE_VERSION = 2;
+
+    /// @brief Window id used for the Add Node popup
+    static constexpr std::string_view add_node_popup_id = "Add Node";
+    /// @brief Folder to save/load the serialized graph
+    static constexpr std::string_view save_folder = "saved";
+    /// @brief Path used to save current session file
+    static constexpr std::string_view session_file = "last_session.fcs";
+
+
+    /// @brief Version of the game the items/recipes are from
+    std::string recipes_version;
+    /// @brief All known items
+    std::unordered_map<std::string, std::unique_ptr<Item>> items;
+    /// @brief All known recipes
+    std::vector<Recipe> recipes;
+
+    /// @brief All nodes currently in the graph view
+    std::vector<std::unique_ptr<Node>> nodes;
+    /// @brief All links currently in the graph view
+    std::vector<std::unique_ptr<Link>> links;
+
+    ax::NodeEditor::Config config;
+    ax::NodeEditor::EditorContext* context;
+
+    /// @brief Next available id for a node/link in the graph view
+    unsigned long long int next_id;
+
+    double last_time_saved_session;
+
+    /* Values used during the rendering pass to save UI state between frames */
+    std::string save_name;
+    std::vector<std::pair<std::string, size_t>> file_suggestions;
+    bool popup_opened;
+    ImVec2 new_node_position;
+    Pin* new_node_pin;
+    std::string recipe_filter;
+    std::vector<std::string> frame_tooltips;
+
+    enum class Constraint { None, Weak, Strong };
+    /// @brief All pins which had their value changed and need to propagate updates
+    std::queue<std::pair<const Pin*, Constraint>> updating_pins;
+
 private:
     /// @brief Load saved session if present
     void LoadSession();
@@ -93,49 +138,4 @@ class App
     /// @brief React to app-specific key pressed
     void CustomKeyControl();
 
-private:
-    /// @brief Used in saved files to track when format change. Used to update files saved with previous versions
-    static constexpr int SAVE_VERSION = 2;
-
-    /// @brief Window id used for the Add Node popup
-    static constexpr std::string_view add_node_popup_id = "Add Node";
-    /// @brief Folder to save/load the serialized graph
-    static constexpr std::string_view save_folder = "saved";
-    /// @brief Path used to save current session file
-    static constexpr std::string_view session_file = "last_session.fcs";
-
-
-    /// @brief Version of the game the items/recipes are from
-    std::string recipes_version;
-    /// @brief All known items
-    std::unordered_map<std::string, std::unique_ptr<Item>> items;
-    /// @brief All known recipes
-    std::vector<Recipe> recipes;
-
-    /// @brief All nodes currently in the graph view
-    std::vector<std::unique_ptr<Node>> nodes;
-    /// @brief All links currently in the graph view
-    std::vector<std::unique_ptr<Link>> links;
-
-    ax::NodeEditor::Config config;
-    ax::NodeEditor::EditorContext* context;
-
-    /// @brief Next available id for a node/link in the graph view
-    unsigned long long int next_id;
-
-    double last_time_saved_session;
-
-    /* Values used during the rendering pass to save UI state between frames */
-    std::string save_name;
-    std::vector<std::pair<std::string, size_t>> file_suggestions;
-    bool popup_opened;
-    ImVec2 new_node_position;
-    Pin* new_node_pin;
-    std::string recipe_filter;
-    std::vector<std::string> frame_tooltips;
-
-    enum class Constraint { None, Weak, Strong };
-    /// @brief All pins which had their value changed and need to propagate updates
-    std::queue<std::pair<const Pin*, Constraint>> updating_pins;
-
 };

ficsit-companion/include/link.hpp

@@ -5,6 +5,7 @@
 #include <imgui_node_editor.h>
 
 struct Pin;
+struct MetaPin;
 
 struct Link
 {
@@ -25,3 +26,13 @@ struct Link
 
     std::optional<ax::NodeEditor::FlowDirection> flow;
 };
+
+struct MetaLink : public Link
+{
+    MetaLink(const ax::NodeEditor::LinkId id, MetaPin* start, MetaPin* end);
+    ~MetaLink();
+
+    MetaPin* start;
+    MetaPin* end;
+
+};

ficsit-companion/include/node.hpp

@@ -13,14 +13,16 @@
 struct Item;
 struct Pin;
 struct Recipe;
+struct MetaPin;
 
 struct Node
 {
     enum class Kind
     {
         Craft,
         Splitter,
-        Merger
+        Merger,
+        Meta
     };
 
     Node(const ax::NodeEditor::NodeId id);
@@ -32,7 +34,7 @@ struct Node
     virtual bool IsMerger() const;
     virtual bool IsSplitter() const;
     virtual Json::Value Serialize() const;
-    virtual bool Deserialize(const Json::Value& v);
+    virtual bool Deserialize(const Json::Value& v, const std::function<unsigned long long int()>& id_generator);
 
     const ax::NodeEditor::NodeId id;
 
@@ -49,7 +51,7 @@ struct CraftNode : public Node
     virtual Kind GetKind() const override;
     virtual bool IsCraft() const override;
     virtual Json::Value Serialize() const override;
-    virtual bool Deserialize(const Json::Value& v) override;
+    virtual bool Deserialize(const Json::Value& v, const std::function<unsigned long long int()>& id_generator) override;
 
     const Recipe* recipe;
     FractionalNumber current_rate;
@@ -61,7 +63,7 @@ struct OrganizerNode : public Node
     virtual ~OrganizerNode();
     virtual bool IsOrganizer() const override;
     virtual Json::Value Serialize() const override;
-    virtual bool Deserialize(const Json::Value& v) override;
+    virtual bool Deserialize(const Json::Value& v, const std::function<unsigned long long int()>& id_generator) override;
 
     void ChangeItem(const Item* item);
     void RemoveItemIfNotForced();
@@ -87,3 +89,12 @@ struct MergerNode : public OrganizerNode
 
     virtual Kind GetKind() const override;
 };
+
+struct MetaNode : public Node
+{
+    MetaNode(const ax::NodeEditor::NodeId id);
+    virtual ~MetaNode();
+    virtual Kind GetKind() const override;
+    std::vector<std::unique_ptr<MetaPin>> ins;
+    std::vector<std::unique_ptr<MetaPin>> outs;
+};

ficsit-companion/include/pin.hpp

@@ -8,6 +8,8 @@ struct Node;
 struct Item;
 struct Link;
 struct CountedItem;
+struct MetaNode;
+struct MetaLink;
 
 struct Pin
 {
@@ -22,6 +24,19 @@ struct Pin
     const FractionalNumber base_rate;
     // A pin can have at most one link
     Link* link;
+    bool locked;
 
     FractionalNumber current_rate;
 };
+
+struct MetaPin : public Pin
+{
+    MetaPin(const ax::NodeEditor::PinId id, const ax::NodeEditor::PinKind direction,
+        MetaNode* node, Pin* pin, FractionalNumber& meta_rate = FractionalNumber(0, 1));
+    ~MetaPin();
+
+    FractionalNumber meta_rate;
+    Pin* pin;
+    MetaNode* node;
+    MetaLink* link;
+};