style UI issues

Author: innermost47

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(BeatCrafter VERSION 0.1.0)
+project(BeatCrafter VERSION 0.1.1)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -29,7 +29,7 @@ juce_add_plugin(BeatCrafter
     NEEDS_MIDI_OUTPUT TRUE
     PRODUCES_MIDI_OUTPUT TRUE
     PRODUCT_NAME "BeatCrafter"
-    BUNDLE_ID "com.beatcrafter.beatcrafter"
+    BUNDLE_ID "com.innermost47.beatcrafter"
 )
 
 target_sources(BeatCrafter
@@ -64,6 +64,7 @@ juce_add_binary_data(BeatCrafterData
         resources/phosphor/ear.svg
         resources/phosphor/link-simple-break.svg
         resources/phosphor/wave-sine.svg
+        resources/phosphor/number-three.svg
 )
 
 set_target_properties(BeatCrafterData PROPERTIES

resources/phosphor/number-three.svg

@@ -121,12 +121,14 @@ namespace BeatCrafter
 		double ppqPosition = posInfo.getPpqPosition().orFallback(0.0);
 		int currentMeasure = static_cast<int>(ppqPosition / 4.0);
 		double beatsPerSecond = bpm / 60.0;
-		double sixteenthsPerSecond = beatsPerSecond * 4.0;
-		samplesPerStep = static_cast<int>(sampleRate / sixteenthsPerSecond);
+		double stepsPerBeat = perfParams.tripletMode ? 3.0 : 4.0;
+		double stepsPerSecond = beatsPerSecond * stepsPerBeat;
+		samplesPerStep = static_cast<int>(sampleRate / stepsPerSecond);
 		auto& pattern = *slots[activeSlot];
 		int patternLength = pattern.getLength();
-		double ppqPerStep = 0.25;
-		int currentStepFromPPQ = static_cast<int>(ppqPosition / ppqPerStep) % patternLength;
+		double ppqPerStep = perfParams.tripletMode ? (1.0 / 3.0) : 0.25;
+		int effectiveLength = perfParams.tripletMode ? 12 : patternLength;
+		int currentStepFromPPQ = static_cast<int>(ppqPosition / ppqPerStep) % effectiveLength;
 		updateSurpriseMe(currentMeasure, ppqPosition);
 		if (currentStepFromPPQ != pattern.getCurrentStep() ||
 			(currentStepFromPPQ == 0 && ppqPosition < 0.1))

src/Core/PatternEngine.cpp

@@ -17,26 +17,26 @@ namespace BeatCrafter
 			bool humanizeEnabled = true;
 			float humanizeAmount = 0.08f;
 			float omitChance = 0.05f;
-
+			bool  tripletMode = false;
 			bool surpriseMeEnabled = false;
 			float surpriseMeRange = 0.15f;
 		};
 
 		PatternEngine();
 		~PatternEngine() = default;
 
-		Pattern &getCurrentPattern() { return slots[activeSlot] ? *slots[activeSlot] : dummyPattern; }
-		const Pattern &getCurrentPattern() const { return *slots[activeSlot]; }
-		const Pattern *getDisplayPattern() const { return &intensifiedPatternCache; }
-		Pattern *getCurrentBasePattern() { return slots[activeSlot].get(); }
-		Pattern *getSlot(int index) { return (index >= 0 && index < 8 && slots[index]) ? slots[index].get() : nullptr; }
+		Pattern& getCurrentPattern() { return slots[activeSlot] ? *slots[activeSlot] : dummyPattern; }
+		const Pattern& getCurrentPattern() const { return *slots[activeSlot]; }
+		const Pattern* getDisplayPattern() const { return &intensifiedPatternCache; }
+		Pattern* getCurrentBasePattern() { return slots[activeSlot].get(); }
+		Pattern* getSlot(int index) { return (index >= 0 && index < 8 && slots[index]) ? slots[index].get() : nullptr; }
 
 		PerformanceParams perfParams;
 
 		void loadPatternToSlot(std::unique_ptr<Pattern> pattern, int slot);
 		void generateNewPattern(StyleType style, float complexity = 0.5f);
 		void generateNewPatternForSlot(int slot, StyleType style, float complexity = 0.5f);
-		Pattern applyIntensity(const Pattern &basePattern, float intensity) const;
+		Pattern applyIntensity(const Pattern& basePattern, float intensity) const;
 
 		void switchToSlot(int slot, bool immediate = false, float intensity = -1.0f);
 		int getActiveSlot() const { return activeSlot; }
@@ -87,10 +87,10 @@ namespace BeatCrafter
 		void resetToStart();
 		bool getIsPlaying() const { return isPlaying; }
 
-		void processBlock(juce::MidiBuffer &midiMessages,
-						  int numSamples,
-						  double sampleRate,
-						  const juce::AudioPlayHead::PositionInfo &posInfo);
+		void processBlock(juce::MidiBuffer& midiMessages,
+			int numSamples,
+			double sampleRate,
+			const juce::AudioPlayHead::PositionInfo& posInfo);
 
 	private:
 		std::array<std::unique_ptr<Pattern>, 8> slots;
@@ -104,7 +104,7 @@ namespace BeatCrafter
 		mutable bool intensityCacheValid = false;
 		mutable float lastCachedIntensity = -1.0f;
 		mutable int lastCachedSlot = -1;
-		Pattern dummyPattern{"Empty"};
+		Pattern dummyPattern{ "Empty" };
 
 		float currentIntensity = -1.0f;
 		float currentLiveJamIntensity = 0.5f;
@@ -126,16 +126,16 @@ namespace BeatCrafter
 		juce::Random liveJamRandom;
 		int stepsSinceLastJam = 0;
 
-		std::atomic<int> pendingImmediateSlot{-1};
+		std::atomic<int> pendingImmediateSlot{ -1 };
 
-		void generateMidiForStep(juce::MidiBuffer &midiMessages,
-								 int samplePosition,
-								 const Pattern &pattern,
-								 int stepIndex);
-		void applyComplexityToPattern(Pattern &pattern, StyleType style, float complexity);
-		void addLiveJamElements(Pattern &pattern, int stepIndex, float intensity);
-		void sendAllNotesOff(juce::MidiBuffer &midiMessages);
-		void applyHumanization(Pattern &pattern, int stepIndex);
+		void generateMidiForStep(juce::MidiBuffer& midiMessages,
+			int samplePosition,
+			const Pattern& pattern,
+			int stepIndex);
+		void applyComplexityToPattern(Pattern& pattern, StyleType style, float complexity);
+		void addLiveJamElements(Pattern& pattern, int stepIndex, float intensity);
+		void sendAllNotesOff(juce::MidiBuffer& midiMessages);
+		void applyHumanization(Pattern& pattern, int stepIndex);
 		void updateSurpriseMe(int currentMeasure, double ppqPosition);
 	};
 }

