Updated nanovg, stb_truetype and stb_image. (BespokeSynth#1585)

* Updated nanovg, stb_truetype and stb_image. * fix up all (hopefully!) fonts to be -2 across the board, which seems to make everything align with bespoke's old font sizes --------- Co-authored-by: Ryan Challinor <[email protected]> ***NO_CI***
PowerUser64 · Jun 14, 2024 · 2a2b7a4 · 2a2b7a4
1 parent 5f9c822
commit 2a2b7a4
Show file tree

Hide file tree

Showing 44 changed files with 9,934 additions and 4,325 deletions.
diff --git a/Source/ADSRDisplay.cpp b/Source/ADSRDisplay.cpp
@@ -269,7 +269,7 @@ void ADSRDisplay::Render()
             ofRect(0, 0, mWidth, 10);
             ofRect(ofMap(mMaxTime, 10, 10000, 0, mWidth - 3, K(clamp)), 0, 3, 10);
             ofSetColor(255, 255, 255, .8f * gModuleDrawAlpha);
-            DrawTextNormal(ofToString(mMaxTime, 0) + " ms", 3, 8, 10);
+            DrawTextNormal(ofToString(mMaxTime, 0) + " ms", 3, 8, 8);
             break;
          case kAdjustAttackAR:
             ofRect(0, 0, mWidth * .5f, mHeight);

diff --git a/Source/Arpeggiator.cpp b/Source/Arpeggiator.cpp
@@ -96,8 +96,8 @@ void Arpeggiator::DrawModule()
       }
       else
       {
-         float w = gFont.GetStringWidth(pad, 15);
-         DrawTextNormal(GetArpNoteDisplay(mChord[i].pitch), 5 + w + pad.length() / 5.0f, 16);
+         float w = gFont.GetStringWidth(pad, 13);
+         DrawTextNormal(GetArpNoteDisplay(mChord[i].pitch), 6 + w, 16);
          break;
       }
    }

diff --git a/Source/CanvasElement.cpp b/Source/CanvasElement.cpp
@@ -552,7 +552,7 @@ void SampleCanvasElement::DrawContents(bool clamp, bool wrapped, ofVec2f offset)
       float lengthOriginalSpeed = lengthMs / TheTransport->GetDuration(sampleCanvas->GetInterval());
       float speed = lengthOriginalSpeed / mLength;
       ofSetColor(255, 255, 255);
-      DrawTextBold(ofToString(speed, 2), rect.x + 3, rect.y + 10, 12);
+      DrawTextBold(ofToString(speed, 2), rect.x + 3, rect.y + 10, 10);
    }
 
    if (mMute)

diff --git a/Source/ChaosEngine.cpp b/Source/ChaosEngine.cpp
@@ -252,10 +252,10 @@ void ChaosEngine::DrawModule()
 
    if (!mHideBeat)
       gFont.DrawString(ofToString(beat), 42, 10, 50);
-   gFont.DrawString(ofToString(TheTransport->GetTimeSigTop()) + "/" + ofToString(TheTransport->GetTimeSigBottom()), 42, 90, 50);
-   gFont.DrawString(ofToString(TheTransport->GetTempo(), 0) + "bpm", 42, 230, 50);
+   gFont.DrawString(ofToString(TheTransport->GetTimeSigTop()) + "/" + ofToString(TheTransport->GetTimeSigBottom()), 40, 90, 50);
+   gFont.DrawString(ofToString(TheTransport->GetTempo(), 0) + "bpm", 420, 230, 50);
 
-   gFont.DrawString(NoteName(TheScale->ScaleRoot()) + " " + TheScale->GetType(), 42, 10, 100);
+   gFont.DrawString(NoteName(TheScale->ScaleRoot()) + " " + TheScale->GetType(), 40, 10, 100);
 
    DrawKeyboard(10, 150);
    DrawGuitar(10, 285);
@@ -280,7 +280,7 @@ void ChaosEngine::DrawModule()
       Chord displayChord;
       displayChord.SetFromDegreeAndScale(mChordProgression[i].mDegree, scale);
       displayChord.mInversion = mChordProgression[i].mInversion;
