Improved Waveshaper / Spline-based graph replacement #4367

SecondFlight · 2018-05-18T19:53:01Z

Fruity Waveshaper is one of the plugins I use the most in FL. It's a fantastic general-purpose digital distortion. The Waveshaper plugin by Diizy is good and definitely has its place, but it is lacking in a few key areas:

It is incredibly difficult to create a smooth curve. If you want a smooth curve and then a harsh edge it becomes even harder.
Diizy's waveshaper uses graph.h, which uses 200 discrete points to store the curve. This means resolution is limited, and this limits the steepest curve possible in the shaper.

The original plugin is very similar to the 8-bit shaper by Xfer. Again, not a bad thing, but I certainly think another option would provide a better workflow and overall general-purpose plugin.

The changes I plan to make are two-fold:

Replace the graph. This will be a fairly large project. In the long run I am interested in improving automation to some extent, and my hope is that this will help me get a feel for how to do that and make things easier for me in the future.
Overhaul the DSP. This is a necessary side effect of the first change. Because the DSP is so simple, switching from a discrete to a vector-based graph will change pretty much everything in the calculations.

Todo:

…ously

PhysSong · 2018-05-29T11:47:15Z

plugins/waveshaper2/waveshaper2_controls.cpp

+	m_outputModel( 1.0f, 0.0f, 5.0f, 0.01f, this, tr( "Output gain" ) ),
+	m_wavegraphModel( 0.0f, 1.0f, 200, this ),
+	m_clipModel( false, this ),
+	m_vectorGraphModel( this, true )


You should match the order of initialization and declaration to avoid compiler warning. It means m_vectorGraphModel should be initialized before m_clipModel.

Yeah, I've been ignoring that but I will get to it eventually :)

SecondFlight · 2018-05-29T23:40:51Z

Does anybody know why the circleci build is failing? This error seems cryptic to me.

Makefile:151: recipe for target 'all' failed
make: *** [all] Error 2
Exited with code 2

Edit: It's always after updating Xpressive. I wonder if I accidentally updated the submodules...
Edit 2: Nah, I don't think that's it.

plugins/waveshaper2/waveshaper2.cpp

PhysSong · 2018-05-30T00:01:13Z

plugins/CMakeLists.txt

@@ -80,6 +80,7 @@ IF("${PLUGIN_LIST}" STREQUAL "")
 		VstEffect
 		watsyn
 		waveshaper
+        waveshaper2


Minor, but use tabs instead of spaces.

Will do, I edited that with a different editor. Thanks for catching this.

SecondFlight · 2018-05-30T01:03:51Z

Oh that was literally it. Well I can't complain.

SecondFlight · 2018-06-03T14:43:44Z

Right, that makes sense. I don't think that a decision here is something I should be making myself then, it sounds like it will span across the entire software and affect most future development. Perhaps this is something I should create an issue for to start a discussion.

SecondFlight · 2018-06-03T14:47:34Z

The question in my mind is, how much do we want to rip up the current system to implement these UI changes? Having something external that says "this knob hooks up here" would be great, but it's a completely different paradigm from what we currently have, and implementing it would involve a lot of well-thought-out core changes in a number of areas.

But in the end I don't know what's best and I'm going off of assumptions. I think I'll make an issue for discussion later today.

fundamental · 2018-06-03T15:27:23Z

My own opinion as an observer is that with the current LMMS development community and the current internal LMMS architecture an organized large scale UI upgrade isn't feasible at this time. Any work would need to be much smaller scale otherwise the trend of individuals building moderate sized goals, getting frustrated, and subsequently leaving the project, will likely continue. For Zyn the used approach was to upgrade the internal architecture to make large scale GUI changes feasible with restricted developer resources, so that may be an option for LMMS, though keep in mind that's a very large project within itself.

SecondFlight · 2018-06-03T15:45:25Z

And I really don't feel equipped to do that kind of overhaul, both from lack of general experience as well as a lack of knowledge of the inner workings of the software. My current plan is to slowly start developing widgets that could be useful later so as to save time for whoever puts it all together, be it me or somebody else. Still, I completely agree that implementing the UI for an individual plugin or feature shouldn't take weeks and should be doable by someone fairly new to the codebase.

budislav · 2018-06-03T23:52:52Z

