self-mod graphing no longer results in a crash, still doesn't look right

hsetlik · Apr 15, 2021 · 8f2394a · 8f2394a
1 parent 9e8461f
commit 8f2394a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/Source/AlgorithmGraphComponent.cpp b/Source/AlgorithmGraphComponent.cpp
@@ -28,12 +28,29 @@ void OperatorBox::paint(juce::Graphics &g)
 
 void AlgorithmGraph::addPath(std::pair<int, int> from, std::pair<int, int> to)
 {
- paths.add(new juce::Path());
- auto path = paths.getLast();
- auto p1 = getCellCenter(from.first, from.second);
- auto p3 = getCellCenter(to.first, to.second);
- path->startNewSubPath(p1.first, p1.second);
- path->lineTo(p3.first, p3.second);
+ if(from != to)
+ {
+ paths.add(new juce::Path());
+ auto path = paths.getLast();
+ auto p1 = getCellCenter(from.first, from.second);
+ auto p3 = getCellCenter(to.first, to.second);
+ path->startNewSubPath(p1.first, p1.second);
+ path->lineTo(p3.first, p3.second);
+ }
+ if(from == to)
+ {
+ auto p1 = getCellCenter(from.first, from.second);
+ auto leftX = p1.first - (AlgorithmGridConstants::cellSideLength * 0.8f);
+ auto topY = p1.second - (AlgorithmGridConstants::cellSideLength * 0.8f);
+ auto p2 = std::make_pair(leftX, p1.second);
+ auto p3 = std::make_pair(leftX, topY);
+ paths.add(new juce::Path());
+ auto path = paths.getLast();
+ path->startNewSubPath(p1.first, p1.second);
+ path->lineTo(p2.first, p2.second);
+ path->lineTo(p3.first, p3.second);
+ path->closeSubPath();
+ }
 }
 
 void AlgorithmGraph::timerCallback()
@@ -208,7 +225,8 @@ void AlgorithmGraph::paint(juce::Graphics &g)
  {
  auto endPoint = std::make_pair(dest->gridX, dest->gridY);
  addPath(startPoint, endPoint);
- g.strokePath(*paths.getLast(), strokeWeight);
+ auto path = *paths.getLast();
+ g.strokePath(path, strokeWeight);
  }
  }
  for(auto op : opBoxes)

diff --git a/Source/DAHDSR.h b/Source/DAHDSR.h
@@ -86,8 +86,7 @@ class DAHDSR
  {
  if(input > 0)
  return input;
- else
- return 1;
+ return 1;
  }
  envPhase currentPhase;
  unsigned long long samplesIntoPhase;

diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
@@ -46,9 +46,9 @@ juce::AudioProcessorValueTreeState::ParameterLayout createLayout(int numOperator
  auto sustainName = "Operator " + iStr + " sustain";
  auto releaseId = "releaseParam" + iStr;
  auto releaseName = "Operator " + iStr + " release";
- juce::NormalisableRange<float> timeRange1(1.0f, 20000.0f, 0.1f, 0.5f);
+ juce::NormalisableRange<float> timeRange1(1.0f, 20000.0f, 0.5f, 0.5f);
  timeRange1.setSkewForCentre(1000.0f);
- juce::NormalisableRange<float> timeRange2(1.0f, 20000.0f, 0.1f, 0.5f);
+ juce::NormalisableRange<float> timeRange2(1.0f, 20000.0f, 0.5f, 0.5f);
  timeRange2.setSkewForCentre(5000.0f);
  layout.add(std::make_unique<juce::AudioParameterFloat>(delayId, delayName, timeRange2, 0.0f));
  layout.add(std::make_unique<juce::AudioParameterFloat>(attackId, attackName, timeRange1, 20.0f));