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

brush panel folding

Browse Source
This commit is contained in:
omigamedev
2019-02-19 23:29:07 +01:00
parent ccd23cd662
commit 7954e4d900
10 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
data/layout.xml
View File

@@ -195,10 +195,13 @@
<!-- COLOR -->
<border color=".2" height="20" justify="center" align="center" margin="5 0 5 0">
<border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
<node align="center" width="1" grow="1">
<text text="Color"/>
</node>
<button id="button-unfold-color" width="30" height="18" text="+"/>
</border>
<node dir="row">
<node id="fold-color" dir="row">
<node width="36%" dir="col">
<!--labels-->
<node height="30" justify="center" margin="0 0 5 0">
@@ -231,10 +234,13 @@
<!-- METRICS -->
<border color=".2" height="20" justify="center" align="center" margin="5 0 5 0">
<border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
<node align="center" width="1" grow="1">
<text text="Metrics"/>
</node>
<button id="button-unfold-metrics" width="30" height="18" text="+"/>
</border>
<node dir="row">
<node id="fold-metrics" dir="row">
<node width="36%" dir="col">
<!--labels-->
<node height="20" justify="center" margin="0 0 20 0">
@@ -282,8 +288,9 @@
<node align="center" width="1" grow="1">
<text text="Pattern"/>
</node>
<button id="button-unfold-pattern" width="30" height="18" text="+"/>
</border>
<node dir="row">
<node id="fold-pattern" dir="row">
<node width="36%" dir="col">
<!--labels-->
<node height="40" justify="center" margin="0 0 5 0">
@@ -362,8 +369,9 @@
<node align="center" width="1" grow="1">
<text text="Dual Brush"/>
</node>
<button id="button-unfold-dualbrush" width="30" height="18" text="+"/>
</border>
<node dir="row">
<node id="fold-dualbrush" dir="row">
<node width="36%" dir="col">
<!--labels-->
<node height="40" justify="center" margin="0 0 5 0">
@@ -414,7 +422,7 @@
</node>
</node>
<node height="30" width="100%" pad="1" dir="row" margin="0 0 5 0">
<combobox id="dual-blend-mode" width="100%" height="28" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay" default="0"/>
<combobox id="dual-blend-mode" width="100%" height="28" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay" default="1"/>
</node>
<node align="center" dir="row">
<checkbox id="dual-randflip" height="20" width="20"/>
@@ -448,9 +456,12 @@
<!-- MEDIUM -->
<border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
<node align="center" width="1" grow="1">
<text text="Medium"/>
</node>
<button id="button-unfold-medium" width="30" height="18" text="+"/>
</border>
<node dir="row">
<node id="fold-medium" dir="row">
<node width="36%" dir="col">
<!--labels-->
<node height="20" justify="center">
@@ -479,10 +490,13 @@
<!-- COLOR VARIATIONS -->
<border color=".2" height="20" justify="center" align="center" margin="5 0 5 0">
<border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
<node align="center" width="1" grow="1">
<text text="Color Variations"/>
</node>
<button id="button-unfold-colorvar" width="30" height="18" text="+"/>
</border>
<node dir="row">
<node id="fold-colorvar" dir="row">
<node width="36%" dir="col">
<!--labels-->
<node height="20" justify="center">
@@ -511,8 +525,13 @@
<!-- JITTER -->
<border color=".2" height="20" justify="center" align="center" margin="5 0 5 0"><text text="Jitter Settings"/></border>
<node dir="row">
<border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
<node align="center" width="1" grow="1">
<text text="Jitter"/>
</node>
<button id="button-unfold-jitter" width="30" height="18" text="+"/>
</border>
<node id="fold-jitter" dir="row">
<node width="36%" dir="col">
<node height="20" justify="center">
<text text="Flip"/>

3
src/app_shaders.cpp
View File

