complete dual-brush implementation and ui integration

This commit is contained in:
2019-02-14 13:18:00 +01:00
parent 999723dd14
commit fa9d7a107b
10 changed files with 171 additions and 125 deletions

View File

@@ -38,14 +38,12 @@ public:
NodeCheckBox* m_tip_flow_pressure;
NodeCheckBox* m_tip_size_pressure;
NodeButtonCustom* m_brush_button;
NodeButtonCustom* m_dual_brush_button;
NodeImage* m_brush_thumb;
NodeImage* m_dual_brush_thumb;
NodeImage* m_preset_thumb;
NodeImage* m_dual_preset_thumb;
NodeButtonCustom* m_preset_button;
NodeButtonCustom* m_dual_preset_button;
NodeStrokePreview* m_preset_preview;
NodeStrokePreview* m_dual_preset_preview;
NodeCheckBox* m_tip_invert;
NodeCheckBox* m_tip_flipx;
@@ -63,14 +61,18 @@ public:
NodeSliderH* m_dual_spacing;
NodeSliderH* m_dual_scatter;
NodeSliderH* m_tip_aspect;
NodeSliderH* m_dual_flow;
NodeSliderH* m_dual_opacity;
NodeSliderH* m_dual_rotate;
NodeComboBox* m_dual_blend_mode;
NodeButtonCustom* m_tip_aspect_reset;
std::shared_ptr<NodePanelBrush> m_brush_popup;
std::shared_ptr<NodePanelBrushPreset> m_presets_popup;
std::function<void(Node* target)> on_stroke_change;
std::function<void(Node* target, const std::string& path)> on_stencil_changed;
std::function<void(Node* target, const std::string& path, const std::string& thumb)> on_stencil_changed;
std::function<void(Node* target, const std::string& path, const std::string& thumb)> on_brush_changed;
std::function<void(Node* target, const std::string& path, const std::string& thumb)> on_dual_changed;
std::map<NodeSliderH*, std::function<float(float)>> m_curves;
virtual Node* clone_instantiate() const override;