src/Core/PatternEngine.h

@@ -13,27 +13,48 @@ namespace BeatCrafter {
 
 	void PatternGrid::setPattern(const Pattern* pattern) {
 		currentPattern = pattern;
+		bufferDirty = true;
 		repaint();
 	}
 
 	void PatternGrid::setPatternEngine(PatternEngine* engine) {
 		patternEngine = engine;
 	}
 
-	void PatternGrid::paint(juce::Graphics& g) {
+	void PatternGrid::paint(juce::Graphics& g)
+	{
 		if (!lookAndFeel)
 			lookAndFeel = dynamic_cast<ModernLookAndFeel*>(&getLookAndFeel());
 
-		drawBackground(g);
-		drawGrid(g);
+		if (offscreenBuffer.isNull()
+			|| offscreenBuffer.getWidth() != getWidth()
+			|| offscreenBuffer.getHeight() != getHeight()
+			|| bufferDirty)
+		{
+			offscreenBuffer = juce::Image(
+				juce::Image::ARGB, getWidth(), getHeight(), true);
+			juce::Graphics bg(offscreenBuffer);
+
+			drawBackground(bg);
+			drawGrid(bg);
+			if (currentPattern) {
+				drawSteps(bg);
+				drawPlayhead(bg);
+			}
+			drawTrackLabels(bg);
+			drawStepNumbers(bg);
 
-		if (currentPattern) {
-			drawSteps(g);
-			drawPlayhead(g);
+			bufferDirty = false;
 		}
 
-		drawTrackLabels(g);
-		drawStepNumbers(g);
+		g.drawImageAt(offscreenBuffer, 0, 0);
+	}
+
+	void PatternGrid::markDirty()
+	{
+		bufferDirty = true;
+		if (!isTimerRunning())
+			repaint();
 	}
 
 	void PatternGrid::resized() {
@@ -42,13 +63,15 @@ namespace BeatCrafter {
 		int numTracks = currentPattern ? currentPattern->getNumTracks() : 8;
 		cellWidth = (bounds.getWidth() - headerWidth) / static_cast<float>(numSteps);
 		cellHeight = (bounds.getHeight() - headerHeight) / static_cast<float>(numTracks);
+		bufferDirty = true;
 	}
 
 	void PatternGrid::timerCallback() {
 		if (patternEngine) {
 			int newPlayhead = patternEngine->getCurrentStep();
 			if (newPlayhead != playheadPosition) {
 				playheadPosition = newPlayhead;
+				bufferDirty = true;
 				repaint();
 			}
 		}

src/GUI/PatternGrid.cpp

@@ -6,40 +6,44 @@
 
 namespace BeatCrafter {
 
-    class PatternGrid : public juce::Component,
-        public juce::Timer
-    {
-    public:
-        PatternGrid();
-        ~PatternGrid() override;
-
-        void setPattern(const Pattern* pattern);
-        void setPatternEngine(PatternEngine* engine);
-
-        void paint(juce::Graphics&) override;
-        void resized() override;
-        void timerCallback() override;
-
-    private:
-        const Pattern* currentPattern = nullptr;
-        PatternEngine* patternEngine = nullptr;
-        ModernLookAndFeel* lookAndFeel = nullptr;
-
-        float cellWidth = 0.0f;
-        float cellHeight = 0.0f;
-        int   headerWidth = 80;
-        int   headerHeight = 20;
-        int   playheadPosition = -1;
-
-        juce::Rectangle<float> getStepBounds(int track, int step) const;
-
-        void drawBackground(juce::Graphics&);
-        void drawGrid(juce::Graphics&);
-        void drawSteps(juce::Graphics&);
-        void drawPlayhead(juce::Graphics&);
-        void drawTrackLabels(juce::Graphics&);
-        void drawStepNumbers(juce::Graphics&);
-
-        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PatternGrid)
-    };
+	class PatternGrid : public juce::Component,
+		public juce::Timer
+	{
+	public:
+		PatternGrid();
+		~PatternGrid() override;
+
+		void setPattern(const Pattern* pattern);
+		void setPatternEngine(PatternEngine* engine);
+
+		void paint(juce::Graphics&) override;
+		void resized() override;
+		void timerCallback() override;
+		void markDirty();
+
+	private:
+		const Pattern* currentPattern = nullptr;
+		PatternEngine* patternEngine = nullptr;
+		ModernLookAndFeel* lookAndFeel = nullptr;
+
+		float cellWidth = 0.0f;
+		float cellHeight = 0.0f;
+		int   headerWidth = 80;
+		int   headerHeight = 20;
+		int   playheadPosition = -1;
+
+		juce::Image offscreenBuffer;
+		bool bufferDirty = true;
+
+		juce::Rectangle<float> getStepBounds(int track, int step) const;
+
+		void drawBackground(juce::Graphics&);
+		void drawGrid(juce::Graphics&);
+		void drawSteps(juce::Graphics&);
+		void drawPlayhead(juce::Graphics&);
+		void drawTrackLabels(juce::Graphics&);
+		void drawStepNumbers(juce::Graphics&);
+
+		JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PatternGrid)
+	};
 }