@@ -247,6 +247,7 @@ void App::initShaders()
"uniform mediump vec2 pattern_scale;\n"
"uniform mediump float pattern_bright;\n"
"uniform mediump float pattern_contr;\n"
"uniform mediump float dual_alpha;\n"
"uniform bool lock;\n"
"uniform bool mask;\n"
"uniform bool fragUV2;\n"
@@ -273,7 +274,7 @@ void App::initShaders()
" if (use_dual){\n"
" mediump vec4 dual = texture(tex_dual, uv);\n"
//" stroke.a = stroke.a * dual.a;\n"
" stroke.a = blend_stroke(stroke.a, dual.a, dual_blend_mode);\n"
" stroke.a = blend_stroke(stroke.a, dual.a * dual_alpha, dual_blend_mode);\n"
" }\n"
" stroke.a = mask ? stroke.a * stroke_alpha * blur(tex_mask, uv2).r : stroke.a * stroke_alpha;\n"
" if (!lock && base.a == 0.0) { frag = stroke * vec4(1.0, 1.0, 1.0, alpha); return; }\n"

1
src/canvas.cpp
View File

@@ -801,6 +801,7 @@ void Canvas::stroke_commit()
ShaderManager::u_vec2(kShaderUniform::PatternScale, glm::vec2(b->m_pattern_scale));
ShaderManager::u_float(kShaderUniform::PatternBright, b->m_pattern_brightness);
ShaderManager::u_float(kShaderUniform::PatternContrast, b->m_pattern_contrast);
ShaderManager::u_float(kShaderUniform::DualAlpha, b->m_dual_opacity);
glActiveTexture(GL_TEXTURE0);
m_tex2[i].bind();

36
src/node.cpp
View File

@@ -445,6 +445,7 @@ Node&& Node::operator=(Node&& o)
Node::Node()
{
y_node = YGNodeNew();
y_placeholder = nullptr;
}
Node::Node(Node&& o)
@@ -493,6 +494,8 @@ Node::~Node()
m_children.clear();
if (y_node)
YGNodeFree(y_node);
if (y_placeholder)
YGNodeFree(y_placeholder);
}
void Node::SetWidth(float value)
@@ -629,6 +632,39 @@ void Node::SetRTL(YGDirection dir)
YGNodeStyleSetDirection(y_node, dir);
}
void Node::SetVisibility(bool visible)
{
if (m_display && !visible)
{
// hide
int idx = parent->get_child_index(this);
YGNodeRemoveChild(parent->y_node, y_node);
y_placeholder = YGNodeNew();
YGNodeInsertChild(parent->y_node, y_placeholder, idx);
}
else if (!m_display && visible)
{
int count = YGNodeGetChildCount(parent->y_node);
for (int i = 0; i < count; i++)
{
if (YGNodeGetChild(parent->y_node, i) == y_placeholder)
{
YGNodeRemoveChild(parent->y_node, y_placeholder);
YGNodeInsertChild(parent->y_node, y_node, i);
YGNodeFree(y_placeholder);
y_placeholder = nullptr;
break;
}
}
}
m_display = visible;
}
void Node::ToggleVisibility()
{
SetVisibility(!m_display);
}
glm::vec2 Node::GetPosition()
{
return{ YGNodeLayoutGetLeft(y_node), YGNodeLayoutGetTop(y_node) };

5
src/node.h
View File

@@ -158,6 +158,11 @@ public:
void SetAspectRatio(float ar);
void SetRTL(YGDirection dir);
// used in visibility switch
YGNodeRef y_placeholder = nullptr;
void SetVisibility(bool visible);
void ToggleVisibility();
glm::vec2 GetPosition();
float GetWidth();
float GetHeight();

1
src/node_canvas.cpp
View File

@@ -225,6 +225,7 @@ void NodeCanvas::draw()
ShaderManager::u_vec2(kShaderUniform::PatternScale, glm::vec2(b->m_pattern_scale));
ShaderManager::u_float(kShaderUniform::PatternBright, b->m_pattern_brightness);
ShaderManager::u_float(kShaderUniform::PatternContrast, b->m_pattern_contrast);
ShaderManager::u_float(kShaderUniform::DualAlpha, b->m_dual_opacity);
glActiveTexture(GL_TEXTURE0);
m_canvas->m_layers[layer_index].m_rtt[plane_index].bindTexture();

31
src/node_panel_stroke.cpp
View File

@@ -82,6 +82,15 @@ void NodePanelStroke::update_controls()
m_preview->draw_stroke();
}
void NodePanelStroke::init_fold(const std::string& name)
{
if (auto b = find<NodeButton>(("button-unfold-" + name).c_str())) {
b->on_click = [this,name](Node*) {
find(("fold-" + name).c_str())->ToggleVisibility();
};
}
}
void NodePanelStroke::init_controls()
{
m_brush_popup = std::make_shared<NodePanelBrush>();
@@ -382,21 +391,13 @@ void NodePanelStroke::init_controls()
m_preview->m_brush = Canvas::I->m_current_brush;
m_preview->draw_stroke();
/*
auto load_stencil = find<NodeButton>("tip-stencil-load");
load_stencil->on_click = [this](Node*) {
App::I.pick_image([this](std::string path) {
App::I.async_start();
if (TextureManager::load(path.c_str()))
{
if (on_pattern_changed)
on_pattern_changed(this, path, "");
}
App::I.async_redraw();
App::I.async_end();
});
};
*/
init_fold("color");
init_fold("metrics");
init_fold("pattern");
init_fold("dualbrush");
init_fold("medium");
init_fold("colorvar");
init_fold("jitter");
update_controls();
}