@SecondFlight Just to answer on your questions, when I said gui scaling I meant that it should look crisp and pixel perfect on all resolutions even high display resolutions like "retina". FL studio have some nice settings for scaling gui so you if user feel that his gui is too small he can just scale it up. https://www.image-line.com/support/flstudio_online_manual/html/envsettings_general.htm
This is why I think there should not be images in gui at all, I think you understand :)

SecondFlight · 2018-06-05T12:17:57Z

/root/project/src/gui/widgets/VectorGraph.cpp:632:64: error: 'rightPoint' may be used uninitialized in this function [-Werror=maybe-uninitialized]
    else if (checkRight && potentialSnappedValue > rightPoint->x())

Oh come on, checkRight will only be true if rightPoint is initialized.
sigh
I'll fix this tonight.

src/gui/widgets/VectorGraph.cpp

PhysSong · 2018-08-18T07:28:02Z

src/gui/widgets/VectorGraph.cpp

+	return false;
+}
+
+float VectorGraph::calculateSample(float input)


Do we need to have this as a separate function? I think one can use model()->calculateSample directly.

src/gui/widgets/VectorGraph.cpp

include/VectorGraph.h

PhysSong · 2018-08-19T11:22:13Z

include/VectorGraph.h

+		return castModel<VectorGraphModel>();
+	}
+
+	inline int getWidth()


Please consider not using get prefix unless the meaning is ambiguous without it.

It can be confused with QWidget::width(), so I think we should check if we really need this.

SecondFlight · 2018-08-21T15:05:05Z

@PhysSong,
Thanks for reviewing this. I'll wrap up this PR and address the comments once 1.3 becomes a development focus.

PhysSong · 2022-12-24T01:04:13Z

I've resolved merge conflicts and applied minor fixes. Modernization and other reviews are not applied yet. I'll try to continue working on this.

PhysSong · 2023-01-02T13:34:31Z

include/VectorGraph.h

+	static inline bool floatEqual(float a, float b, float epsilon)
+	{
+		return qFabs(a - b) < epsilon;
+	}


No reason to reside in a class.

PhysSong · 2023-01-02T13:36:25Z

src/gui/widgets/VectorGraph.cpp

+VectorGraphPoint * VectorGraphModel::getPoint(int index)
+{
+	return & m_points[index];
+}


Returning by address looks weird.

PhysSong · 2023-01-02T13:36:54Z

include/VectorGraph.h

+		return result;
+	}
+
+	float calculateSingleCurve(float input, VectorGraphPoint * point);


Should be moved to VectorGraphPoint instead.

PhysSong · 2023-01-02T13:37:30Z

include/VectorGraph.h

+#include <QWidget>
+#include <QPainter>
+#include <QVector>
+#include <QtMath>


Standard C++ math functions look better than Qt math functions.

PhysSong · 2023-01-02T13:38:09Z

include/VectorGraph.h

