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

Working on improving the serialization system and ObjectProperty/IPropertyObject (TODO: come up with better names). The plan is to:

Browse Source 
- Add support for some of the most common types (vectors, colors, rects) so there's no need to parse the values in the setters of the serializable properties (see Holdable.HoldPos for example).
- Make a generic version of the item editing HUD that can be used on any IPropertyObject. Should make it easier to implement things like the character editor, editing structure properties, particle editor, etc.
- Improve the interface of the editing HUD. Instead of having to type in a string value into a textbox, there should be number input fields for numeric properties, sliders for properties that only accept a range of values, a color picker, etc. And tooltips.
This commit is contained in:
Joonas Rikkonen
2017-11-03 19:41:21 +02:00
parent 8b9be55135
commit a0d606ef5f
41 changed files with 345 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs
+11 -16
View File
@@ -26,49 +26,44 @@ namespace Barotrauma.Items.Components
Camera cam;
[HasDefaultValue("0,0", false)]
public string BarrelPos
[SerializableProperty("0,0", false)]
public Vector2 BarrelPos
{
get
{
return XMLExtensions.Vector2ToString(barrelPos);
return barrelPos;
}
set
{
barrelPos = XMLExtensions.ParseToVector2(value);
barrelPos = value;
}
}
[HasDefaultValue(0.0f, false)]
[SerializableProperty(0.0f, false)]
public float LaunchImpulse
{
get { return launchImpulse; }
set { launchImpulse = value; }
}
[HasDefaultValue(5.0f, false)]
[SerializableProperty(5.0f, false)]
public float Reload
{
get { return reloadTime; }
set { reloadTime = value; }
}
[HasDefaultValue("0.0,0.0", true), Editable]
public string RotationLimits
[SerializableProperty("0.0,0.0", true), Editable]
public Vector2 RotationLimits
{
get
{
Vector2 limits = new Vector2(minRotation, maxRotation);
limits.X = MathHelper.ToDegrees(limits.X);
limits.Y = MathHelper.ToDegrees(limits.Y);
return XMLExtensions.Vector2ToString(limits);
return new Vector2(MathHelper.ToDegrees(minRotation), MathHelper.ToDegrees(maxRotation));
}
set
{
Vector2 vector = XMLExtensions.ParseToVector2(value);
minRotation = MathHelper.ToRadians(vector.X);
maxRotation = MathHelper.ToRadians(vector.Y);
minRotation = MathHelper.ToRadians(value.X);
maxRotation = MathHelper.ToRadians(value.Y);
rotation = (minRotation + maxRotation) / 2;
}