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

Fix light/fade color and fade start/end not being editable

Browse source
This commit is contained in:
spherallic 2023-12-12 01:44:34 +01:00
parent 63bb82a1d7
commit a13329e7a0
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Resources/UDMF.cfg
View file

@ -65,6 +65,10 @@ managedfields
ceilingplane_b; ceilingplane_b;
ceilingplane_c; ceilingplane_c;
ceilingplane_d; ceilingplane_d;
//lightalpha;
//fadealpha;
//fadestart;
//fadeend;
} }
thing thing

22
Source/Core/Windows/SectorEditFormSRB2.cs
View file

@ -332,10 +332,10 @@ namespace CodeImp.DoomBuilder.Windows
// Sector colors // Sector colors
fadeColor.SetValueFrom(sc.Fields, true); fadeColor.SetValueFrom(sc.Fields, true);
lightColor.SetValueFrom(sc.Fields, true); lightColor.SetValueFrom(sc.Fields, true);
lightAlpha.Text = UniFields.GetInteger(sc.Fields, "lightalpha", General.Map.Config.MaxColormapAlpha).ToString(); lightAlpha.Text = sc.Fields.GetValue("lightalpha", General.Map.Config.MaxColormapAlpha).ToString();
fadeAlpha.Text = UniFields.GetInteger(sc.Fields, "fadealpha", General.Map.Config.MaxColormapAlpha).ToString(); fadeAlpha.Text = sc.Fields.GetValue("fadealpha", General.Map.Config.MaxColormapAlpha).ToString();
fadeStart.Text = UniFields.GetInteger(sc.Fields, "fadestart", 0).ToString(); fadeStart.Text = sc.Fields.GetValue("fadestart", 0).ToString();
fadeEnd.Text = UniFields.GetInteger(sc.Fields, "fadeend", General.Map.Config.NumBrightnessLevels - 1).ToString(); fadeEnd.Text = sc.Fields.GetValue("fadeend", General.Map.Config.NumBrightnessLevels - 1).ToString();
// Slopes // Slopes
SetupFloorSlope(sc, true); SetupFloorSlope(sc, true);
@ -752,6 +752,18 @@ namespace CodeImp.DoomBuilder.Windows
if (!string.IsNullOrEmpty(triggerer.Text)) if (!string.IsNullOrEmpty(triggerer.Text))
UniFields.SetString(s.Fields, "triggerer", triggerer.Text, TRIGGERER_DEFAULT); UniFields.SetString(s.Fields, "triggerer", triggerer.Text, TRIGGERER_DEFAULT);
if (!string.IsNullOrEmpty(lightAlpha.Text))
UniFields.SetInteger(s.Fields, "lightalpha", lightAlpha.GetResult(s.Fields.GetValue("lightalpha", General.Map.Config.MaxColormapAlpha)), 0);
if (!string.IsNullOrEmpty(fadeAlpha.Text))
UniFields.SetInteger(s.Fields, "fadealpha", fadeAlpha.GetResult(s.Fields.GetValue("fadealpha", General.Map.Config.MaxColormapAlpha)), 0);
if (!string.IsNullOrEmpty(fadeStart.Text))
UniFields.SetInteger(s.Fields, "fadestart", fadeStart.GetResult(s.Fields.GetValue("fadestart", 0)), 0);
if (!string.IsNullOrEmpty(fadeEnd.Text))
UniFields.SetInteger(s.Fields, "fadeend", fadeEnd.GetResult(s.Fields.GetValue("fadeend", General.Map.Config.NumBrightnessLevels - 1)), 0);
// Clear horizontal slopes // Clear horizontal slopes
double diff = Math.Abs(Math.Round(s.FloorSlopeOffset) - s.FloorSlopeOffset); double diff = Math.Abs(Math.Round(s.FloorSlopeOffset) - s.FloorSlopeOffset);
if (Math.Abs(s.FloorSlope.z) == 1.0 && diff < 0.000000001) if (Math.Abs(s.FloorSlope.z) == 1.0 && diff < 0.000000001)
@ -1156,7 +1168,7 @@ namespace CodeImp.DoomBuilder.Windows
{ {
foreach (Sector s in sectors) foreach (Sector s in sectors)
{ {
int val = General.Clamp(fadeStart.GetResult(sectorprops[s].FadeStart), 0, General.Map.Config.NumBrightnessLevels - 2); int val = General.Clamp(fadeStart.GetResult(sectorprops[s].FadeStart), 0, General.Map.Config.NumBrightnessLevels - 1);
UniFields.SetInteger(s.Fields, "fadestart", val, 0); UniFields.SetInteger(s.Fields, "fadestart", val, 0);
} }
} }