diff --git a/FMODCoreAPI/Assets/AMD64/fmod.dll b/FMODCoreAPI/Assets/AMD64/fmod.dll
index 290f57a..7c2baf7 100644
--- a/FMODCoreAPI/Assets/AMD64/fmod.dll
+++ b/FMODCoreAPI/Assets/AMD64/fmod.dll
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:205cf4342eb47eb9b5905242b1a5d17fd51a1621bb011782e67b39804db24247
-size 1851904
+oid sha256:ba58dfbdd1f3dee7a4e818f5812fee345d096224f50f347dc44d9f444ae2a295
+size 1852416
diff --git a/FMODCoreAPI/Assets/ARM64/fmod.dll b/FMODCoreAPI/Assets/ARM64/fmod.dll
index bf5ab72..f6b46fa 100644
--- a/FMODCoreAPI/Assets/ARM64/fmod.dll
+++ b/FMODCoreAPI/Assets/ARM64/fmod.dll
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b8eb9efe9a638343814ff0f545fb9baa50ef055582cfb2a6d2e2d6ab36016c7f
-size 1419264
+oid sha256:d609ed06c46953e4240f4871e634034a9359d35b036b2543d9bb6d4c511073a0
+size 1419776
diff --git a/FMODCoreAPI/fmod.cs b/FMODCoreAPI/fmod.cs
index 5b88ec1..2f9e90e 100644
--- a/FMODCoreAPI/fmod.cs
+++ b/FMODCoreAPI/fmod.cs
@@ -19,7 +19,7 @@
*/
public partial class VERSION
{
- public const int number = 0x00020221;
+ public const int number = 0x00020222;
#if !UNITY_2019_4_OR_NEWER
public const string dll = "fmod";
#endif
diff --git a/Qwilight/Bound.cs b/Qwilight/Bound.cs
index b7529cb..fae7c2a 100644
--- a/Qwilight/Bound.cs
+++ b/Qwilight/Bound.cs
@@ -60,9 +60,11 @@
public bool CanPaint => Length > 0.0 && Height > 0.0;
- public static implicit operator Windows.Foundation.Rect(Bound r) => new Windows.Foundation.Rect(r.Position0Margin + r.Position0, r.Position1Margin + r.Position1, r.Length, r.Height);
+ public Rect GetMarginless() => new Rect(Position0, Position1, Length, Height);
- public static implicit operator Bound(Windows.Foundation.Rect r) => new Bound(r.X, r.Y, r.Width, r.Height);
+ public static implicit operator Rect(Bound r) => new Rect(r.Position0Margin + r.Position0, r.Position1Margin + r.Position1, r.Length, r.Height);
+
+ public static implicit operator Bound(Rect r) => new Bound(r.X, r.Y, r.Width, r.Height);
public static implicit operator Vector2(Bound r) => new Vector2((float)(r.Position0Margin + r.Position0), (float)(r.Position1Margin + r.Position1));
diff --git a/Qwilight/Compute/DefaultCompute.cs b/Qwilight/Compute/DefaultCompute.cs
index ee52050..ee99354 100644
--- a/Qwilight/Compute/DefaultCompute.cs
+++ b/Qwilight/Compute/DefaultCompute.cs
@@ -2866,7 +2866,7 @@
audioChannelMap[AudioSystem.InputAudio][nameof(AudioSystem.Instance.BanalAudio)] = AudioSystem.Instance.Handle(new()
{
AudioItem = banalAudioValue
- }, AudioSystem.InputAudio, AudioMultiplier, IsCounterWave, this, 0.0, inputPower);
+ }, AudioSystem.InputAudio, AudioMultiplier, false, this, 0.0, inputPower);
}
}
}
diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj
index e8b1660..d157fa9 100644
--- a/Qwilight/Qwilight.csproj
+++ b/Qwilight/Qwilight.csproj
@@ -39,7 +39,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
all
diff --git a/Qwilight/System/AudioInputSystem.cs b/Qwilight/System/AudioInputSystem.cs
index dd083a7..181a66b 100644
--- a/Qwilight/System/AudioInputSystem.cs
+++ b/Qwilight/System/AudioInputSystem.cs
@@ -35,7 +35,7 @@
public AudioInputSystem()
{
- _frameLength = _waveFormat.SampleRate / 1000 * 20;
+ _frameLength = _waveFormat.Channels * _waveFormat.SampleRate / 1000 * 20;
_zippingData = new byte[2 * _frameLength];
_zipper = OpusCodecFactory.CreateEncoder(_waveFormat.SampleRate, _waveFormat.Channels, OpusApplication.OPUS_APPLICATION_VOIP);
_rawer = OpusCodecFactory.CreateDecoder(_waveFormat.SampleRate, _waveFormat.Channels);
diff --git a/Qwilight/System/DrawingSystem/DrawingSystem.cs b/Qwilight/System/DrawingSystem/DrawingSystem.cs
index 441177b..ccdcdb4 100644
--- a/Qwilight/System/DrawingSystem/DrawingSystem.cs
+++ b/Qwilight/System/DrawingSystem/DrawingSystem.cs
@@ -1211,15 +1211,15 @@
case Event.Types.NetDrawing.Types.Variety.Note:
r.Set(drawing.Position0 * valueLength, drawing.Position1 * valueHeight, drawing.Length * valueLength, drawing.Height * valueHeight);
var ellipse = (float)Math.Min(r.Length / 2, r.Height / 2);
- session.FillRoundedRectangle(r, ellipse, ellipse, valueColor);
+ session.FillRoundedRectangle(r.GetMarginless(), ellipse, ellipse, valueColor);
break;
case Event.Types.NetDrawing.Types.Variety.Main:
r.Set(drawing.Position0 * valueLength, drawing.Position1 * valueHeight, drawing.Length * valueLength, drawing.Height * valueHeight);
- session.FillRectangle(r, valueColor);
+ session.FillRectangle(r.GetMarginless(), valueColor);
break;
case Event.Types.NetDrawing.Types.Variety.Meter:
r.Set(0F, drawing.Position1 * valueHeight, highestNetHeight, valueHeight);
- session.FillRectangle(r, valueColor);
+ session.FillRectangle(r.GetMarginless(), valueColor);
break;
}
}
diff --git a/Qwilight/System/RGBSystem/WootingSystem.cs b/Qwilight/System/RGBSystem/WootingSystem.cs
index 82bb6ec..0551ef5 100644
--- a/Qwilight/System/RGBSystem/WootingSystem.cs
+++ b/Qwilight/System/RGBSystem/WootingSystem.cs
@@ -116,10 +116,6 @@
{
if (RGBControl.IsConnected())
{
- for (var i = RGBControl.GetDeviceCount(); i >= 0; --i)
- {
- RGBControl.SetControlDevice(i);
- }
return true;
}
else
@@ -147,6 +143,10 @@
public override void OnBeforeHandle()
{
+ for (var i = RGBControl.GetDeviceCount(); i >= 0; --i)
+ {
+ RGBControl.SetControlDevice(i);
+ }
}
public override void OnHandled()