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

Allow toggling envelope transform X axis wrap

Browse Source
This commit is contained in:
xenakios 2018-03-03 15:25:16 +02:00
parent cfe2a2b971
commit 71221b41a1
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/envelope_component.cpp
View File

@ -230,6 +230,7 @@ void EnvelopeComponent::mouseDown(const MouseEvent & ev)
PopupMenu menu; PopupMenu menu;
menu.addItem(1, "Reset"); menu.addItem(1, "Reset");
menu.addItem(2, "Invert"); menu.addItem(2, "Invert");
menu.addItem(3, "Wrap envelope X transform", true, m_envelope->m_transform_wrap_x);
int r = menu.show(); int r = menu.show();
if (r == 1) if (r == 1)
{ {
@ -245,6 +246,10 @@ void EnvelopeComponent::mouseDown(const MouseEvent & ev)
m_envelope->GetNodeAtIndex(i).Value = val; m_envelope->GetNodeAtIndex(i).Value = val;
} }
} }
if (r == 3)
{
toggleBool(m_envelope->m_transform_wrap_x);
}
repaint(); repaint();
return; return;
} }

13
Source/jcdp_envelope.h
View File

@ -220,12 +220,14 @@ public:
"x", m_nodes[i].Time, "y", m_nodes[i].Value, "p1", m_nodes[i].ShapeParam1, "p2", m_nodes[i].ShapeParam2); "x", m_nodes[i].Time, "y", m_nodes[i].Value, "p1", m_nodes[i].ShapeParam1, "p2", m_nodes[i].ShapeParam2);
result.addChild(pt_tree, -1, nullptr); result.addChild(pt_tree, -1, nullptr);
} }
result.setProperty("wrapxtransform", m_transform_wrap_x, nullptr);
return result; return result;
} }
void restoreState(ValueTree state) void restoreState(ValueTree state)
{ {
if (state.isValid()==false) if (state.isValid()==false)
return; return;
m_transform_wrap_x = state.getProperty("wrapxtransform", false);
int numnodes = state.getNumChildren(); int numnodes = state.getNumChildren();
if (numnodes > 0) if (numnodes > 0)
{ {
@ -565,15 +567,20 @@ 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;
bool m_transform_wrap_x = false;
double m_min_pt_value = 0.0; double m_min_pt_value = 0.0;
double m_max_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)
return GetInterpolatedNodeValue(x); return GetInterpolatedNodeValue(x);
double temp = fmod(x - m_transform_x_shift, 1.0); double temp = x-m_transform_x_shift;
if (temp < 0.0) if (m_transform_wrap_x == true)
temp += 1.0; {
temp = fmod(x - m_transform_x_shift, 1.0);
if (temp < 0.0)
temp += 1.0;
}
double v = GetInterpolatedNodeValue(temp); double v = GetInterpolatedNodeValue(temp);
double center_v = m_minvalue + (m_maxvalue - m_minvalue) / 2.0; double center_v = m_minvalue + (m_maxvalue - m_minvalue) / 2.0;
double diff = center_v - v; double diff = center_v - v;