Skip to content

Commit

Permalink
perf: optimize performance for image drawing and levels update
Browse files Browse the repository at this point in the history
  • Loading branch information
@XeroxDev
XeroxDev committed Oct 11, 2024
1 parent dd016ef commit 0dbcfcb
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 103 deletions.
13 changes: 11 additions & 2 deletions src/VoiceMeeterPlugin/Actions/LevelsCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected override String GetCommandDisplayName(ActionEditorActionParameters act
return null;
}

var (name, channel, bgColor, fgColor) = parameters;
var (name, channel, _, _) = parameters;

this.VmService.Levels.AddChannel(channel);

Expand Down Expand Up @@ -158,7 +158,16 @@ protected override BitmapImage GetCommandImage(ActionEditorActionParameters acti
}

currentValue = (Single)Math.Round(currentValue, 10);


if (currentValue < 0)
{
currentValue = 0;
}

if (currentValue > 1)
{
currentValue = 1;
}

return DrawingHelper.DrawVolumeBar(PluginImageSize.Width60, bgColor.ToBitmapColor(), fgColor.ToBitmapColor(), currentValue, 0, 1, 1, "", name, false);
}
Expand Down
152 changes: 52 additions & 100 deletions src/VoiceMeeterPlugin/Helpers/DrawingHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,190 +6,142 @@

