vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(d9829ac) v0.9.4.0

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Sprite/DeformAnimations/CustomDeformation.cs
+6 -6
View File
@@ -8,13 +8,12 @@ namespace Barotrauma.SpriteDeformations
{
class CustomDeformationParams : SpriteDeformationParams
{
[Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "How fast the deformation \"oscillates\" back and forth. " +
[Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f),
Serialize(0.0f, true, description: "How fast the deformation \"oscillates\" back and forth. " +
"For example, if the sprite is stretched up, setting this value above zero would make it do a wave-like movement up and down.")]
public override float Frequency { get; set; } = 1;
[Serialize(1.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "The \"strength\" of the deformation.")]
[Serialize(1.0f, true, description: "The \"strength\" of the deformation."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f)]
public float Amplitude { get; set; }
public CustomDeformationParams(XElement element) : base(element)
@@ -26,7 +25,7 @@ namespace Barotrauma.SpriteDeformations
{
private List<Vector2[]> deformRows = new List<Vector2[]>();
private CustomDeformationParams CustomDeformationParams => deformationParams as CustomDeformationParams;
private CustomDeformationParams CustomDeformationParams => Params as CustomDeformationParams;
public override float Phase
{
@@ -116,11 +115,12 @@ namespace Barotrauma.SpriteDeformations
multiplier = CustomDeformationParams.Frequency <= 0.0f ?
CustomDeformationParams.Amplitude :
(float)Math.Sin(phase) * CustomDeformationParams.Amplitude;
multiplier *= Params.Strength;
}
public override void Update(float deltaTime)
{
if (!deformationParams.UseMovementSine)
if (!Params.UseMovementSine)
{
phase += deltaTime * CustomDeformationParams.Frequency;
phase %= MathHelper.TwoPi;
Barotrauma/BarotraumaClient/Source/Sprite/DeformAnimations/Inflate.cs
+3 -2
View File
@@ -31,7 +31,7 @@ namespace Barotrauma.SpriteDeformations
private Vector2[,] deformation;
private InflateParams InflateParams => deformationParams as InflateParams;
private InflateParams InflateParams => Params as InflateParams;
public Inflate(XElement element) : base(element, new InflateParams(element))
{
@@ -58,11 +58,12 @@ namespace Barotrauma.SpriteDeformations
{
deformation = this.deformation;
multiplier = InflateParams.Frequency <= 0.0f ? InflateParams.Scale : (float)(Math.Sin(phase) + 1.0f) / 2.0f * InflateParams.Scale;
multiplier *= Params.Strength;
}
public override void Update(float deltaTime)
{
if (!deformationParams.UseMovementSine)
if (!Params.UseMovementSine)
{
phase += deltaTime * InflateParams.Frequency;
phase %= MathHelper.TwoPi;
Barotrauma/BarotraumaClient/Source/Sprite/DeformAnimations/JointBendDeformation.cs
+10 -13
View File
@@ -21,7 +21,7 @@ namespace Barotrauma.SpriteDeformations
public float BendRight
{
get { return bendRight; }
set { bendRight = MathHelper.Clamp(value, -maxRotation, maxRotation); }
set { bendRight = MathHelper.Clamp(value, -MaxRotationInRadians, MaxRotationInRadians); }
}
//the pivot point to rotate the right side around
public Vector2 BendRightRefPos = new Vector2(1.0f, 0.5f);
@@ -30,7 +30,7 @@ namespace Barotrauma.SpriteDeformations
public float BendLeft
{
get { return bendLeft; }
set { bendLeft = MathHelper.Clamp(value, -maxRotation, maxRotation); }
set { bendLeft = MathHelper.Clamp(value, -MaxRotationInRadians, MaxRotationInRadians); }
}
public Vector2 BendLeftRefPos = new Vector2(0.0f, 0.5f);
@@ -38,7 +38,7 @@ namespace Barotrauma.SpriteDeformations
public float BendUp
{
get { return bendUp; }
set { bendUp = MathHelper.Clamp(value, -maxRotation, maxRotation); }
set { bendUp = MathHelper.Clamp(value, -MaxRotationInRadians, MaxRotationInRadians); }
}
public Vector2 BendUpRefPos = new Vector2(0.5f, 0.0f);
@@ -46,18 +46,15 @@ namespace Barotrauma.SpriteDeformations
public float BendDown
{
get { return bendDown; }
set { bendDown = MathHelper.Clamp(value, -maxRotation, maxRotation); }
set { bendDown = MathHelper.Clamp(value, -MaxRotationInRadians, MaxRotationInRadians); }
}
public Vector2 BendDownRefPos = new Vector2(0.5f, 1.0f);
public Vector2 Scale = Vector2.Zero;
private float maxRotation;
private float MaxRotationInRadians => MathHelper.ToRadians(Params.MaxRotation);
public JointBendDeformation(XElement element) : base(element, new JointBendDeformationParams(element))
{
maxRotation = MathHelper.ToRadians(element == null ? 90.0f : element.GetAttributeFloat("maxrotation", 90.0f));
}
public JointBendDeformation(XElement element) : base(element, new JointBendDeformationParams(element)) { }
protected override void GetDeformation(out Vector2[,] deformation, out float multiplier)
{
@@ -80,7 +77,7 @@ namespace Barotrauma.SpriteDeformations
{
float strength = 1.0f - normalizedPos.X;//(1.0f - Math.Max(normalizedPos.X - BendLeftRefPos.X, 0.0f) / (1.0f - BendLeftRefPos.X));
strength = Math.Max((strength - 0.5f) * 2.0f, 0.0f);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendLeftRefPos, BendLeft * strength);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendLeftRefPos, BendLeft * strength * Params.Strength);
Vector2 offset = rotatedP - normalizedPos;
offset.X *= Scale.Y / Scale.X;
Deformation[x, y] += offset;
@@ -89,7 +86,7 @@ namespace Barotrauma.SpriteDeformations
{
float strength = normalizedPos.X;//(1.0f - Math.Max(BendRightRefPos.X - normalizedPos.X, 0.0f) / (BendRightRefPos.X));
strength = Math.Max((strength - 0.5f) * 2.0f, 0.0f);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendRightRefPos, BendRight * strength);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendRightRefPos, BendRight * strength * Params.Strength);
Vector2 offset = rotatedP - normalizedPos;
offset.X *= Scale.Y / Scale.X;
Deformation[x, y] += offset;
@@ -99,7 +96,7 @@ namespace Barotrauma.SpriteDeformations
{
float strength = 1.0f - normalizedPos.Y;//(1.0f - Math.Max(normalizedPos.Y - BendUpRefPos.Y, 0.0f) / (1.0f - BendUpRefPos.Y));
strength = Math.Max((strength - 0.5f) * 2.0f, 0.0f);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendUpRefPos, BendUp * strength);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendUpRefPos, BendUp * strength * Params.Strength);
Vector2 offset = rotatedP - normalizedPos;
offset.Y *= Scale.X / Scale.Y;
Deformation[x, y] += offset;
@@ -108,7 +105,7 @@ namespace Barotrauma.SpriteDeformations
{
float strength = normalizedPos.Y;//(1.0f - Math.Max(BendDownRefPos.Y - normalizedPos.Y, 0.0f) / (BendDownRefPos.Y));
strength = Math.Max((strength - 0.5f) * 2.0f, 0.0f);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendDownRefPos, BendDown * strength);
Vector2 rotatedP = RotatePointAroundTarget(normalizedPos, BendDownRefPos, BendDown * strength * Params.Strength);
Vector2 offset = rotatedP - normalizedPos;
offset.Y *= Scale.X / Scale.Y;
Deformation[x, y] += offset;
Barotrauma/BarotraumaClient/Source/Sprite/DeformAnimations/NoiseDeformation.cs
+5 -8
View File
@@ -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)
Barotrauma/BarotraumaClient/Source/Sprite/DeformAnimations/PositionalDeformation.cs
+5 -9
View File
@@ -10,30 +10,26 @@ namespace Barotrauma.SpriteDeformations
/// 0 = no falloff, the entire sprite is stretched
/// 1 = stretching the center of the sprite has no effect at the edges
/// </summary>
[Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 1.0f,
ToolTip = "0 = no falloff, the entire sprite is stretched, 1 = stretching the center of the sprite has no effect at the edges.")]
[Serialize(0.0f, true, description: "0 = no falloff, the entire sprite is stretched, 1 = stretching the center of the sprite has no effect at the edges."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 1.0f)]
public float Falloff { get; set; }
/// <summary>
/// Maximum stretch per vertex (1 = the size of the sprite)
/// </summary>
[Serialize(1.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "Maximum stretch per vertex (1 = the size of the sprite)")]
[Serialize(1.0f, true, description: "Maximum stretch per vertex (1 = the size of the sprite)"), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f)]
public float MaxDeformation { get; set; }
/// <summary>
/// How fast the sprite reacts to being stretched
/// </summary>
[Serialize(1.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "How fast the sprite reacts to being stretched")]
[Serialize(1.0f, true, description: "How fast the sprite reacts to being stretched"), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f)]
public float ReactionSpeed { get; set; }
/// <summary>
/// How fast the sprite returns back to normal after stretching ends
/// </summary>
[Serialize(0.1f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "How fast the sprite returns back to normal after stretching ends")]
[Serialize(0.1f, true, description: "How fast the sprite returns back to normal after stretching ends"), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f)]
public float RecoverSpeed { get; set; }
public PositionalDeformationParams(XElement element) : base(element)
@@ -52,7 +48,7 @@ namespace Barotrauma.SpriteDeformations
public ReactionType Type;
private PositionalDeformationParams positionalDeformationParams => DeformationParams as PositionalDeformationParams;
private PositionalDeformationParams positionalDeformationParams => Params as PositionalDeformationParams;
public PositionalDeformation(XElement element) : base(element, new PositionalDeformationParams(element))
{
Barotrauma/BarotraumaClient/Source/Sprite/DeformAnimations/SpriteDeformation.cs
+25 -25
View File
@@ -14,7 +14,7 @@ namespace Barotrauma.SpriteDeformations
/// A positive value means that this deformation is or could be used for multiple sprites.
/// This behaviour is not automatic, and has to be implemented for any particular case separately (currently only used in Limbs).
/// </summary>
[Serialize(-1, true)]
[Serialize(-1, true), Editable]
public int Sync
{
get;
@@ -35,18 +35,24 @@ namespace Barotrauma.SpriteDeformations
set;
}
public string Name => GetType().Name;
public string Name => $"Deformation ({TypeName})";
[Serialize(false, true)]
[Serialize(1.0f, true), Editable(MinValueFloat = 0, MaxValueFloat = 10, DecimalCount = 2, ValueStep = 0.01f)]
public float Strength { get; private set; }
[Serialize(90f, true), Editable(MinValueFloat = 0, MaxValueFloat = 90)]
public float MaxRotation { get; private set; }
[Serialize(false, true), Editable]
public bool UseMovementSine { get; set; }
[Serialize(false, true)]
[Serialize(false, true), Editable]
public bool StopWhenHostIsDead { get; set; }
/// <summary>
/// Only used if UseMovementSine is enabled. Multiplier for Pi.
/// </summary>
[Serialize(0f, true)]
[Serialize(0f, true), Editable]
public float SineOffset { get; set; }
public virtual float Frequency { get; set; } = 1;
@@ -54,7 +60,7 @@ namespace Barotrauma.SpriteDeformations
public Dictionary<string, SerializableProperty> SerializableProperties
{
get;
private set;
set;
}
/// <summary>
@@ -97,7 +103,7 @@ namespace Barotrauma.SpriteDeformations
protected Vector2[,] Deformation { get; private set; }
protected SpriteDeformationParams deformationParams;
public SpriteDeformationParams Params { get; set; }
private static readonly string[] deformationTypes = new string[] { "Inflate", "Custom", "Noise", "BendJoint", "ReactToTriggerers" };
public static IEnumerable<string> DeformationTypes
@@ -107,19 +113,13 @@ namespace Barotrauma.SpriteDeformations
public Point Resolution
{
get { return deformationParams.Resolution; }
get { return Params.Resolution; }
set { SetResolution(value); }
}
public SpriteDeformationParams DeformationParams
{
get { return deformationParams; }
set { deformationParams = value; }
}
public string TypeName => Params.TypeName;
public string TypeName => deformationParams.TypeName;
public int Sync => deformationParams.Sync;
public int Sync => Params.Sync;
public static SpriteDeformation Load(string deformationType, string parentDebugName)
{
@@ -174,22 +174,22 @@ namespace Barotrauma.SpriteDeformations
if (newDeformation != null)
{
newDeformation.deformationParams.TypeName = typeName;
newDeformation.Params.TypeName = typeName;
}
return newDeformation;
}
protected SpriteDeformation(XElement element, SpriteDeformationParams deformationParams)
{
this.deformationParams = deformationParams;
this.Params = deformationParams;
SerializableProperty.DeserializeProperties(deformationParams, element);
Deformation = new Vector2[deformationParams.Resolution.X, deformationParams.Resolution.Y];
}
public void SetResolution(Point resolution)
{
deformationParams.Resolution = resolution;
Deformation = new Vector2[deformationParams.Resolution.X, deformationParams.Resolution.Y];
Params.Resolution = resolution;
Deformation = new Vector2[Params.Resolution.X, Params.Resolution.Y];
}
protected abstract void GetDeformation(out Vector2[,] deformation, out float multiplier);
@@ -200,10 +200,10 @@ namespace Barotrauma.SpriteDeformations
{
foreach (SpriteDeformation animation in animations)
{
if (animation.deformationParams.Resolution.X != animation.Deformation.GetLength(0) ||
animation.deformationParams.Resolution.Y != animation.Deformation.GetLength(1))
if (animation.Params.Resolution.X != animation.Deformation.GetLength(0) ||
animation.Params.Resolution.Y != animation.Deformation.GetLength(1))
{
animation.Deformation = new Vector2[animation.deformationParams.Resolution.X, animation.deformationParams.Resolution.Y];
animation.Deformation = new Vector2[animation.Params.Resolution.X, animation.Params.Resolution.Y];
}
}
@@ -224,7 +224,7 @@ namespace Barotrauma.SpriteDeformations
{
for (int y = 0; y < resolution.Y; y++)
{
switch (animation.deformationParams.BlendMode)
switch (animation.Params.BlendMode)
{
case DeformationBlendMode.Override:
deformation[x,y] = animDeformation[x,y] * scale * multiplier;
@@ -244,7 +244,7 @@ namespace Barotrauma.SpriteDeformations
public virtual void Save(XElement element)
{
SerializableProperty.SerializeProperties(deformationParams, element);
SerializableProperty.SerializeProperties(Params, element);
}
}
}