allanger/paulxstretch
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 2 Activity

Do envelope y scaling based on envelope point min and max values

Browse Source
This commit is contained in:
xenakios 2018-02-28 16:34:16 +02:00
parent b2944afbab
commit 310f549643
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/PluginEditor.cpp
View File

@ -321,6 +321,7 @@ void PaulstretchpluginAudioProcessorEditor::timerCallback(int id)
} }
if (id == 3) if (id == 3)
{ {
processor.m_free_filter_envelope->updateMinMaxValues();
m_free_filter_component.repaint(); m_free_filter_component.repaint();
} }
} }

19
Source/jcdp_envelope.h
View File

@ -565,6 +565,8 @@ public:
double m_transform_y_sinus = 0.0; double m_transform_y_sinus = 0.0;
double m_transform_y_sinus_freq = 8.0; double m_transform_y_sinus_freq = 8.0;
double m_transform_y_tilt = 0.0; double m_transform_y_tilt = 0.0;
double m_min_pt_value = 0.0;
double m_max_pt_value = 0.0;
inline double getTransformedValue(double x) inline double getTransformedValue(double x)
{ {
if (isTransformed() == false) if (isTransformed() == false)
@ -573,8 +575,9 @@ public:
if (temp < 0.0) if (temp < 0.0)
temp += 1.0; temp += 1.0;
double v = GetInterpolatedNodeValue(temp); double v = GetInterpolatedNodeValue(temp);
double diff = 0.5 - v; double center_v = m_minvalue + (m_maxvalue - m_minvalue) / 2.0;
double scaled = 0.5 - m_transform_y_scale * diff; double diff = center_v - v;
double scaled = center_v - m_transform_y_scale * diff;
double shifted = scaled + m_transform_y_shift + m_transform_y_sinus* double shifted = scaled + m_transform_y_shift + m_transform_y_sinus*
sin(2*3.141592653*(x-m_transform_x_shift)*m_transform_y_sinus_freq); sin(2*3.141592653*(x-m_transform_x_shift)*m_transform_y_sinus_freq);
double tiltline = m_transform_y_tilt-(2.0*m_transform_y_tilt*x); double tiltline = m_transform_y_tilt-(2.0*m_transform_y_tilt*x);
@ -586,6 +589,18 @@ public:
return m_transform_x_shift != 0.0 || m_transform_y_shift != 0.0 return m_transform_x_shift != 0.0 || m_transform_y_shift != 0.0
|| m_transform_y_scale!=1.0 || m_transform_y_sinus!=0.0 || m_transform_y_tilt!=0.0; || m_transform_y_scale!=1.0 || m_transform_y_sinus!=0.0 || m_transform_y_tilt!=0.0;
} }
void updateMinMaxValues()
{
double minv = 1.0;
double maxv = 0.0;
for (auto& e : m_nodes)
{
minv = std::min(minv, e.Value);
maxv = std::max(maxv, e.Value);
}
m_minvalue = minv;
m_maxvalue = maxv;
}
private: private:
nodes_t m_nodes; nodes_t m_nodes;
double m_playoffset=0.0; double m_playoffset=0.0;