LuaJIT, .gif failsafe, and external input to Lua

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "LuaJIT"]
+	path = LuaJIT
+	url = https://luajit.org/git/luajit.git

Source/PluginEditor.cpp

@@ -142,7 +142,13 @@ OscirenderAudioProcessorEditor::~OscirenderAudioProcessorEditor() {
 }
 
 bool OscirenderAudioProcessorEditor::isBinaryFile(juce::String name) {
-    return name.endsWith(".gpla") || name.endsWith(".gif") || name.endsWith(".png") || name.endsWith(".jpg") || name.endsWith(".jpeg") || name.endsWith(".wav") || name.endsWith(".aiff");
+    return name.endsWithIgnoreCase(".gpla")
+        || name.endsWithIgnoreCase(".gif")
+        || name.endsWithIgnoreCase(".png")
+        || name.endsWithIgnoreCase(".jpg")
+        || name.endsWithIgnoreCase(".jpeg")
+        || name.endsWithIgnoreCase(".wav")
+        || name.endsWithIgnoreCase(".aiff");
 }
 
 // parsersLock must be held

Source/PluginProcessor.cpp

@@ -629,11 +629,13 @@ void OscirenderAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, ju
     juce::AudioBuffer<float> outputBuffer3d = juce::AudioBuffer<float>(3, buffer.getNumSamples());
     outputBuffer3d.clear();
 
