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

Added tilt transform for envelopes

Browse Source
This commit is contained in:
xenakios 2018-02-28 05:38:19 +02:00
parent e7011d4acb
commit b4c3b026e1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/envelope_component.cpp
View File

@ -335,6 +335,10 @@ bool EnvelopeComponent::keyPressed(const KeyPress & ev)
r = f(m_envelope->m_transform_y_sinus,0.01); r = f(m_envelope->m_transform_y_sinus,0.01);
if (ev == 'G') if (ev == 'G')
r = f(m_envelope->m_transform_y_sinus,-0.01); r = f(m_envelope->m_transform_y_sinus,-0.01);
if (ev == 'Y')
r = f(m_envelope->m_transform_y_tilt,0.02);
if (ev == 'H')
r = f(m_envelope->m_transform_y_tilt,-0.02);
if (r==true) if (r==true)
{ {
repaint(); repaint();

7
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_tilt = 0.0;
inline double getTransformedValue(double x) inline double getTransformedValue(double x)
{ {
if (isTransformed() == false) if (isTransformed() == false)
@ -574,12 +575,14 @@ public:
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)*8.0);
return jlimit(0.0,1.0,shifted); double tiltline = 0.5+m_transform_y_tilt*x;
double tilted = shifted+tiltline;
return jlimit(0.0,1.0,tilted);
} }
bool isTransformed() const bool isTransformed() const
{ {
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_scale!=1.0 || m_transform_y_sinus!=0.0 || m_transform_y_tilt!=0.0;
} }
private: private:
nodes_t m_nodes; nodes_t m_nodes;