audio/chromaflock
2
0
Fork 0
mirror of https://codeberg.org/armin/chromaflock.git synced 2026-09-01 12:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix pitch bend mapping, add inertia when releasing

Browse source
This commit is contained in:
Armin 2026-07-15 21:24:04 +02:00
commit 6e37f224e1
4 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Source/PluginEditor.cpp
View file

@ -168,8 +168,8 @@ void VuMeter::paint(juce::Graphics& g) {
clipPath.addRoundedRectangle(bounds, 9.0f);
g.reduceClipRegion(clipPath);
juce::ColourGradient grad(juce::Colour(0xff00cc44).withAlpha(0.4f), 0.0f, bounds.getBottom(),
juce::Colour(0xffcc2200).withAlpha(0.4f), 0.0f, bounds.getY(), false);
juce::ColourGradient grad(juce::Colour(0xff00cc44).withAlpha(0.7f), 0.0f, bounds.getBottom(),
juce::Colour(0xffcc2200).withAlpha(0.7f), 0.0f, bounds.getY(), false);
g.setGradientFill(grad);
g.fillRoundedRectangle(innerBar, 2.0f);
}
@ -230,8 +230,8 @@ void WaveformDisplay::paint(juce::Graphics& g) {
clipPath.addRoundedRectangle(bounds, 9.0f);
g.reduceClipRegion(clipPath);
juce::ColourGradient waveGrad(juce::Colour(0xff00ff88).withAlpha(0.33f), 0.0f, bounds.getY(),
juce::Colour(0xff005522).withAlpha(0.12f), 0.0f, bounds.getBottom(), false);
juce::ColourGradient waveGrad(juce::Colour(0xff00ff88).withAlpha(0.5f), 0.0f, bounds.getY(),
juce::Colour(0xff005522).withAlpha(0.4f), 0.0f, bounds.getBottom(), false);
g.setGradientFill(waveGrad);
g.fillPath(filledPath);
@ -309,7 +309,7 @@ void SpectrumAnalyzer::paint(juce::Graphics& g) {
float bx = x + 1.0f;
float by = barBottom - barH;
g.setColour(juce::Colour(0xff00ff88).withAlpha(0.3f));
g.setColour(juce::Colour(0xff00ff88).withAlpha(0.4f));
g.fillRect(bx, by, bw, barH);
}
@ -1126,7 +1126,7 @@ void PianoRollComponent::paint(juce::Graphics& g) {
bool pressed = processor.isNoteActive(note);
if (pressed) {
g.setColour(juce::Colour(0xffccaa44).withAlpha(0.8f));
g.setColour(juce::Colour(0xffccaa44).withAlpha(0.7f));
} else {
juce::ColourGradient grad(juce::Colour(0xffe4e4e4).withAlpha(0.7f), static_cast<float>(kx), 0.0f,
juce::Colour(0xffc8c8c8).withAlpha(0.7f), static_cast<float>(kx), static_cast<float>(whiteKeyHeight), false);
@ -1179,12 +1179,9 @@ void PianoRollComponent::paint(juce::Graphics& g) {
void PianoRollComponent::mouseDown(const juce::MouseEvent& e) {
auto pos = e.getPosition();
// Pitch bend strip
// Pitch bend strip: ignore plain clicks — require a vertical drag (see mouseDrag)
if (pos.x < pitchBendWidth) {
float pbNorm = 1.0f - static_cast<float>(pos.y) / static_cast<float>(whiteKeyHeight);
pbNorm = std::clamp(pbNorm, -1.0f, 1.0f);
currentPitchBend = 64 + static_cast<int>(pbNorm * 64.0f);
processor.pitchBendValue.store(pbNorm);
pitchBendDragging = false;
return;
}
@ -1199,14 +1196,13 @@ void PianoRollComponent::mouseDown(const juce::MouseEvent& e) {
}
void PianoRollComponent::mouseUp(const juce::MouseEvent& e) {
// Reset pitch bend to center on release
if (e.getPosition().x < pitchBendWidth || lastTriggeredNote < 0) {
if (e.getPosition().x < pitchBendWidth) {
currentPitchBend = 64;
processor.pitchBendValue.store(0.0f);
repaint();
}
if (lastTriggeredNote < 0) return;
// Reset pitch bend to center on release (only if it was actually dragged)
if (pitchBendDragging) {
pitchBendDragging = false;
pitchBendGliding = true;
pitchBendGlideStart = static_cast<float>(currentPitchBend - 64) / 64.0f;
pitchBendGlideStartMs = juce::Time::currentTimeMillis();
repaint();
}
if (lastTriggeredNote >= 0) {
@ -1216,12 +1212,33 @@ void PianoRollComponent::mouseUp(const juce::MouseEvent& e) {
}
}
void PianoRollComponent::timerCallback() {
if (pitchBendGliding) {
float t = static_cast<float>(juce::Time::currentTimeMillis() - pitchBendGlideStartMs)
/ static_cast<float>(pitchBendGlideMs);
if (t >= 1.0f) {
pitchBendGliding = false;
currentPitchBend = 64;
processor.pitchBendValue.store(0.0f);
} else {
float pbNorm = pitchBendGlideStart * (1.0f - t);
currentPitchBend = 64 + static_cast<int>(pbNorm * 64.0f);
processor.pitchBendValue.store(pbNorm);
}
repaint();
} else {
repaint();
}
}
void PianoRollComponent::mouseDrag(const juce::MouseEvent& e) {
auto pos = e.getPosition();
// Pitch bend drag
// Pitch bend drag — only while touching the strip
if (pos.x < pitchBendWidth) {
float pbNorm = 1.0f - static_cast<float>(pos.y) / static_cast<float>(whiteKeyHeight);
pitchBendDragging = true;
pitchBendGliding = false;
float pbNorm = 1.0f - 2.0f * static_cast<float>(pos.y) / static_cast<float>(whiteKeyHeight);
pbNorm = std::clamp(pbNorm, -1.0f, 1.0f);
currentPitchBend = 64 + static_cast<int>(pbNorm * 64.0f);
processor.pitchBendValue.store(pbNorm);