-    if (usingInput && totalNumInputChannels >= 2) {
-        for (auto channel = 0; channel < juce::jmin(2, totalNumInputChannels); channel++) {
-            outputBuffer3d.copyFrom(channel, 0, inputBuffer, channel, 0, buffer.getNumSamples());
-        }
+    // Put the external input data into the output buffer in case the synth voice is a Lua synth.
+    // It will be cleared by the synth if this is not the case.
+    for (int channel = 0; channel < juce::jmin(2, totalNumInputChannels); channel++) {
+        outputBuffer3d.copyFrom(channel, 0, inputBuffer, channel, 0, buffer.getNumSamples());
+    }
 
+    if (usingInput && totalNumInputChannels >= 2) {
         // handle all midi messages
         auto midiIterator = midiMessages.cbegin();
         std::for_each(midiIterator,
@@ -658,13 +660,14 @@ void OscirenderAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, ju
     auto* channelData = buffer.getArrayOfWritePointers();
 
 
-	for (int sample = 0; sample < buffer.getNumSamples(); ++sample) {
+    for (int sample = 0; sample < buffer.getNumSamples(); ++sample) {
 
         // Update frame animation
         if (animateFrames->getValue()) {
             if (animationSyncBPM->getValue()) {
                 animationTime = playTimeBeats;
-            } else {
+            }
+            else {
                 animationTime = playTimeSeconds;
             }
 
@@ -676,7 +679,8 @@ void OscirenderAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, ju
                 auto img = sounds[currentFile]->parser->getImg();
                 if (lineArt != nullptr) {
                     lineArt->setFrame(animFrame);
-                } else if (img != nullptr) {
+                }
+                else if (img != nullptr) {
                     img->setFrame(animFrame);
                 }
             }
@@ -687,7 +691,8 @@ void OscirenderAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, ju
         if (totalNumInputChannels >= 2) {
             left = inputBuffer.getSample(0, sample);
             right = inputBuffer.getSample(1, sample);
-        } else if (totalNumInputChannels == 1) {
+        }
+        else if (totalNumInputChannels == 1) {
             left = inputBuffer.getSample(0, sample);
             right = inputBuffer.getSample(0, sample);
         }
@@ -701,26 +706,27 @@ void OscirenderAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, ju
         currentVolume = std::sqrt(squaredVolume);
         currentVolume = juce::jlimit(0.0, 1.0, currentVolume);
 
-        Point channels = { outputBuffer3d.getSample(0, sample), outputBuffer3d.getSample(1, sample), outputBuffer3d.getSample(2, sample) };
+        double sx = outputBuffer3d.getSample(0, sample);
+        double sy = outputBuffer3d.getSample(1, sample);
+        double sz = outputBuffer3d.getSample(2, sample);
+        Point channels = { sx, sy, sz, left, right };
 
-        {
-            juce::SpinLock::ScopedLockType lock1(parsersLock);
-            juce::SpinLock::ScopedLockType lock2(effectsLock);
-            if (volume > EPSILON) {
-                for (auto& effect : toggleableEffects) {
-                    if (effect->enabled->getValue()) {
-                        channels = effect->apply(sample, channels, currentVolume);
-                    }
+        juce::SpinLock::ScopedLockType lock1(parsersLock);
+        juce::SpinLock::ScopedLockType lock2(effectsLock);
+        if (volume > EPSILON) {
+            for (auto& effect : toggleableEffects) {
+                if (effect->enabled->getValue()) {
+                    channels = effect->apply(sample, channels, currentVolume);
                 }
             }
-            for (auto& effect : permanentEffects) {
-                channels = effect->apply(sample, channels, currentVolume);
-            }
-            auto lua = currentFile >= 0 ? sounds[currentFile]->parser->getLua() : nullptr;
-            if (lua != nullptr || custom->enabled->getBoolValue()) {
-                for (auto& effect : luaEffects) {
-                    effect->apply(sample, channels, currentVolume);
-                }
+        }
+        for (auto& effect : permanentEffects) {
+            channels = effect->apply(sample, channels, currentVolume);
+        }
+        auto lua = currentFile >= 0 ? sounds[currentFile]->parser->getLua() : nullptr;
+        if (lua != nullptr || custom->enabled->getBoolValue()) {
+            for (auto& effect : luaEffects) {
+                effect->apply(sample, channels, currentVolume);
             }
         }
 

Source/audio/CustomEffect.cpp

@@ -19,6 +19,8 @@ Point CustomEffect::apply(int index, Point input, const std::vector<std::atomic<
 	auto x = input.x;
 	auto y = input.y;
 	auto z = input.z;
+	auto eX = input.v;
+	auto eY = input.w;
 
 	{
 		juce::SpinLock::ScopedLockType lock(codeLock);
@@ -30,16 +32,20 @@ Point CustomEffect::apply(int index, Point input, const std::vector<std::atomic<
 			vars.y = y;
 			vars.z = z;
 
+			vars.ext_x = eX;
+			vars.ext_y = eY;
+
 			std::copy(std::begin(luaValues), std::end(luaValues), std::begin(vars.sliders));
 
 			auto result = parser->run(L, vars);
-			if (result.size() >= 2) {
-				x = result[0];
-				y = result[1];
-				if (result.size() >= 3) {
-					z = result[2];
-				}
-			}
+			int rs = result.size();
+
+			if (rs < 1) return input;
+
+			x = result[0];
+			y = (rs > 1) ? result[1] : y;
+			z = (rs > 2) ? result[2] : z;
+
 		} else {
 			parser->resetErrors();
 		}
@@ -48,7 +54,9 @@ Point CustomEffect::apply(int index, Point input, const std::vector<std::atomic<
 	return Point(
 		(1 - effectScale) * input.x + effectScale * x,
 		(1 - effectScale) * input.y + effectScale * y,
-		(1 - effectScale) * input.z + effectScale * z
+		(1 - effectScale) * input.z + effectScale * z,
+		input.v,
+		input.w
 	);
 }
 

Source/audio/Effect.cpp

@@ -23,10 +23,10 @@ Effect::Effect(EffectParameter* parameter) : Effect([](int index, Point input, c
 
 Point Effect::apply(int index, Point input, double volume) {
 	animateValues(volume);
-	if (application) {
-		return application(index, input, actualValues, sampleRate);
-	} else if (effectApplication != nullptr) {
+	if (effectApplication != nullptr) {
 		return effectApplication->apply(index, input, actualValues, sampleRate);
+	} else if (application) {
+		return application(index, input, actualValues, sampleRate);
 	}
 	return input;
 }

Source/audio/ShapeVoice.cpp

@@ -13,7 +13,7 @@ bool ShapeVoice::canPlaySound(juce::SynthesiserSound* sound) {
 void ShapeVoice::startNote(int midiNoteNumber, float velocity, juce::SynthesiserSound* sound, int currentPitchWheelPosition) {
     this->velocity = velocity;
     pitchWheelMoved(currentPitchWheelPosition);
-    auto* shapeSound = dynamic_cast<ShapeSound*>(sound);
+    ShapeSound* shapeSound = dynamic_cast<ShapeSound*>(sound);
 
     currentlyPlaying = true;
     this->sound = shapeSound;
@@ -86,6 +86,15 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
         actualFrequency = audioProcessor.frequency;
     }
 
+    std::shared_ptr<FileParser> parser;
+
+    if (sound.load() != nullptr) {
+        parser = sound.load()->parser;
+        if (!(parser != nullptr && parser->isSample())) {
+            outputBuffer.clear(startSample, numSamples);
+        }
+    }
+
     for (auto sample = startSample; sample < startSample + numSamples; ++sample) {
         bool traceMinEnabled = audioProcessor.traceMin->enabled->getBoolValue();
         bool traceMaxEnabled = audioProcessor.traceMax->enabled->getBoolValue();
@@ -96,10 +105,7 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
         double proportionalLength = (traceMax - traceMin) * frameLength;
         lengthIncrement = juce::jmax(proportionalLength / (audioProcessor.currentSampleRate / actualFrequency), MIN_LENGTH_INCREMENT);
 
-        Point channels;
-        double x = 0.0;
-        double y = 0.0;
-        double z = 0.0;
+        Point channels = { 0,0,0 };
 
         bool renderingSample = true;
 
@@ -111,20 +117,19 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
                 vars.sampleRate = audioProcessor.currentSampleRate;
                 vars.frequency = actualFrequency;
                 std::copy(std::begin(audioProcessor.luaValues), std::end(audioProcessor.luaValues), std::begin(vars.sliders));
-
+                vars.ext_x = outputBuffer.getSample(0, sample);
+                vars.ext_y = outputBuffer.getSample(1, sample);
                 channels = parser->nextSample(L, vars);
-            } else if (currentShape < frame.size()) {
-                auto& shape = frame[currentShape];
-                double length = shape->length();
-                double drawingProgress = length == 0.0 ? 1 : shapeDrawn / length;
-                channels = shape->nextVector(drawingProgress);
+            } else {
+                if (currentShape < frame.size()) {
+                    auto& shape = frame[currentShape];
+                    double length = shape->length();
+                    double drawingProgress = length == 0.0 ? 1 : shapeDrawn / length;
+                    channels = shape->nextVector(drawingProgress);
+                }
             }
         }
 
-        x = channels.x;
-        y = channels.y;
-        z = channels.z;
-
         time += 1.0 / audioProcessor.currentSampleRate;
 
         if (waitingForRelease) {
@@ -138,14 +143,16 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
         gain *= velocity;
 
         if (numChannels >= 3) {
-            outputBuffer.addSample(0, sample, x * gain);
-            outputBuffer.addSample(1, sample, y * gain);
-            outputBuffer.addSample(2, sample, z * gain);
-        } else if (numChannels == 2) {
-            outputBuffer.addSample(0, sample, x * gain);
-            outputBuffer.addSample(1, sample, y * gain);
-        } else if (numChannels == 1) {
-            outputBuffer.addSample(0, sample, x * gain);
+            outputBuffer.addSample(0, sample, channels.x * gain);
+            outputBuffer.addSample(1, sample, channels.y * gain);
+            outputBuffer.addSample(2, sample, channels.z * gain);
+        }
+        else if (numChannels == 2) {
+            outputBuffer.addSample(0, sample, channels.x * gain);
+            outputBuffer.addSample(1, sample, channels.y * gain);
+        }
+        else if (numChannels == 1) {
+            outputBuffer.addSample(0, sample, channels.x * gain);
         }
 
         double traceMinValue = audioProcessor.traceMin->getActualValue();
@@ -162,7 +169,7 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
         double drawnFrameLength = traceMaxEnabled ? actualTraceMax * frameLength : frameLength;
 
         if (!renderingSample && frameDrawn >= drawnFrameLength) {
-            if (sound.load() != nullptr && currentlyPlaying) {
+            if (sound.load() != nullptr && currentlyPlaying) { 
                 frameLength = sound.load()->updateFrame(frame);
             }
             frameDrawn -= drawnFrameLength;
@@ -180,10 +187,10 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
             }
         }
     }
+    return;
 }
 
 void ShapeVoice::stopNote(float velocity, bool allowTailOff) {
-    currentlyPlaying = false;
     waitingForRelease = false;
     if (!allowTailOff) {
         noteStopped();
@@ -192,6 +199,7 @@ void ShapeVoice::stopNote(float velocity, bool allowTailOff) {
 
 void ShapeVoice::noteStopped() {
     clearCurrentNote();
+    currentlyPlaying = false;
     sound = nullptr;
 }
 

Source/img/ImageParser.cpp

@@ -44,6 +44,17 @@ ImageParser::ImageParser(OscirenderAudioProcessor& p, juce::String extension, ju
 
             gd_close_gif(gif);
         }
+        else {
+            width = 128;
+            height = 128;
+            visited = std::vector<bool>(width * height, false);
+            for (int fr = 0; fr < 14; fr++) {
+                frames.emplace_back(std::vector<uint8_t>(width * height));
+                for (int px = 0; px < width * height; px++) {
+                    frames[fr][px] = ((px + 9 * fr) % 126) * 2;
+                }
+            }
+        }
     } else {
         juce::Image image = juce::ImageFileFormat::loadFrom(file);
         image.desaturate();

Source/lua/LuaParser.cpp

@@ -1,8 +1,4 @@
 #include "LuaParser.h"
-#include "luaimport.h"
-#include "../shape/Line.h"
-#include "../shape/CircleArc.h"
-#include "../shape/QuadraticBezierCurve.h"
 
 std::function<void(const std::string&)> LuaParser::onPrint;
 std::function<void()> LuaParser::onClear;
@@ -325,7 +321,7 @@ static int luaPrint(lua_State* L) {
     int nargs = lua_gettop(L);
 
     for (int i = 1; i <= nargs; ++i) {
-        LuaParser::onPrint(luaL_tolstring(L, i, nullptr));
+        LuaParser::onPrint(lua_tolstring(L, i, nullptr));
         lua_pop(L, 1);
     }
 
@@ -440,9 +436,12 @@ void LuaParser::setGlobalVariables(lua_State*& L, LuaVariables& vars) {
 		setGlobalVariable(L, SLIDER_NAMES[i], vars.sliders[i]);
     }
 
+    setGlobalVariable(L, "ext_x", vars.ext_x);
+    setGlobalVariable(L, "ext_y", vars.ext_y);
+
     if (vars.isEffect) {
-		setGlobalVariable(L, "x", vars.x);
-		setGlobalVariable(L, "y", vars.y);
+        setGlobalVariable(L, "x", vars.x);
+        setGlobalVariable(L, "y", vars.y);
 		setGlobalVariable(L, "z", vars.z);
     }
 }
@@ -468,7 +467,7 @@ void LuaParser::revertToFallback(lua_State*& L) {
 }
 
 void LuaParser::readTable(lua_State*& L, std::vector<float>& values) {
-    auto length = lua_rawlen(L, -1);
+    auto length = lua_objlen(L, -1);
 
     for (int i = 1; i <= length; i++) {
         lua_pushinteger(L, i);
@@ -493,7 +492,7 @@ std::vector<float> LuaParser::run(lua_State*& L, LuaVariables& vars) {
 	setGlobalVariables(L, vars);
 
 	// Get the function from the registry
-	lua_geti(L, LUA_REGISTRYINDEX, functionRef);
+	lua_rawgeti(L, LUA_REGISTRYINDEX, functionRef);
 
     setMaximumInstructions(L, 5000000);
 

Source/lua/LuaParser.h

@@ -2,6 +2,10 @@
 #include <JuceHeader.h>
 #include <regex>
 #include <numbers>
+#include "lua.hpp"
+#include "../shape/Line.h"
+#include "../shape/CircleArc.h"
+#include "../shape/QuadraticBezierCurve.h"
 #include "../shape/Shape.h"
 
 class ErrorListener {
@@ -50,6 +54,9 @@ struct LuaVariables {
 	double sampleRate = 0;
 	double frequency = 0;
 
+	double ext_x = 0;
+	double ext_y = 0;
+
 	// x, y, z are only used for effects
 	bool isEffect = false;