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/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);
}
}
}