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

Added sinus transform to envelope. Return proper value when not transformed.

Browse Source
This commit is contained in:
xenakios 2018-02-28 02:14:27 +02:00
parent d95c41e8aa
commit 8f747819e9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/envelope_component.cpp
View File

@ -331,6 +331,10 @@ bool EnvelopeComponent::keyPressed(const KeyPress & ev)
r = f(m_envelope->m_transform_y_scale,0.05); r = f(m_envelope->m_transform_y_scale,0.05);
if (ev == 'F') if (ev == 'F')
r = f(m_envelope->m_transform_y_scale,-0.05); r = f(m_envelope->m_transform_y_scale,-0.05);
if (ev == 'T')
r = f(m_envelope->m_transform_y_sinus,0.01);
if (ev == 'G')
r = f(m_envelope->m_transform_y_sinus,-0.01);
if (r==true) if (r==true)
{ {
repaint(); repaint();

10
Source/jcdp_envelope.h
View File

@ -562,22 +562,24 @@ public:
double m_transform_x_shift = 0.0; double m_transform_x_shift = 0.0;
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;
inline double getTransformedValue(double x) inline double getTransformedValue(double x)
{ {
if (isTransformed() == false) if (isTransformed() == false)
return x; return GetInterpolatedNodeValue(x);
double temp = fmod(x - m_transform_x_shift, 1.0); double temp = fmod(x - m_transform_x_shift, 1.0);
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 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; 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); return jlimit(0.0,1.0,shifted);
} }
bool isTransformed() const bool isTransformed() const
{ {
return m_transform_x_shift != 0.0 || m_transform_y_shift != 0.0 || m_transform_y_scale!=1.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;
} }
private: private:
nodes_t m_nodes; nodes_t m_nodes;