-      gFont.DrawString(displayChord.Name(true, false, &scale), 48, x, y);
+      gFont.DrawString(displayChord.Name(true, false, &scale), 46, x, y);
 
       std::string accidentalList;
       for (int j = 0; j < mChordProgression[i].mAccidentals.size(); ++j)

diff --git a/Source/CodeEntry.cpp b/Source/CodeEntry.cpp
@@ -1337,8 +1337,8 @@ void CodeEntry::SetStyleFromJSON(const ofxJSONElement& vdict)
 {
    auto fs = vdict.get("font-size", 14);
    auto fsi = fs.asInt();
-   if (fsi > 2 && fsi < 200)
-      mFontSize = fsi;
+   if (fsi > 4 && fsi < 200)
+      mFontSize = fsi - 2;
 
    auto fromRGB = [vdict](const std::string& key, ofColor& onto)
    {

diff --git a/Source/CodeEntry.h b/Source/CodeEntry.h
@@ -207,5 +207,5 @@ class CodeEntry : public IUIControl, public IKeyboardFocusListener
    ofColor jediParamsHighlight{ 230, 230, 255 };
    ofColor unknownColor = ofColor::white;
 
-   float mFontSize{ 14 };
+   float mFontSize{ 12 };
 };
diff --git a/Source/DotGrid.cpp b/Source/DotGrid.cpp
@@ -147,7 +147,7 @@ void DotGrid::Render()
                {
                   DotData& data = mData[GetDataIndex(mCurrentHover.mCol, mCurrentHover.mRow)];
                   ofSetColor(0, 255, 0);
-                  DrawTextNormal(ofToString(data.mVelocity, 2), GetX(i), GetY(j), 10.0f);
+                  DrawTextNormal(ofToString(data.mVelocity, 2), GetX(i), GetY(j), 8.0f);
                }
             }
             else

diff --git a/Source/DotSequencer.cpp b/Source/DotSequencer.cpp
@@ -135,7 +135,7 @@ void DotSequencer::DrawModule()
          ofSetColor(128, 128, 128, gModuleDrawAlpha * .8f);
       }
 
-      float scale = std::min(mDotGrid->IClickable::GetDimensions().y / mDotGrid->GetRows(), 12.0f);
+      float scale = std::min(mDotGrid->IClickable::GetDimensions().y / mDotGrid->GetRows() - 2, 10.0f);
       DrawTextRightJustify(NoteName(RowToPitch(i), false, true) + "(" + ofToString(RowToPitch(i)) + ")", pos.x - 3, pos.y - ysize * .5f + (scale / 2), scale);
    }
    ofPopStyle();

diff --git a/Source/DrumPlayer.cpp b/Source/DrumPlayer.cpp
@@ -839,7 +839,7 @@ void DrumPlayer::DrawModule()
             }
 
             ofSetColor(255, 255, 255, gModuleDrawAlpha);
-            gFont.DrawStringWrap(mDrumHits[sampleIdx].mSample.Name(), 12, i * 70 + 5, j * 70 + 10, 60);
+            gFont.DrawStringWrap(mDrumHits[sampleIdx].mSample.Name(), 10, i * 70 + 5, j * 70 + 10, 60);
          }
       }
       ofPopStyle();

diff --git a/Source/FubbleModule.cpp b/Source/FubbleModule.cpp
@@ -309,7 +309,7 @@ void FubbleModule::DrawModuleUnclipped()
    if (Minimized() || IsVisible() == false)
       return;
 
-   DrawTextNormal("(concept by @_ojack_)", 60, -3, 11);
+   DrawTextNormal("(concept by @_ojack_)", 60, -3, 9);
 }
 
 ofRectangle FubbleModule::GetFubbleRect()

diff --git a/Source/GridModule.cpp b/Source/GridModule.cpp
@@ -146,7 +146,7 @@ void GridModule::DrawModule()
    for (int i = 0; i < mGrid->GetRows() && i < (int)mLabels.size(); ++i)
    {
       ofVec2f pos = mGrid->GetCellPosition(0, i) + mGrid->GetPosition(true);
-      float scale = MIN(mGrid->IClickable::GetDimensions().y / mGrid->GetRows(), 12);
+      float scale = MIN(mGrid->IClickable::GetDimensions().y / mGrid->GetRows() - 2, 10);
       DrawTextNormal(mLabels[i], 2, pos.y - (scale / 8), scale);
    }
    ofPopStyle();

