extend jitter scatter slider to 1000%

This commit is contained in:
2019-02-26 23:05:10 +01:00
parent 449eb437f4
commit ebcb918bdc
2 changed files with 9 additions and 4 deletions

View File

@@ -561,10 +561,10 @@
<node height="20" justify="center">
<text text="Angle"/>
</node>
<node height="40" justify="center" margin="0 0 5 0">
<node height="20" justify="center" margin="0 0 25 0">
<text text="Scatter"/>
</node>
<node height="20" justify="center" margin="0 0 5 0">
<node height="20" justify="center">
<text text="Flow"/>
</node>
<node height="20" justify="center" margin="0 0 5 0">

View File

@@ -158,7 +158,7 @@ void NodePanelStroke::update_controls()
m_tip_noise->m_value.x = b->m_tip_noise;
m_jitter_scale->m_value.x = b->m_jitter_scale;
m_jitter_angle->m_value.x = b->m_jitter_angle;
m_jitter_scatter->m_value.x = b->m_jitter_scatter;
m_jitter_scatter->m_value.x = m_curves[m_jitter_scatter].to_slider(b->m_jitter_scatter);;
m_jitter_flow->m_value.x = b->m_jitter_flow;
m_jitter_opacity->m_value.x = b->m_jitter_opacity;
m_jitter_hue->m_value.x = b->m_jitter_hue;
@@ -488,6 +488,10 @@ void NodePanelStroke::init_controls()
[](float v) { return glm::pow(v, 2.f); },
[](float v) { return glm::pow(v, 1.f / 2.f); },
};
SliderCurve curve_linear1k_perc {
[](float v) { return v * 10.f; },
[](float v) { return v * 0.1f; },
};
SliderCurve curve_size1k_perc {
[](float v) {
float ret = 0;
@@ -534,9 +538,10 @@ void NodePanelStroke::init_controls()
m_curves[m_tip_flow] = curve_quad;
m_curves[m_dual_size] = curve_size1k_perc;
m_curves[m_dual_spacing] = curve_size1k_perc;
m_curves[m_dual_scatter] = curve_size1k_perc;
m_curves[m_dual_scatter] = curve_linear1k_perc;
m_curves[m_dual_flow] = curve_quad;
m_curves[m_pattern_scale] = curve_size1k_perc;
m_curves[m_jitter_scatter] = curve_linear1k_perc;
m_tip_aspect_reset = find<NodeButtonCustom>("tip-aspect-reset");
m_tip_aspect_reset->on_click = [this](Node*) {