Merge pull request #218 from jameshball/3d-audio

Refactor audio pipeline + effects to operate in 3D instead of 2D, many QoL improvements

.github/workflows/build.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - release
+      - 3d-audio
 jobs:
   build-linux:
     name: Build Linux
@@ -18,7 +19,9 @@ jobs:
       - name: "Run script"
         run: |
           export OS="linux"
-          ./ci/build.sh
+          source ./ci/setup-env.sh
+          source ./ci/test.sh
+          source ./ci/build.sh
         shell: bash
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
@@ -40,7 +43,9 @@ jobs:
       - name: "Run script"
         run: |
           export OS="mac"
-          ./ci/build.sh
+          source ./ci/setup-env.sh
+          source ./ci/test.sh
+          source ./ci/build.sh
         shell: bash
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
@@ -62,7 +67,9 @@ jobs:
       - name: "Run script"
         run: |
           export OS="win"
-          ./ci/build.sh
+          source ./ci/setup-env.sh
+          source ./ci/test.sh
+          source ./ci/build.sh
         shell: bash
       - name: Upload Artifact
         uses: actions/upload-artifact@v3

Source/EffectsComponent.cpp

@@ -23,6 +23,15 @@ EffectsComponent::EffectsComponent(OscirenderAudioProcessor& p, OscirenderAudioP
     };
     addAndMakeVisible(addBtn);*/
 
+    addAndMakeVisible(randomiseButton);
+
+	randomiseButton.setTooltip("Randomise all effect parameter values, randomise which effects are enabled, and randomise their order.");
+
+	randomiseButton.onClick = [this] {
+		itemData.randomise();
+		listBox.updateContent();
+	};
+
     {
         juce::MessageManagerLock lock;
         audioProcessor.broadcaster.addChangeListener(this);
@@ -38,7 +47,12 @@ EffectsComponent::~EffectsComponent() {
 }
 
 void EffectsComponent::resized() {
-    auto area = getLocalBounds().withTrimmedTop(20).reduced(20);
+    auto area = getLocalBounds();
+    auto titleBar = area.removeFromTop(30);
+    titleBar.removeFromLeft(100);
+
+	randomiseButton.setBounds(titleBar.removeFromLeft(20));
+    area = area.reduced(20);
     frequency.setBounds(area.removeFromTop(30));
 
     area.removeFromTop(6);

Source/EffectsComponent.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <JuceHeader.h>
+#include "LookAndFeel.h"
 #include "audio/BitCrushEffect.h"
 #include "PluginProcessor.h"
 #include "components/DraggableListBox.h"
@@ -20,6 +21,8 @@ class EffectsComponent : public juce::GroupComponent, public juce::ChangeListene
 
 	// juce::TextButton addBtn;
 
+	SvgButton randomiseButton{ "randomise", juce::String(BinaryData::random_svg), Colours::accentColor };
+
 	AudioEffectListBoxItemData itemData;
 	EffectsListBoxModel listBoxModel;
 	DraggableListBox listBox;

Source/LegacyProject.cpp

@@ -122,7 +122,7 @@ void OscirenderAudioProcessor::openLegacyProject(const juce::XmlElement* xml) {
         if (perspectiveFunction != nullptr) {
             auto stream = juce::MemoryOutputStream();
             juce::Base64::convertFromBase64(stream, perspectiveFunction->getAllSubText());
-            perspectiveEffect->updateCode(stream.toString());
+            customEffect->updateCode(stream.toString());
         }
 
         auto fontFamilyXml = xml->getChildByName("fontFamily");

Source/LuaComponent.cpp

@@ -2,7 +2,7 @@
 #include "PluginEditor.h"
 
 LuaComponent::LuaComponent(OscirenderAudioProcessor& p, OscirenderAudioProcessorEditor& editor) : audioProcessor(p), pluginEditor(editor), slidersModel(sliders, p) {
-	setText(".lua File Settings");
+	setText("Lua Settings");
 
 	sliders.setModel(&slidersModel);
 	sliders.setRowHeight(30);

Source/MainComponent.cpp

@@ -32,7 +32,6 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess
 	};
 
 	addAndMakeVisible(closeFileButton);
-	closeFileButton.setButtonText("Close File");
 
 	closeFileButton.onClick = [this] {
 		juce::SpinLock::ScopedLockType lock(audioProcessor.parsersLock);
@@ -49,9 +48,40 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess
 	inputEnabled.onClick = [this] {
 		audioProcessor.inputEnabled->setBoolValueNotifyingHost(!audioProcessor.inputEnabled->getBoolValue());
 	};
+	inputEnabled.setTooltip("Enable to use input audio, instead of the generated audio.");
+
 	addAndMakeVisible(fileLabel);
+	fileLabel.setJustificationType(juce::Justification::centred);
 	updateFileLabel();
 
+	addAndMakeVisible(leftArrow);
+	leftArrow.onClick = [this] {
+		juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock);
+		juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock);
+
+		int index = audioProcessor.getCurrentFileIndex();
+
+		if (index > 0) {
+			audioProcessor.changeCurrentFile(index - 1);
+			pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
+		}
+	};
+	leftArrow.setTooltip("Change to previous file (k).");
+
+	addAndMakeVisible(rightArrow);
+	rightArrow.onClick = [this] {
+		juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock);
+		juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock);
+
+		int index = audioProcessor.getCurrentFileIndex();
+
+		if (index < audioProcessor.numFiles() - 1) {
+			audioProcessor.changeCurrentFile(index + 1);
+			pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
+		}
+	};
+	rightArrow.setTooltip("Change to next file (j).");
+
 
 	addAndMakeVisible(fileName);
 	fileType.addItem(".lua", 1);
