diff --git a/Resources/svg/vortex.svg b/Resources/svg/vortex.svg
new file mode 100644
index 00000000..6a0b7979
--- /dev/null
+++ b/Resources/svg/vortex.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
index eca28158..95b0f63f 100644
--- a/Source/PluginProcessor.cpp
+++ b/Source/PluginProcessor.cpp
@@ -28,7 +28,7 @@
#include "audio/SwirlEffect.h"
#include "audio/BounceEffect.h"
#include "audio/SkewEffect.h"
-#include "audio/RadialWrapEffect.h"
+#include "audio/VortexEffect.h"
#include "audio/GodRayEffect.h"
#include "parser/FileParser.h"
#include "parser/FrameProducer.h"
@@ -61,7 +61,7 @@ OscirenderAudioProcessor::OscirenderAudioProcessor() : CommonAudioProcessor(Buse
toggleableEffects.push_back(BounceEffect().build());
toggleableEffects.push_back(TwistEffect().build());
toggleableEffects.push_back(SkewEffect().build());
- toggleableEffects.push_back(RadialWrapEffect().build());
+ toggleableEffects.push_back(VortexEffect().build());
toggleableEffects.push_back(GodRayEffect().build());
toggleableEffects.push_back(SpiralBitCrushEffect().build());
#endif
diff --git a/Source/audio/GodRayEffect.h b/Source/audio/GodRayEffect.h
index c035235c..77b61444 100644
--- a/Source/audio/GodRayEffect.h
+++ b/Source/audio/GodRayEffect.h
@@ -31,6 +31,7 @@ public:
"Controls whether the rays appear to be radiating inward or outward.",
"godRayPosition", VERSION_HINT, 0.8, -1.0, 1.0)
});
+ eff->setName("God Ray");
eff->setIcon(BinaryData::god_ray_svg);
return eff;
}
diff --git a/Source/audio/RadialWrapEffect.h b/Source/audio/VortexEffect.h
similarity index 59%
rename from Source/audio/RadialWrapEffect.h
rename to Source/audio/VortexEffect.h
index 7bcf8bdb..a4faa4a9 100644
--- a/Source/audio/RadialWrapEffect.h
+++ b/Source/audio/VortexEffect.h
@@ -1,7 +1,7 @@
#pragma once
#include
-class RadialWrapEffect : public osci::EffectApplication {
+class VortexEffect : public osci::EffectApplication {
public:
osci::Point apply(int index, osci::Point input, const std::vector> &values, double sampleRate) override {
// Treat input as complex number and raise to integer power
@@ -25,19 +25,20 @@ public:
std::shared_ptr build() const override {
auto eff = std::make_shared(
- std::make_shared(),
+ std::make_shared(),
std::vector{
- new osci::EffectParameter("Radial Wrap",
- "Distorts the shape by multiplying the angle and warping the length of each point.",
- "radialWrap", VERSION_HINT, 0.6, 0.0, 1.0),
- new osci::EffectParameter("Wrap Degree",
- "The multiplier applied to each point's angle.",
- "radialWrapDegree", VERSION_HINT, 2.0, 2.0, 6.0, 1.0),
- new osci::EffectParameter("Reference Angle",
- "The reference angle from which each point's angle is multiplied.",
- "radialWrapRefAngle", VERSION_HINT, 0.25, 0.0, 1.0, 0.0001, osci::LfoType::Sawtooth, 0.2)
+ new osci::EffectParameter("Vortex Strength",
+ "Controls the strength of the vortex effect.",
+ "vortexStrength", VERSION_HINT, 0.6, 0.0, 1.0),
+ new osci::EffectParameter("Vortex Amount",
+ "The multiplier applied to each point's angle, creating more vortexes.",
+ "vortexAmount", VERSION_HINT, 2.0, 2.0, 6.0, 1.0),
+ new osci::EffectParameter("Vortex Rotation",
+ "The rotation applied to each point.",
+ "vortexRotation", VERSION_HINT, 0.25, 0.0, 1.0, 0.0001, osci::LfoType::Sawtooth, 0.2)
});
- eff->setIcon(BinaryData::twist_svg);
+ eff->setName("Vortex");
+ eff->setIcon(BinaryData::vortex_svg);
return eff;
}
};
diff --git a/osci-render.jucer b/osci-render.jucer
index 33fb14f1..730537dd 100644
--- a/osci-render.jucer
+++ b/osci-render.jucer
@@ -156,6 +156,7 @@
+
@@ -170,8 +171,7 @@
-
+