Skip to content

Commit

Permalink
fix double to nullable single cast error with EQ layer
Browse files Browse the repository at this point in the history
  • Loading branch information
Aytackydln committed Aug 30, 2024
1 parent fcc1aa7 commit f40f1df
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ public EqualizerBackgroundMode BackgroundMode
set => _backgroundMode = value;
}

private float? _maxAmplitude;
private double? _maxAmplitude;
[JsonProperty("_MaxAmplitude")]
[LogicOverridable("Max Amplitude")]
public float MaxAmplitude
public double MaxAmplitude
{
get => Logic?._maxAmplitude ?? _maxAmplitude ?? 20.0f;
set => _maxAmplitude = value;
Expand Down Expand Up @@ -345,7 +345,7 @@ public override EffectLayer Render(IGameState gamestate)
var fi = x * waveStepAmount;
var fftVal = localFft.Length > fi ? localFft[fi].X : 0.0f;
var brush = GetBrush(fftVal, x, SourceRect.Width);
var yOff = Math.Max(Math.Min(fftVal / scaledMaxAmplitude * 1000.0f, halfHeight), -halfHeight);
var yOff = Math.Max(Math.Min(fftVal / (float)scaledMaxAmplitude * 1000.0f, halfHeight), -halfHeight);
g.FillRectangle(brush, x, halfHeight - yOff, 1, yOff * 2);
}
break;
Expand All @@ -355,7 +355,7 @@ public override EffectLayer Render(IGameState gamestate)
var fi = x * waveStepAmount;
var fftVal = localFft.Length > fi ? localFft[fi].X : 0.0f;
var brush = GetBrush(fftVal, x, SourceRect.Width);
var yOff = Math.Min(Math.Abs(fftVal / scaledMaxAmplitude) * 1000.0f, SourceRect.Height);
var yOff = Math.Min(Math.Abs(fftVal / (float)scaledMaxAmplitude) * 1000.0f, SourceRect.Height);
g.FillRectangle(brush, x, SourceRect.Height - yOff, 1, yOff * 2);
}
break;
Expand Down Expand Up @@ -389,7 +389,7 @@ public override EffectLayer Render(IGameState gamestate)
var barWidth = SourceRect.Width / (freqs.Length - 1);
for (var fX = 0; fX < freqResults.Length - 1; fX++)
{
var fftVal = _fluxArray[fX] / scaledMaxAmplitude;
var fftVal = _fluxArray[fX] / (float)scaledMaxAmplitude;
fftVal = Math.Min(1.0f, fftVal);

if (_previousFreqResults[fX] - fftVal > 0.10)
Expand Down

0 comments on commit f40f1df

Please sign in to comment.