stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 22:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Missing and Unknown textures were incorrectly scaled in classic modes.

Browse source 
Fixed an update logic error in PairedIntControl.
This commit is contained in:
MaxED 2014-01-20 08:47:49 +00:00
parent 7303cbd185
commit ec2303ca9f
5 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/GZBuilder/Controls/PairedFieldsControl.cs
View file

@ -76,8 +76,8 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
value1.Text = newValue1;
value2.Text = newValue2;
} else {
value1.Text = ((!string.IsNullOrEmpty(value1.Text) && value1.Text != newValue1) ? "" : newValue1);
value2.Text = ((!string.IsNullOrEmpty(value2.Text) && value2.Text != newValue2) ? "" : newValue2);
value1.Text = ((!string.IsNullOrEmpty(value1.Text) && value1.Text != newValue1) ? string.Empty : newValue1);
value2.Text = ((!string.IsNullOrEmpty(value2.Text) && value2.Text != newValue2) ? string.Empty : newValue2);
}
checkValues();
@ -85,12 +85,12 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
}
public void ApplyTo(UniFields fields, int min, int max, float oldValue1, float oldValue2) {
if(value1.Text != "")
if(value1.Text != string.Empty)
UDMFTools.SetFloat(fields, field1, General.Clamp(value1.GetResultFloat(defaultValue), min, max), defaultValue);
else
UDMFTools.SetFloat(fields, field1, oldValue1, defaultValue);
if(value2.Text != "")
if(value2.Text != string.Empty)
UDMFTools.SetFloat(fields, field2, General.Clamp(value2.GetResultFloat(defaultValue), min, max), defaultValue);
else
UDMFTools.SetFloat(fields, field2, oldValue2, defaultValue);

19
Source/Core/GZBuilder/Controls/PairedIntControl.cs
View file

@ -27,7 +27,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
public string Label { get { return label.Text; } set { label.Text = value; } }
public int DefaultValue { get { return defaultValue; } set { defaultValue = value; } }
public int ButtonStep { get { return (int)value1.ButtonStep; } set { value1.ButtonStep = value; value2.ButtonStep = value; } }
public int ButtonStep { get { return value1.ButtonStep; } set { value1.ButtonStep = value; value2.ButtonStep = value; } }
#endregion
@ -35,18 +35,19 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
InitializeComponent();
}
public void SetValues(int val1, int val2) {
public void SetValues(int val1, int val2, bool first) {
blockUpdate = true;
if(!string.IsNullOrEmpty(value1.Text) && value1.Text != val1.ToString())
value1.Text = "";
else
if (first) {
value1.Text = val1.ToString();
if(!string.IsNullOrEmpty(value2.Text) && value2.Text != val2.ToString())
value2.Text = "";
else
value2.Text = val2.ToString();
} else {
if (!string.IsNullOrEmpty(value1.Text) && value1.Text != val1.ToString())
value1.Text = string.Empty;
if (!string.IsNullOrEmpty(value2.Text) && value2.Text != val2.ToString())
value2.Text = string.Empty;
}
blockUpdate = false;
}

BIN
Source/Core/Resources/MissingTexture.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Source/Core/Resources/UnknownImage.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 2.3 KiB

40
Source/Core/Windows/LinedefEditForm.cs
View file

@ -332,7 +332,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. UDMF Settings
if(General.Map.FormatInterface.HasCustomFields) {
fieldslist.SetValues(fl.Fields, true); // Custom fields
int renderstyle = renderStyles.IndexOf(fl.Fields.GetValue("renderstyle", ""));
int renderstyle = renderStyles.IndexOf(fl.Fields.GetValue("renderstyle", string.Empty));
cbRenderStyle.SelectedIndex = (renderstyle == -1 ? 0 : renderstyle);
alpha.Text = General.Clamp(fl.Fields.GetValue("alpha", 1.0f), 0f, 1f).ToString();
lockNumber.Text = fl.Fields.GetValue("locknumber", 0).ToString();
@ -383,7 +383,7 @@ namespace CodeImp.DoomBuilder.Windows
if(fl.Front.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fl.Front.Flags[c.Tag.ToString()];
}
frontTextureOffset.SetValues(fl.Front.OffsetX, fl.Front.OffsetY); //mxd
frontTextureOffset.SetValues(fl.Front.OffsetX, fl.Front.OffsetY, true); //mxd
}
// Back settings
@ -411,7 +411,7 @@ namespace CodeImp.DoomBuilder.Windows
if(fl.Back.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fl.Back.Flags[c.Tag.ToString()];
}
backTextureOffset.SetValues(fl.Back.OffsetX, fl.Back.OffsetY); //mxd
backTextureOffset.SetValues(fl.Back.OffsetX, fl.Back.OffsetY, true); //mxd
}
////////////////////////////////////////////////////////////////////////
@ -459,15 +459,15 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. UDMF Settings
if(General.Map.FormatInterface.HasCustomFields) {
int i = Math.Max(0, renderStyles.IndexOf(l.Fields.GetValue("renderstyle", "")));
int i = Math.Max(0, renderStyles.IndexOf(l.Fields.GetValue("renderstyle", string.Empty)));
if(cbRenderStyle.SelectedIndex != -1 && i != cbRenderStyle.SelectedIndex)
cbRenderStyle.SelectedIndex = -1;
if(!string.IsNullOrEmpty(alpha.Text) && General.Clamp(alpha.GetResultFloat(1.0f), 0f, 1f) != l.Fields.GetValue("alpha", 1.0f))
alpha.Text = "";
alpha.Text = string.Empty;
if(!string.IsNullOrEmpty(lockNumber.Text) && lockNumber.GetResult(0) != l.Fields.GetValue("locknumber", 0))
lockNumber.Text = "";
lockNumber.Text = string.Empty;
if(arg0str != l.Fields.GetValue("arg0str", string.Empty)) {
haveArg0Str = true;
@ -506,13 +506,13 @@ namespace CodeImp.DoomBuilder.Windows
// Front settings
if(l.Front != null)
{
if(fronthigh.TextureName != l.Front.HighTexture) fronthigh.TextureName = "";
if(frontmid.TextureName != l.Front.MiddleTexture) frontmid.TextureName = "";
if(frontlow.TextureName != l.Front.LowTexture) frontlow.TextureName = "";
if(fronthigh.TextureName != l.Front.HighTexture) fronthigh.TextureName = string.Empty;
if(frontmid.TextureName != l.Front.MiddleTexture) frontmid.TextureName = string.Empty;
if(frontlow.TextureName != l.Front.LowTexture) frontlow.TextureName = string.Empty;
if(fronthigh.Required != l.Front.HighRequired()) fronthigh.Required = false;
if(frontmid.Required != l.Front.MiddleRequired()) frontmid.Required = false;
if(frontlow.Required != l.Front.LowRequired()) frontlow.Required = false;
if(frontsector.Text != l.Front.Sector.Index.ToString()) frontsector.Text = "";
if(frontsector.Text != l.Front.Sector.Index.ToString()) frontsector.Text = string.Empty;
//mxd
if(General.Map.FormatInterface.HasCustomFields) {
@ -521,7 +521,7 @@ namespace CodeImp.DoomBuilder.Windows
if(!string.IsNullOrEmpty(lightFront.Text)) {
int light = UDMFTools.GetInteger(l.Front.Fields, "light", 0);
if(light != lightFront.GetResult(light)) lightFront.Text = "";
if(light != lightFront.GetResult(light)) lightFront.Text = string.Empty;
}
if(l.Front.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteFront.Checked) {
@ -543,19 +543,19 @@ namespace CodeImp.DoomBuilder.Windows
}
l.Front.Fields.BeforeFieldsChange(); //mxd
frontTextureOffset.SetValues(l.Front.OffsetX, l.Front.OffsetY); //mxd
frontTextureOffset.SetValues(l.Front.OffsetX, l.Front.OffsetY, false); //mxd
}
// Back settings
if(l.Back != null)
{
if(backhigh.TextureName != l.Back.HighTexture) backhigh.TextureName = "";
if(backmid.TextureName != l.Back.MiddleTexture) backmid.TextureName = "";
if(backlow.TextureName != l.Back.LowTexture) backlow.TextureName = "";
if(backhigh.TextureName != l.Back.HighTexture) backhigh.TextureName = string.Empty;
if(backmid.TextureName != l.Back.MiddleTexture) backmid.TextureName = string.Empty;
if(backlow.TextureName != l.Back.LowTexture) backlow.TextureName = string.Empty;
if(backhigh.Required != l.Back.HighRequired()) backhigh.Required = false;
if(backmid.Required != l.Back.MiddleRequired()) backmid.Required = false;
if(backlow.Required != l.Back.LowRequired()) backlow.Required = false;
if(backsector.Text != l.Back.Sector.Index.ToString()) backsector.Text = "";
if(backsector.Text != l.Back.Sector.Index.ToString()) backsector.Text = string.Empty;
//mxd
if(General.Map.FormatInterface.HasCustomFields) {
@ -564,7 +564,7 @@ namespace CodeImp.DoomBuilder.Windows
if(!string.IsNullOrEmpty(lightBack.Text)) {
int light = UDMFTools.GetInteger(l.Back.Fields, "light", 0);
if(light != lightBack.GetResult(light)) lightBack.Text = "";
if(light != lightBack.GetResult(light)) lightBack.Text = string.Empty;
}
if(l.Back.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteBack.Checked) {
@ -586,7 +586,7 @@ namespace CodeImp.DoomBuilder.Windows
}
l.Back.Fields.BeforeFieldsChange(); //mxd
backTextureOffset.SetValues(l.Back.OffsetX, l.Back.OffsetY); //mxd
backTextureOffset.SetValues(l.Back.OffsetX, l.Back.OffsetY, false); //mxd
}
//mxd
@ -1017,7 +1017,7 @@ namespace CodeImp.DoomBuilder.Windows
if(!string.IsNullOrEmpty(lightFront.Text)) {
int light = UDMFTools.GetInteger(s.Fields, "light", 0);
if(light != lightFront.GetResult(light)) lightFront.Text = "";
if(light != lightFront.GetResult(light)) lightFront.Text = string.Empty;
}
if(s.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteFront.Checked) {
@ -1073,7 +1073,7 @@ namespace CodeImp.DoomBuilder.Windows
if(!string.IsNullOrEmpty(lightBack.Text)) {
int light = UDMFTools.GetInteger(s.Fields, "light", 0);
if(light != lightBack.GetResult(light)) lightBack.Text = "";
if(light != lightBack.GetResult(light)) lightBack.Text = string.Empty;
}
if(s.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteBack.Checked) {