+{
+	Q_OBJECT
+public:
+	enum TensionType


I think this should be in the model class.

PhysSong · 2023-01-02T13:39:09Z

plugins/WaveShaper2/WaveShaper2Controls.cpp

+#include "Song.h"
+
+
+#define onedB 1.1220184543019633f


constexpr instead

Create copy of original waveshaper

578415a

SecondFlight added the in progress label May 18, 2018

SecondFlight added 13 commits May 22, 2018 17:58

Merge branch 'master' into waveshaper2

e99b4ec

Begin VectorGraph class

2f9bc3e

Begin adding model

ae58cf7

Basic data storage and rendering

c0a2ef8

Initial revision of drawing code

a3a062a

Create points with right click

b851c69

Move newly created points before releasing right click

ba67f4f

Points cannot be moved above 1 or below 0

8de2637

Make points movable

4c60044

Add tension handles

ba5069f

Add locking to points

e47df2a

Editible tension points

9a2a8f8

Fix mouse tracking bug

caa6039

SecondFlight mentioned this pull request May 26, 2018

Wacom Tablet support #4376

Closed

Hook up DSP

c3104b3

SecondFlight changed the title ~~Improved Waveshaper~~ Improved Waveshaper / Spline-based graph replacement May 28, 2018

SecondFlight added 3 commits May 28, 2018 17:14

Various tension tweaks

fa7a784

Allow points to be deleted via right click

44ea721

Prevent a point and a tension handle from being manipulated simultane…

36f1691

…ously

PhysSong reviewed May 29, 2018

View reviewed changes

Fix warnings

e6c217a

PhysSong reviewed May 29, 2018

View reviewed changes

plugins/waveshaper2/waveshaper2.cpp Outdated Show resolved Hide resolved

PhysSong reviewed May 30, 2018

View reviewed changes

SecondFlight added 3 commits May 29, 2018 20:29

Change curve to be based on a cycloid instead of a parabola

e6a3464

spaces -> tabs

43b61db

Points that are completely locked cannot be targeted for drag

a2f9fd1

Remove unnecessary buttons

01d99d1

SecondFlight mentioned this pull request Jun 3, 2018

(Discussion) Path moving forward for UI/UX redesign #4398

Closed

Apparently removing those pictures was a bad idea

823e8f9

SecondFlight added 2 commits June 3, 2018 20:17

Clean up

5a342fc

Enable snap to grid when alt is pressed

a84fd70

SecondFlight added 2 commits June 5, 2018 19:02

Warning fixed I think

6d202ad

How about now

a650529

PhysSong reviewed Aug 18, 2018

View reviewed changes

PhysSong reviewed Aug 19, 2018

View reviewed changes

SecondFlight mentioned this pull request Apr 12, 2019

Indentation (tabs or spaces) #4810

Closed

Spekular mentioned this pull request Sep 28, 2019

Tempo Synced Envelope Controller #5208

Open

LostRobotMusic mentioned this pull request Apr 28, 2020

Graph: add Control+click feature for compressor usage #3140

Closed

ryuukumar mentioned this pull request Jul 21, 2020

Reorganising LMMS, renaming editors and classes and everything in between (cont. #120) #5592

Closed

56 tasks

PhysSong added 4 commits December 22, 2022 10:45

Merge branch 'master' into waveshaper2

234dd95

Rename to WaveShaper2 and fix merge errors

3ed3520

VectorGraph: don't try to hide and fix cursors

31fb248

Fix a double free of VectorGraphModel

d7141c0

PhysSong self-assigned this Dec 24, 2022

PhysSong added 2 commits January 1, 2023 18:59

Revert submodule changes

970ce05

Partially address review comments

56dc975

PhysSong reviewed Jan 2, 2023

View reviewed changes

szeli1 mentioned this pull request Mar 23, 2024

New vector graph implementation #7158

Open

32 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improved Waveshaper / Spline-based graph replacement #4367

Improved Waveshaper / Spline-based graph replacement #4367

SecondFlight commented May 18, 2018 •

edited

Loading

PhysSong May 29, 2018

SecondFlight May 29, 2018

SecondFlight commented May 29, 2018 •

edited

Loading

PhysSong May 30, 2018

SecondFlight May 30, 2018

SecondFlight commented May 30, 2018

SecondFlight commented Jun 3, 2018

SecondFlight commented Jun 3, 2018

fundamental commented Jun 3, 2018

SecondFlight commented Jun 3, 2018

budislav commented Jun 3, 2018

SecondFlight commented Jun 5, 2018

PhysSong Aug 18, 2018

PhysSong Aug 19, 2018

PhysSong Jan 1, 2023

SecondFlight commented Aug 21, 2018 •

edited

Loading

PhysSong commented Dec 24, 2022

PhysSong Jan 2, 2023

PhysSong Jan 2, 2023

PhysSong Jan 2, 2023

PhysSong Jan 2, 2023

PhysSong Jan 2, 2023

PhysSong Jan 2, 2023

Improved Waveshaper / Spline-based graph replacement #4367

Are you sure you want to change the base?

Improved Waveshaper / Spline-based graph replacement #4367

Conversation

SecondFlight commented May 18, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SecondFlight commented May 29, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SecondFlight commented May 30, 2018

SecondFlight commented Jun 3, 2018

SecondFlight commented Jun 3, 2018

fundamental commented Jun 3, 2018

SecondFlight commented Jun 3, 2018

budislav commented Jun 3, 2018

SecondFlight commented Jun 5, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SecondFlight commented Aug 21, 2018 • edited Loading

PhysSong commented Dec 24, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SecondFlight commented May 18, 2018 •

edited

Loading

SecondFlight commented May 29, 2018 •

edited

Loading

SecondFlight commented Aug 21, 2018 •

edited

Loading