omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

complete dual-brush implementation and ui integration

Browse Source
This commit is contained in:
omigamedev
2019-02-14 13:18:00 +01:00
parent 999723dd14
commit fa9d7a107b
10 changed files with 171 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/brush.h
View File

@@ -23,10 +23,10 @@ public:
std::string m_stencil_thumb_path;
glm::vec4 m_tip_color{0, 0, 0, 1};
float m_tip_size = 0;
float m_tip_spacing = 0;
float m_tip_flow = 0;
float m_tip_opacity = 0;
float m_tip_size = .25f;
float m_tip_spacing = .25;
float m_tip_flow = 1;
float m_tip_opacity = 1;
float m_tip_angle = 0;
float m_tip_angle_delay = 0;
float m_tip_mix = 0;
@@ -55,8 +55,8 @@ public:
bool m_dual_enabled = false;
int m_dual_blend_mode = 0;
bool m_dual_randflip = false;
float m_dual_size = 0;
float m_dual_spacing = 0;
float m_dual_size = .25;
float m_dual_spacing = .25;
float m_dual_scatter = 0;
bool m_dual_scatter_axis = false;
bool m_dual_invert = false;
@@ -64,11 +64,14 @@ public:
bool m_dual_flipy = false;
bool m_tip_randflipx = false;
bool m_tip_randflipy = false;
float m_tip_aspect = 0.5;
float m_tip_aspect = 0.5f;
float m_dual_flow = .75f;
float m_dual_opacity = 1.f;
float m_dual_rotate = .25f;
bool load_texture(const std::string& path, const std::string& thumb);
bool load_dual(const std::string& path, const std::string& thumb);
bool load_stencil(const std::string& path);
bool load_stencil(const std::string& path, const std::string& thumb);
bool load();
};