diff --git a/Source/IDrawableModule.cpp b/Source/IDrawableModule.cpp
@@ -353,7 +353,7 @@ void IDrawableModule::DrawFrame(float w, float h, bool drawModule, float& titleB
    if (HasTitleBar())
    {
       ofSetColor(color * (1 - GetBeaconAmount()) + ofColor::yellow * GetBeaconAmount(), gModuleDrawAlpha);
-      DrawTextBold(GetTitleLabel(), 5 + enableToggleOffset, 10 - titleBarHeight, 16);
+      DrawTextBold(GetTitleLabel(), 5 + enableToggleOffset, 10 - titleBarHeight, 14);
    }
 
    bool groupSelected = !TheSynth->GetGroupSelectedModules().empty() && VectorContains(this, TheSynth->GetGroupSelectedModules());
@@ -853,7 +853,7 @@ float IDrawableModule::GetMinimizedWidth()
    if (titleLabel != mLastTitleLabel)
    {
       mLastTitleLabel = titleLabel;
-      mTitleLabelWidth = gFont.GetStringWidth(GetTitleLabel(), 16);
+      mTitleLabelWidth = gFont.GetStringWidth(GetTitleLabel(), 14);
    }
    float width = mTitleLabelWidth;
    width += 10; //padding

diff --git a/Source/KeyboardDisplay.cpp b/Source/KeyboardDisplay.cpp
@@ -250,7 +250,7 @@ void KeyboardDisplay::DrawKeyboard(int x, int y, int w, int h)
       for (int i = 0; i < NumKeys(); i += 7)
       {
          ofSetColor(108, 37, 62, 255);
-         DrawTextNormal("C" + std::to_string(oct), keySpace * 0.5f - 6.5f + i * keySpace, h - 8, 14);
+         DrawTextNormal("C" + std::to_string(oct), keySpace * 0.5f - 6.5f + i * keySpace, h - 8, 12);
          oct++;
       }
    }

diff --git a/Source/LabelDisplay.cpp b/Source/LabelDisplay.cpp
@@ -66,9 +66,9 @@ void LabelDisplay::CreateUIControls()
    UIBLOCK_SHIFTRIGHT();
    INTSLIDER(mLabelSizeSlider, "size", &mLabelSize, 25, 500);
    UIBLOCK_SHIFTRIGHT();
-   DROPDOWN(mLabelFontDropdown, "font", &mLabelFontIndex, 60);
+   DROPDOWN(mLabelFontDropdown, "font", &mLabelFontIndex, 90);
    UIBLOCK_SHIFTRIGHT();
-   DROPDOWN(mLabelColorDropdown, "color", &mLabelColorIndex, 60);
+   DROPDOWN(mLabelColorDropdown, "color", &mLabelColorIndex, 72);
    ENDUIBLOCK(mWidth, mHeight);
 
    for (int i = 0; i < mFonts.size(); i++)

diff --git a/Source/LabelDisplay.h b/Source/LabelDisplay.h
@@ -68,7 +68,7 @@ class LabelDisplay : public IDrawableModule, public ITextEntryListener, public I
 
    char mLabel[MAX_TEXTENTRY_LENGTH]{ "Label" };
    TextEntry* mLabelEntry{ nullptr };
-   int mLabelSize{ 42 };
+   int mLabelSize{ 40 };
    IntSlider* mLabelSizeSlider{ nullptr };
 
    RetinaTrueTypeFont mLabelFont{ gFont };

diff --git a/Source/LaunchpadKeyboard.cpp b/Source/LaunchpadKeyboard.cpp
@@ -464,7 +464,7 @@ void LaunchpadKeyboard::DrawModuleUnclipped()
       DrawTextNormal(mDebugDisplayText, 0, 90);
 
       for (int i = 0; i < 128; ++i)
-         DrawTextNormal(ofToString(i) + " " + ofToString(mCurrentNotes[i]), 180 + (i / 24) * 20, (i % 24) * 9, 8);
+         DrawTextNormal(ofToString(i) + " " + ofToString(mCurrentNotes[i]), 180 + (i / 24) * 20, (i % 24) * 9, 6);
    }
 }
 

