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

Allow changing envelope sin transform frequency

Browse Source
This commit is contained in:
xenakios 2018-02-28 05:58:22 +02:00
parent b4c3b026e1
commit b0e0cd673e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/envelope_component.cpp
View File

@ -339,6 +339,11 @@ bool EnvelopeComponent::keyPressed(const KeyPress & ev)
r = f(m_envelope->m_transform_y_tilt,0.02); r = f(m_envelope->m_transform_y_tilt,0.02);
if (ev == 'H') if (ev == 'H')
r = f(m_envelope->m_transform_y_tilt,-0.02); r = f(m_envelope->m_transform_y_tilt,-0.02);
if (ev == 'V')
r = f(m_envelope->m_transform_y_sinus_freq,1.0);
if (ev == 'B')
r = f(m_envelope->m_transform_y_sinus_freq,-1.0);
m_envelope->m_transform_y_sinus_freq = jlimit(1.0,64.0, m_envelope->m_transform_y_sinus_freq);
if (r==true) if (r==true)
{ {
repaint(); repaint();

4
Source/jcdp_envelope.h
View File

@ -563,6 +563,7 @@ public:
double m_transform_y_shift = 0.0; double m_transform_y_shift = 0.0;
double m_transform_y_scale = 1.0; double m_transform_y_scale = 1.0;
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_tilt = 0.0; double m_transform_y_tilt = 0.0;
inline double getTransformedValue(double x) inline double getTransformedValue(double x)
{ {
@ -574,7 +575,8 @@ public:
double v = GetInterpolatedNodeValue(temp); double v = GetInterpolatedNodeValue(temp);
double diff = 0.5 - v; double diff = 0.5 - v;
double scaled = 0.5 - m_transform_y_scale * diff; double scaled = 0.5 - m_transform_y_scale * diff;
double shifted = scaled + m_transform_y_shift + m_transform_y_sinus*sin(2*3.141592653*(x-m_transform_x_shift)*8.0); 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);
double tiltline = 0.5+m_transform_y_tilt*x; double tiltline = 0.5+m_transform_y_tilt*x;
double tilted = shifted+tiltline; double tilted = shifted+tiltline;
return jlimit(0.0,1.0,tilted); return jlimit(0.0,1.0,tilted);