@@ -109,6 +139,8 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess
 			pluginEditor.removeChildComponent(&pluginEditor.visualiser);
 			addAndMakeVisible(pluginEditor.visualiser);
 		}
+		pluginEditor.visualiser.setFullScreen(pluginEditor.visualiserFullScreen);
+
 		pluginEditor.resized();
 		pluginEditor.repaint();
 		resized();
@@ -139,13 +171,18 @@ MainComponent::~MainComponent() {
 }
 
 void MainComponent::updateFileLabel() {
+	showLeftArrow = audioProcessor.getCurrentFileIndex() > 0;
+	showRightArrow = audioProcessor.getCurrentFileIndex() < audioProcessor.numFiles() - 1;
+
 	if (audioProcessor.objectServerRendering) {
 		fileLabel.setText("Rendering from Blender", juce::dontSendNotification);
 	} else if (audioProcessor.getCurrentFileIndex() == -1) {
 		fileLabel.setText("No file open", juce::dontSendNotification);
 	} else {
 		fileLabel.setText(audioProcessor.getCurrentFileName(), juce::dontSendNotification);
 	}
+
+	resized();
 }
 
 void MainComponent::resized() {
@@ -163,9 +200,30 @@ void MainComponent::resized() {
 	row.removeFromLeft(rowPadding);
 	inputEnabled.setBounds(row.removeFromLeft(20));
 	row.removeFromLeft(rowPadding);
+	if (audioProcessor.getCurrentFileIndex() != -1) {
+		closeFileButton.setBounds(row.removeFromRight(20));
+		row.removeFromRight(rowPadding);
+	} else {
+		closeFileButton.setBounds(juce::Rectangle<int>());
+	}
+
+	auto arrowLeftBounds = row.removeFromLeft(15);
+	if (showLeftArrow) {
+		leftArrow.setBounds(arrowLeftBounds);
+	} else {
+		leftArrow.setBounds(0, 0, 0, 0);
+	}
+	row.removeFromLeft(rowPadding);
+
+	auto arrowRightBounds = row.removeFromRight(15);
+	if (showRightArrow) {
+		rightArrow.setBounds(arrowRightBounds);
+	} else {
+		rightArrow.setBounds(0, 0, 0, 0);
+	}
+	row.removeFromRight(rowPadding);
+
 	fileLabel.setBounds(row);
-	bounds.removeFromTop(padding);
-	closeFileButton.setBounds(bounds.removeFromTop(buttonHeight).removeFromLeft(buttonWidth));
 
 	bounds.removeFromTop(padding);
 	row = bounds.removeFromTop(buttonHeight);

Source/MainComponent.h

@@ -25,9 +25,13 @@ class MainComponent : public juce::GroupComponent {
 
 	std::unique_ptr<juce::FileChooser> chooser;
 	juce::TextButton fileButton;
-	juce::TextButton closeFileButton;
+	SvgButton closeFileButton{"closeFile", juce::String(BinaryData::delete_svg), juce::Colours::red};
 	SvgButton inputEnabled{"inputEnabled", juce::String(BinaryData::microphone_svg), juce::Colours::white, juce::Colours::red, audioProcessor.inputEnabled};
 	juce::Label fileLabel;
+	SvgButton leftArrow{"leftArrow", juce::String(BinaryData::left_arrow_svg), juce::Colours::white};
+	SvgButton rightArrow{"rightArrow", juce::String(BinaryData::right_arrow_svg), juce::Colours::white};
+	bool showLeftArrow = false;
+	bool showRightArrow = false;
 
 	juce::TextEditor fileName;
 	juce::ComboBox fileType;