public static class DrawingHelper
{
private static String RESOURCE_PATH = "Loupedeck.VoiceMeeterPlugin.Resources";

public static SKPath RoundedRect(SKRect bounds, Int32 radius)
{
var diameter = radius * 2;
SKRect arc = new SKRect(bounds.Left, bounds.Top, bounds.Left + diameter, bounds.Top + diameter);
SKPath path = new SKPath();

if (radius == 0)
{
path.AddRect(bounds);
return path;
}

// top left arc
path.ArcTo(arc, 180, 90, false);

// top right arc
arc = new SKRect(bounds.Right - diameter, bounds.Top, bounds.Right, bounds.Top + diameter);
path.ArcTo(arc, 270, 90, false);

// bottom right arc
arc = new SKRect(bounds.Right - diameter, bounds.Bottom - diameter, bounds.Right, bounds.Bottom);
path.ArcTo(arc, 0, 90, false);

// bottom left arc
arc = new SKRect(bounds.Left, bounds.Bottom - diameter, bounds.Left + diameter, bounds.Bottom);
path.ArcTo(arc, 90, 90, false);

path.Close();
return path;
}
private static readonly String RESOURCE_PATH = "Loupedeck.VoiceMeeterPlugin.Resources";

public static BitmapImage ReadImage(String imageName, String ext = "png", String addPath = "Images")
=> EmbeddedResources.ReadImage($"{RESOURCE_PATH}.{addPath}.{imageName}.{ext}");

public static BitmapBuilder LoadBitmapBuilder
(String imageName = "clear", String text = null, BitmapColor? textColor = null, String ext = "png",
String addPath = "Images")
public static BitmapBuilder LoadBitmapBuilder(String imageName = "clear", String text = null, BitmapColor? textColor = null, String ext = "png", String addPath = "Images")
=> LoadBitmapBuilder(ReadImage(imageName, ext, addPath), text, textColor);

public static BitmapBuilder LoadBitmapBuilder
(BitmapImage image, String text = null, BitmapColor? textColor = null)
public static BitmapBuilder LoadBitmapBuilder(BitmapImage image, String text = null, BitmapColor? textColor = null)
{
var builder = new BitmapBuilder(80, 80);

builder.Clear(BitmapColor.Black);
builder.DrawImage(image);

return text is null ? builder : builder.AddTextOutlined(text, textColor: textColor);
}

public static BitmapImage LoadBitmapImage
(String imageName = "clear", String text = null, BitmapColor? textColor = null, String ext = "png",
String addPath = "Images")
public static BitmapImage LoadBitmapImage(String imageName = "clear", String text = null, BitmapColor? textColor = null, String ext = "png", String addPath = "Images")
=> LoadBitmapBuilder(imageName, text, textColor, ext, addPath).ToImage();

public static BitmapImage LoadBitmapImage(BitmapImage image, String text = null, BitmapColor? textColor = null)
=> LoadBitmapBuilder(image, text, textColor).ToImage();

public static BitmapBuilder AddTextOutlined(this BitmapBuilder builder, String text,
BitmapColor? outlineColor = null,
BitmapColor? textColor = null, Int32 fontSize = 12)
public static BitmapBuilder AddTextOutlined(this BitmapBuilder builder, String text, BitmapColor? outlineColor = null, BitmapColor? textColor = null, Int32 fontSize = 12)
{
// TODO: Make it outline
builder.DrawText(text, 0, -30, 80, 80, textColor, fontSize, 0, 0);
return builder;
}

public static BitmapImage DrawDefaultImage(String innerText, String outerText, SKColor brushColor, Int32 width = 80, Int32 height = 80)
{
// Set the dimensions and font
SKTypeface font = SKTypeface.FromFamilyName("Arial", SKFontStyleWeight.Bold, SKFontStyleWidth.Normal, SKFontStyleSlant.Upright);
var fontSize = 20;

// Create the canvas and paint
var info = new SKImageInfo(width, height);
var surface = SKSurface.Create(info);
using var surface = SKSurface.Create(info);
var canvas = surface.Canvas;
var paint = new SKPaint { Color = brushColor, IsAntialias = true, Typeface = font };
using var paint = new SKPaint();
paint.Color = brushColor;
paint.IsAntialias = true;
paint.Typeface = font;

// Calculate the dimensions of the rounded rectangle outline
var rect = new SKRect(5, 20, width - 5, height - 20);

// Adjust the font size if necessary to fit the inner text within the dimensions of the rounded rectangle outline
while (true)
{
paint.TextSize = fontSize;
SKRect tb = new SKRect();
paint.MeasureText(innerText, ref tb);
if (tb.Width < rect.Width - 5 && tb.Height < rect.Height)
{
break;
}

fontSize--;
}
paint.TextSize = GetOptimalFontSize(innerText, paint, rect);

// Draw the rounded rectangle outline
var cornerRadius = Math.Min(width, height) / 2;
paint.Style = SKPaintStyle.Stroke;
paint.StrokeWidth = 2;
canvas.DrawRoundRect(rect, cornerRadius, cornerRadius, paint);
paint.Style = SKPaintStyle.Fill;

// Draw the inner text centered within the rounded rectangle outline
paint.TextAlign = SKTextAlign.Center;
paint.TextSize = fontSize;
canvas.DrawText(innerText, rect.MidX, rect.MidY - (paint.FontMetrics.Descent + paint.FontMetrics.Ascent) / 2, paint);

// Save the image to memory and return the memory streams
var image = surface.Snapshot();
var data = image.Encode(SKEncodedImageFormat.Png, 100);

return LoadBitmapImage(BitmapImage.FromArray(data.ToArray()), outerText);
}

public static BitmapImage DrawVolumeBar(PluginImageSize imageSize, BitmapColor backgroundColor, BitmapColor foregroundColor, Single currentValue, Int32 minValue, Int32 maxValue,
Int32 scaleFactor, String cmd, String name = "", Boolean drawValue = true)
public static BitmapImage DrawVolumeBar(PluginImageSize imageSize, BitmapColor backgroundColor, BitmapColor foregroundColor, Single currentValue, Int32 minValue, Int32 maxValue, Int32 scaleFactor, String cmd, String name = "", Boolean drawValue = true)
{
// Prepare variables
var dim = imageSize.GetDimension();
var percentage = (currentValue - minValue) / (maxValue - minValue) * 100;
var percentage = (currentValue - minValue) / (maxValue - minValue);
var height = (Int32)(dim * 0.9);
var width = (Int32)(dim * 0.6);
var calculatedHeight = (Int32)(height * percentage / 100);
var calculatedHeight = (Int32)(height * percentage);
var xCenter = dim / 2 - width / 2;
var yCenter = dim / 2 + height / 2;
var builder = new BitmapBuilder(dim, dim);
using var builder = new BitmapBuilder(dim, dim);

// Reset to black
builder.Clear(BitmapColor.Black);

// Draw volume bar and border
builder.DrawRectangle(xCenter, yCenter, width, -height, backgroundColor);
builder.FillRectangle(xCenter, yCenter, width, -calculatedHeight, backgroundColor);

// Draw value text at the center
if (drawValue)
{
builder.DrawText((currentValue / scaleFactor).ToString(CultureInfo.CurrentCulture), foregroundColor);
}

const Int32 fontSize = 16;

var cmdSize = GetFontSize(fontSize, cmd, dim);

// Draw cmd text at the bottom
var cmdSize = GetOptimalFontSize(cmd, dim: dim);
builder.DrawText(cmd, 0, dim / 2 - cmdSize / 2, dim, dim, foregroundColor, cmdSize, 0, 0);

// if name is available, draw it over the volume bar
if (String.IsNullOrEmpty(name))
if (String.IsNullOrWhiteSpace(name))
{
return builder.ToImage();
}

var nameSize = GetFontSize(fontSize, name, dim);

// draw the text using the calculated font size
var nameSize = GetOptimalFontSize(name, dim: dim);
builder.DrawText(name, 0, dim / 2 * -1 + nameSize / 2, dim, dim, foregroundColor, nameSize, 0, 0);

return builder.ToImage();
}

private static Int32 GetFontSize(Int32 fontSize, String text, Int32 dim)
private static Int32 GetOptimalFontSize(String text, SKPaint paint = null, SKRect? rect = null, Int32? dim = null)
{
// create a SKPaint object for measuring the text
var paint = new SKPaint { TextSize = fontSize, IsAntialias = true };
var minFontSize = 1;
var maxFontSize = 16;
SKRect textBounds = new SKRect();

// measure the size of the text
var textBounds = new SKRect();
paint.MeasureText(text, ref textBounds);
if (paint is null)
{
paint = new SKPaint { IsAntialias = true };
}

// adjust the font size until the text fits within the bounds of the image
while (textBounds.Width > dim || textBounds.Height > dim)
while (minFontSize <= maxFontSize)
{
fontSize -= 1;
paint.TextSize = fontSize;
var midFontSize = (minFontSize + maxFontSize) / 2;
paint.TextSize = midFontSize;
paint.MeasureText(text, ref textBounds);

var fits = false;

if (rect.HasValue)
{
fits = textBounds.Width <= rect.Value.Width && textBounds.Height <= rect.Value.Height;
}
else if (dim.HasValue)
{
fits = textBounds.Width <= dim.Value && textBounds.Height <= dim.Value;
}

if (fits)
{
minFontSize = midFontSize + 1;
}
else
{
maxFontSize = midFontSize - 1;
}
}

return fontSize;
return maxFontSize;
}



private static Int32 GetDimension(this PluginImageSize size) =>
size switch
{
Expand Down
10 changes: 9 additions & 1 deletion src/VoiceMeeterPlugin/Library/Voicemeeter/Levels.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class Channel
private readonly List<IObserver<Single[]>> _observers = [];
private readonly IObservable<Int32> _timer;
private IDisposable _timerSubscription;
private List<Single> _oldValues;

public Levels(Int32 milliseconds = 20)
{
Expand Down Expand Up @@ -51,7 +52,14 @@ private void Watch() =>
}
var values = new List<Single>(this._channels.Count);
values.AddRange(this._channels.Select(channel => Remote.GetLevel(channel.LevelType, channel.ChannelNumber)));


// This is maybe to harsh, but this will prevent the same values to be sent multiple times, which is good for performance.
if (this._oldValues != null && (this._oldValues.SequenceEqual(values) || this._oldValues.Sum() == values.Sum()))
{
return;
}

this._oldValues = values;
this.Notify(values.ToArray());
});

Expand Down

0 comments on commit 0dbcfcb

Please sign in to comment.