diff --git a/Source/MidiController.cpp b/Source/MidiController.cpp
@@ -936,13 +936,13 @@ void MidiController::DrawModule()
       else
          ofSetColor(255, 0, 0, 255 * (1 - (gTime - mLastActivityTime) / 200));
       ofFill();
-      ofRect(30 + gFont.GetStringWidth(Name(), 15), -11, 10, 10);
+      ofRect(30 + gFont.GetStringWidth(Name(), 13), -11, 10, 10);
       ofPopStyle();
    }
 
    if (!mIsConnected)
    {
-      float xStart = 30 + gFont.GetStringWidth(Name(), 15);
+      float xStart = 30 + gFont.GetStringWidth(Name(), 13);
       float yStart = -11;
 
       ofPushStyle();
@@ -1179,7 +1179,7 @@ void MidiController::DrawModule()
       ofPopStyle();
 
       if (mLayoutLoadError != "")
-         gFont.DrawStringWrap(mLayoutLoadError, 15, 3, kLayoutControlsY + 160, 235);
+         gFont.DrawStringWrap(mLayoutLoadError, 13, 3, kLayoutControlsY + 160, 235);
 
       if (mHighlightedLayoutElement != -1)
       {

diff --git a/Source/ModularSynth.cpp b/Source/ModularSynth.cpp
@@ -513,7 +513,7 @@ void ModularSynth::Draw(void* vg)
       DrawFallbackText(("bespoke " + GetBuildInfoString()).c_str(), 100, 50);
 
       if (gFont.IsLoaded())
-         DrawTextNormal(mFatalError, 100, 100, 20);
+         DrawTextNormal(mFatalError, 100, 100, 18);
       else
          DrawFallbackText(mFatalError.c_str(), 100, 100);
    }
@@ -532,14 +532,14 @@ void ModularSynth::Draw(void* vg)
    if (gTime == 1 && mFatalError == "")
    {
       std::string loading("Bespoke is initializing audio...");
-      DrawTextNormal(loading, ofGetWidth() / 2 - GetStringWidth(loading, 30) / 2, ofGetHeight() / 2 - 6, 30);
+      DrawTextNormal(loading, ofGetWidth() / 2 - GetStringWidth(loading, 28) / 2, ofGetHeight() / 2 - 6, 28);
       return;
    }
 
    if (!mInitialized && mFatalError == "")
    {
       std::string loading("Bespoke is loading...");
-      DrawTextNormal(loading, ofGetWidth() / 2 - GetStringWidth(loading, 30) / 2, ofGetHeight() / 2 - 6, 30);
+      DrawTextNormal(loading, ofGetWidth() / 2 - GetStringWidth(loading, 28) / 2, ofGetHeight() / 2 - 6, 28);
       return;
    }
 
@@ -786,7 +786,7 @@ void ModularSynth::Draw(void* vg)
 
       float maxWidth = 300;
 
-      float fontSize = 15;
+      float fontSize = 13;
       nvgFontFaceId(gNanoVG, gFont.GetFontHandle());
       nvgFontSize(gNanoVG, fontSize);
       float bounds[4];
@@ -934,7 +934,7 @@ void ModularSynth::DrawConsole()
             ofSetColor(255, 255, 0);
          else
             ofSetColor(255, 255, 255);
-         gFontFixedWidth.DrawString(it->text, 15, 10, consoleY);
+         gFontFixedWidth.DrawString(it->text, 13, 10, consoleY);
          std::vector<std::string> lines = ofSplitString(it->text, "\n");
          ofPopStyle();
          consoleY += 15 * lines.size();
@@ -947,7 +947,7 @@ void ModularSynth::DrawConsole()
          ofSetColor(255, 0, 0);
          for (auto it = mErrors.begin(); it != mErrors.end(); ++it)
          {
-            gFontFixedWidth.DrawString(*it, 15, 600, consoleY);
+            gFontFixedWidth.DrawString(*it, 13, 600, consoleY);
             std::vector<std::string> lines = ofSplitString(*it, "\n");
             consoleY += 15 * lines.size();
          }

diff --git a/Source/NoteCanvas.cpp b/Source/NoteCanvas.cpp
@@ -357,7 +357,7 @@ void NoteCanvas::DrawModule()
       int pitch = 127 - mCanvas->GetRowOffset() - i;
       float boxHeight = (float(mCanvas->GetHeight()) / mCanvas->GetNumVisibleRows());
       float y = mCanvas->GetPosition(true).y + i * boxHeight;
-      float scale = MIN(boxHeight, 20);
+      float scale = MIN(boxHeight - 2, 18);
       DrawTextNormal(NoteName(pitch, false, true) + "(" + ofToString(pitch) + ")", mCanvas->GetPosition(true).x + 2, y - (scale / 8) + boxHeight, scale);
    }
    ofPopStyle();