2
src/node_panel_stroke.h
View File

@@ -78,7 +78,6 @@ public:
NodeSliderH* m_pattern_brightness;
NodeSliderH* m_pattern_contrast;
std::shared_ptr<NodePanelBrush> m_brush_popup;
std::shared_ptr<NodePanelBrush> m_pattern_popup;
std::shared_ptr<NodePanelBrushPreset> m_presets_popup;
@@ -95,6 +94,7 @@ public:
void init_controls();
void update_controls();
void init_fold(const std::string& name);
void init_slider(NodeSliderH*& slider, const char* id, float Brush::* prop);
void handle_slide(float Brush::* prop, Node* target, float value);

2
src/node_stroke_preview.cpp
View File

@@ -91,6 +91,7 @@ void NodeStrokePreview::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2
ShaderManager::u_vec2(kShaderUniform::PatternScale, glm::vec2(b->m_pattern_scale));
ShaderManager::u_float(kShaderUniform::PatternBright, b->m_pattern_brightness);
ShaderManager::u_float(kShaderUniform::PatternContrast, b->m_pattern_contrast);
ShaderManager::u_float(kShaderUniform::DualAlpha, b->m_dual_opacity);
m_sampler_linear.bind(0);
glActiveTexture(GL_TEXTURE0);
@@ -391,6 +392,7 @@ void NodeStrokePreview::draw_stroke()
ShaderManager::u_vec2(kShaderUniform::PatternScale, glm::vec2(b->m_pattern_scale));
ShaderManager::u_float(kShaderUniform::PatternBright, b->m_pattern_brightness);
ShaderManager::u_float(kShaderUniform::PatternContrast, b->m_pattern_contrast);
ShaderManager::u_float(kShaderUniform::DualAlpha, b->m_dual_opacity);
m_sampler_linear.bind(0);
m_sampler_linear.bind(1);

1
src/shader.h
View File

@@ -41,6 +41,7 @@ enum class kShaderUniform : uint16_t
PatternBright = const_hash("pattern_bright"),
PatternContrast = const_hash("pattern_contr"),
Colorize = const_hash("colorize"),
DualAlpha = const_hash("dual_alpha"),
};
enum class kShader : uint16_t