add xml attributes for combobox node and add resolution selection for new doc

2017-11-12 22:39:23 +00:00
parent 4473bc8bd4
commit 8bc440b9b8
11 changed files with 53 additions and 25 deletions
--- a/engine/node_combobox.h
+++ b/engine/node_combobox.h
@@ -5,9 +5,10 @@ class NodeComboBox : public NodeButton
 {
 public:
    std::function<void(Node* target, int index)> on_select;
-    std::array<std::string, 4> labels{ "Normal", "Multiply", "Screen", "Color Dodge" };
+    std::vector<std::string> labels;
    int m_current_index = 0;
    virtual Node* clone_instantiate() const override;
    virtual void clone_copy(Node* dest) const override;
    virtual void loaded() override;
+    virtual void parse_attributes(kAttribute ka, const tinyxml2::XMLAttribute* attr) override;
 };