diff --git a/Source/NoteStepSequencer.cpp b/Source/NoteStepSequencer.cpp
@@ -240,7 +240,7 @@ void NoteStepSequencer::DrawModule()
    for (int i = 0; i < mGrid->GetRows(); ++i)
    {
       ofVec2f pos = mGrid->GetCellPosition(0, i - 1) + mGrid->GetPosition(true);
-      float scale = MIN(mGrid->IClickable::GetDimensions().y / mGrid->GetRows(), 20);
+      float scale = MIN(mGrid->IClickable::GetDimensions().y / mGrid->GetRows() - 2, 18);
       DrawTextNormal(NoteName(RowToPitch(i), false, true) + "(" + ofToString(RowToPitch(i)) + ")", pos.x + 1, pos.y - (scale / 8), scale);
    }
    ofPopStyle();

diff --git a/Source/NoteTable.cpp b/Source/NoteTable.cpp
@@ -137,7 +137,7 @@ void NoteTable::DrawModule()
    for (int i = 0; i < mGrid->GetRows(); ++i)
    {
       ofVec2f pos = mGrid->GetCellPosition(0, i - 1) + mGrid->GetPosition(true);
-      float scale = MIN(mGrid->IClickable::GetDimensions().y / mGrid->GetRows(), 20);
+      float scale = MIN(mGrid->IClickable::GetDimensions().y / mGrid->GetRows() - 2, 18);
       DrawTextNormal(NoteName(RowToPitch(i), false, true) + "(" + ofToString(RowToPitch(i)) + ")", pos.x + 4, pos.y - (scale / 8), scale);
    }
    ofPopStyle();

diff --git a/Source/OutputChannel.cpp b/Source/OutputChannel.cpp
@@ -175,7 +175,7 @@ void OutputChannel::DrawModule()
       {
          ofPushStyle();
          ofSetColor(ofColor::red);
-         DrawTextBold("clipped", kPaddingOutside + 10, 20 + i * (kBarHeight + 2) + 8, 12.0f);
+         DrawTextBold("clipped", kPaddingOutside + 10, 20 + i * (kBarHeight + 2) + 8, 10.0f);
          ofPopStyle();
       }
    }

diff --git a/Source/PanicButton.cpp b/Source/PanicButton.cpp
@@ -42,13 +42,13 @@ void PanicButton::OnClicked(float x, float y, bool right)
 
 void PanicButton::DrawModule()
 {
-   gFont.DrawString("If anything goes horribly awry, click this\nand the party will be restored", 15, 5, 12);
+   gFont.DrawString("If anything goes horribly awry, click this\nand the party will be restored", 13, 5, 12);
 
    ofPushStyle();
    ofFill();
    ofSetColor(70, 0, 0);
    ofRect(10, 40, 270, 80);
    ofSetColor(255, 0, 0);
-   gFont.DrawString("PANIC", 108, 15, 115);
+   gFont.DrawString("PANIC", 106, 15, 115);
    ofPopStyle();
 }
diff --git a/Source/PatchCable.cpp b/Source/PatchCable.cpp
@@ -400,7 +400,7 @@ void PatchCable::Render()
             ofSetColor(255, 255, 0);
             ofCircle(cable.plug.x, cable.plug.y, 6);
             ofSetColor(0, 0, 0);
-            DrawTextBold("!", cable.plug.x - 2, cable.plug.y + 5, 17);
+            DrawTextBold("!", cable.plug.x - 2, cable.plug.y + 5, 15);
          }
       }
       else

