stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

UDBScript: the scalex and scaley UDMF properties of things can now be set through the UDMF fields

Browse source
This commit is contained in:
biwa 2022-01-07 11:45:13 +01:00
parent d59342ed7f
commit 92fefb766a
4 changed files with 98 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Build/Configurations/Includes/ZDoom_misc.cfg
View file

@ -646,7 +646,19 @@ universalfields
{
type = 0;
default = 0;
}
}
scalex
{
type = 1;
default = 1.0;
}
scaley
{
type = 1;
default = 1.0;
}
}
sector

2
Source/Core/Resources/UDMF_UI.cfg
View file

@ -92,5 +92,7 @@ uifields
renderstyle = 2;
floatbobphase = 0;
comment = 2;
scalex = 1;
scaley = 1;
}
}

54
Source/Plugins/UDBScript/API/MapElementWrapper.cs
View file

@ -84,6 +84,8 @@ namespace CodeImp.DoomBuilder.UDBScript.Wrapper
foreach (KeyValuePair<string, UniValue> f in element.Fields)
o.Add(f.Key, f.Value.Value);
AddManagedFields(o);
// Create event that gets called when a property is changed. This sets the flag
((INotifyPropertyChanged)eo).PropertyChanged += new PropertyChangedEventHandler((sender, ea) => {
PropertyChangedEventArgs pcea = ea as PropertyChangedEventArgs;
@ -164,7 +166,9 @@ namespace CodeImp.DoomBuilder.UDBScript.Wrapper
}
else
{
if (so[pname] is double && ufi.Default is double)
if (so[pname] == null)
newvalue = null;
else if (so[pname] is double && ufi.Default is double)
newvalue = (double)so[pname];
else if (so[pname] is double && ufi.Default is int)
newvalue = Convert.ToInt32((double)so[pname]);
@ -179,19 +183,27 @@ namespace CodeImp.DoomBuilder.UDBScript.Wrapper
element.Fields.BeforeFieldsChange();
if (newvalue == null) // Remove the field when null was passed
if (ProcessManagedField(element.Fields, pname, newvalue))
{
element.Fields.Remove(pname);
so.Remove(pname);
if (newvalue == null) // Remove the field when null was passed
so.Remove(pname);
}
else
{
if (newvalue == null) // Remove the field when null was passed
{
element.Fields.Remove(pname);
so.Remove(pname);
}
else if (newvalue is double)
UniFields.SetFloat(element.Fields, pname, (double)newvalue);
else if (newvalue is int)
UniFields.SetInteger(element.Fields, pname, (int)newvalue);
else if (newvalue is string)
UniFields.SetString(element.Fields, pname, (string)newvalue, string.Empty);
else if (newvalue is bool)
element.Fields[pname] = new UniValue(UniversalType.Boolean, (bool)newvalue);
}
else if (newvalue is double)
UniFields.SetFloat(element.Fields, pname, (double)newvalue);
else if (newvalue is int)
UniFields.SetInteger(element.Fields, pname, (int)newvalue);
else if (newvalue is string)
UniFields.SetString(element.Fields, pname, (string)newvalue, string.Empty);
else if (newvalue is bool)
element.Fields[pname] = new UniValue(UniversalType.Boolean, (bool)newvalue);
AfterFieldsUpdate();
});
@ -213,8 +225,26 @@ namespace CodeImp.DoomBuilder.UDBScript.Wrapper
#region ================== Methods
/// <summary>
/// Called after the UDMF fields were updated, so other changes can be made to the map element, if necessary.
/// </summary>
internal abstract void AfterFieldsUpdate();
/// <summary>
/// Adds fields to the dictionary that are handled directly by UDB, but changing them is emulated through the UDMF fields.
/// </summary>
/// <param name="fields">UniFields of the map element</param>
internal virtual void AddManagedFields(IDictionary<string, object> fields) { }
/// <summary>
/// Processed a managed UDMF field, setting the managed value to what the user set in the UDMF field.
/// </summary>
/// <param name="fields">UniFields of the map element</param>
/// <param name="pname">field property name</param>
/// <param name="newvalue">field value</param>
/// <returns>true if the field needed to be processed, false if it didn't</returns>
internal virtual bool ProcessManagedField(UniFields fields, string pname, object newvalue) { return false; }
#endregion
}
}

41
Source/Plugins/UDBScript/API/ThingWrapper.cs
View file

@ -522,5 +522,46 @@ namespace CodeImp.DoomBuilder.UDBScript.Wrapper
}
#endregion
#region ================== Management
/// <summary>
/// Adds fields to the dictionary that are handled directly by UDB, but changing them is emulated through the UDMF fields.
/// </summary>
/// <param name="fields">UniFields of the map element</param>
internal override void AddManagedFields(IDictionary<string, object> fields)
{
if (thing.ScaleX != 1.0)
fields.Add("scalex", thing.ScaleX);
if (thing.ScaleY != 1.0)
fields.Add("scaley", thing.ScaleY);
}
/// <summary>
/// Processed a managed UDMF field, setting the managed value to what the user set in the UDMF field.
/// </summary>
/// <param name="fields">UniFields of the map element</param>
/// <param name="pname">field property name</param>
/// <param name="newvalue">field value</param>
/// <returns>true if the field needed to be processed, false if it didn't</returns>
internal override bool ProcessManagedField(UniFields fields, string pname, object newvalue)
{
switch(pname)
{
case "scalex":
if (newvalue == null) thing.SetScale(1.0, thing.ScaleY);
else thing.SetScale((double)newvalue, thing.ScaleY);
return true;
case "scaley":
if(newvalue == null) thing.SetScale(thing.ScaleX, 1.0);
else thing.SetScale(thing.ScaleX, (double)newvalue);
return true;
}
return false;
}
#endregion
}
}