(d9829ac) v0.9.4.0

This commit is contained in:
Regalis
2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
@@ -5,16 +5,13 @@ namespace Barotrauma.SpriteDeformations
{
class NoiseDeformationParams : SpriteDeformationParams
{
[Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 100.0f,
ToolTip = "The frequency of the noise.")]
[Serialize(0.0f, true, description: "The frequency of the noise."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 100.0f)]
public override float Frequency { get; set; }
[Serialize(1.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "How much the noise distorts the sprite.")]
[Serialize(1.0f, true, description: "How much the noise distorts the sprite."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f, DecimalCount = 2, ValueStep = 0.01f)]
public float Amplitude { get; set; }
[Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "How fast the noise changes.")]
[Serialize(0.0f, true, description: "How fast the noise changes."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f, DecimalCount = 2, ValueStep = 0.01f)]
public float ChangeSpeed { get; set; }
public NoiseDeformationParams(XElement element) : base(element)
@@ -24,7 +21,7 @@ namespace Barotrauma.SpriteDeformations
class NoiseDeformation : SpriteDeformation
{
private NoiseDeformationParams NoiseDeformationParams => deformationParams as NoiseDeformationParams;
private NoiseDeformationParams NoiseDeformationParams => Params as NoiseDeformationParams;
private float phase;
@@ -53,7 +50,7 @@ namespace Barotrauma.SpriteDeformations
protected override void GetDeformation(out Vector2[,] deformation, out float multiplier)
{
deformation = Deformation;
multiplier = NoiseDeformationParams.Amplitude;
multiplier = NoiseDeformationParams.Amplitude * Params.Strength;
}
public override void Update(float deltaTime)