diff --git a/Source/Profiler.cpp b/Source/Profiler.cpp
@@ -139,7 +139,7 @@ void Profiler::Draw()
       long maxCost = cost.MaxCost();
 
       ofSetColor(255, 255, 255);
-      gFont.DrawString(std::string(sCosts[i].mName) + ": " + ofToString(maxCost / 1000), 15, 0, 0);
+      gFont.DrawString(std::string(sCosts[i].mName) + ": " + ofToString(maxCost / 1000), 13, 0, 0);
 
       if (maxCost > entireFrameUs)
          ofSetColor(255, 0, 0);

diff --git a/Source/Push2Control.cpp b/Source/Push2Control.cpp
@@ -510,7 +510,7 @@ void Push2Control::DrawToFramebuffer(NVGcontext* vg, NVGLUframebuffer* fb, float
          ofRect(1, 1, ableton::Push2DisplayBitmap::kWidth - 2, ableton::Push2DisplayBitmap::kHeight - 2);
 
          ofSetColor(0, 0, 0);
-         DrawTextBold(stateInfo, 10, 147, 20);
+         DrawTextBold(stateInfo, 10, 147, 18);
 
          ofPopStyle();
       }
@@ -530,14 +530,14 @@ void Push2Control::DrawToFramebuffer(NVGcontext* vg, NVGLUframebuffer* fb, float
             ofSetColor(IDrawableModule::GetColor(TheSynth->GetModuleFactory()->GetModuleCategory(moduleTypeToSpawn)));
             text = "\ntap grid to spawn " + moduleTypeToSpawn;
          }
-         DrawTextBold(text, 5, 80, 20);
+         DrawTextBold(text, 5, 80, 18);
 
          ofSetColor(IDrawableModule::GetColor(kModuleCategory_Other));
          ofNoFill();
 
          ofTranslate(-kColumnSpacing * mModuleViewOffsetSmoothed, 0);
 
-         nvgFontSize(sVG, 16);
+         nvgFontSize(sVG, 12);
          DrawControls(mButtonControls, false, 60);
          DrawControls(mSliderControls, true, 20);
       }
@@ -1103,9 +1103,9 @@ void Push2Control::DrawControls(std::vector<IUIControl*> controls, bool sliders,
       if (adsr == nullptr)
       {
          if (mDisplayModule == this)
-            DrawTextBold(juce::String(controls[i]->Path()).replace("~", "\n").toRawUTF8(), kColumnSpacing * i + 3, yPos - 12, 10);
+            DrawTextBold(juce::String(controls[i]->Path()).replace("~", "\n").toRawUTF8(), kColumnSpacing * i + 3, yPos - 12, 8);
          else
-            DrawTextBold(controls[i]->Name(), kColumnSpacing * i + 3, yPos - 5, 16);
+            DrawTextBold(controls[i]->Name(), kColumnSpacing * i + 3, yPos - 5, 14);
       }
       controls[i]->Render();
       ofPopStyle();

diff --git a/Source/QuickSpawnMenu.cpp b/Source/QuickSpawnMenu.cpp
@@ -471,9 +471,9 @@ void QuickSpawnMenu::DrawModule()
 void QuickSpawnMenu::DrawModuleUnclipped()
 {
    if (mMenuMode == MenuMode::SingleLetter)
-      DrawTextBold(mHeldKeys.toStdString(), 3, -2, 17);
+      DrawTextBold(mHeldKeys.toStdString(), 3, -2, 15);
    if (mMenuMode == MenuMode::Search)
-      DrawTextBold(mSearchString.toStdString(), 3, -2, 17);
+      DrawTextBold(mSearchString.toStdString(), 3, -2, 15);
 }
 
 bool QuickSpawnMenu::MouseMoved(float x, float y)

diff --git a/Source/SampleBrowser.cpp b/Source/SampleBrowser.cpp
@@ -72,7 +72,7 @@ void SampleBrowser::DrawModule()
    if (Minimized() || IsVisible() == false)
       return;
 
-   float fontSize = 15;
+   float fontSize = 13;
    float stringWidth = gFont.GetStringWidth(mCurrentDirectory.toStdString(), fontSize);
    float moduleWidth, moduleHeight;
    GetModuleDimensions(moduleWidth, moduleHeight);