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

Linedef edit form: all linedef UDMF properties are now editable via user interface + some fixes in sidedef UDMF controls.

Browse source
This commit is contained in:
MaxED 2013-06-11 08:05:32 +00:00
parent a0b4ce71b5
commit 8ddcccf067
19 changed files with 680 additions and 263 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -382,17 +382,12 @@ universalfields
type = 2;
default = "";
}
conversation
{
type = 0;
default = 0;
}
countsecret
{
type = 3;
default = false;
}
skill6
{

9
Source/Core/Builder.csproj
View file

@ -709,6 +709,12 @@
<Compile Include="GZBuilder\Controls\CustomLinedefColorsControl.designer.cs">
<DependentUpon>CustomLinedefColorsControl.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Controls\FloatFieldsSlider.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\FloatFieldsSlider.designer.cs">
<DependentUpon>FloatFieldsSlider.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Controls\IconListBox.cs">
<SubType>Component</SubType>
</Compile>
@ -845,6 +851,9 @@
<EmbeddedResource Include="GZBuilder\Controls\CustomLinedefColorsControl.resx">
<DependentUpon>CustomLinedefColorsControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\FloatFieldsSlider.resx">
<DependentUpon>FloatFieldsSlider.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\PairedFieldsControl.resx">
<DependentUpon>PairedFieldsControl.cs</DependentUpon>
</EmbeddedResource>

12
Source/Core/Builder.sln
View file

@ -16,8 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuilderEffects", "..\Plugin
{818B3D10-F791-4C3F-9AF5-BB2D0079B63C} = {818B3D10-F791-4C3F-9AF5-BB2D0079B63C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisplaneExplorer", "..\Plugins\VisplaneExplorer\VisplaneExplorer.csproj", "{CF670175-7099-4090-A330-EE25C7230139}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -90,16 +88,6 @@ Global
{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|x86.ActiveCfg = Release|x86
{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|x86.Build.0 = Release|x86
{CF670175-7099-4090-A330-EE25C7230139}.Debug|Any CPU.ActiveCfg = Debug|x86
{CF670175-7099-4090-A330-EE25C7230139}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{CF670175-7099-4090-A330-EE25C7230139}.Debug|Mixed Platforms.Build.0 = Debug|x86
{CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.ActiveCfg = Debug|x86
{CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.Build.0 = Debug|x86
{CF670175-7099-4090-A330-EE25C7230139}.Release|Any CPU.ActiveCfg = Release|x86
{CF670175-7099-4090-A330-EE25C7230139}.Release|Mixed Platforms.ActiveCfg = Release|x86
{CF670175-7099-4090-A330-EE25C7230139}.Release|Mixed Platforms.Build.0 = Release|x86
{CF670175-7099-4090-A330-EE25C7230139}.Release|x86.ActiveCfg = Release|x86
{CF670175-7099-4090-A330-EE25C7230139}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

6
Source/Core/Controls/ButtonsNumericTextbox.cs
View file

@ -39,7 +39,7 @@ namespace CodeImp.DoomBuilder.Controls
private bool ignorebuttonchange = false;
private StepsList steps = null;
private int stepsize = 1;
private float stepsize = 1;
#endregion
@ -48,7 +48,7 @@ namespace CodeImp.DoomBuilder.Controls
public bool AllowDecimal { get { return textbox.AllowDecimal; } set { textbox.AllowDecimal = value; } }
public bool AllowNegative { get { return textbox.AllowNegative; } set { textbox.AllowNegative = value; } }
public bool AllowRelative { get { return textbox.AllowRelative; } set { textbox.AllowRelative = value; } }
public int ButtonStep { get { return stepsize; } set { stepsize = value; } }
public float ButtonStep { get { return stepsize; } set { stepsize = value; } }
override public string Text { get { return textbox.Text; } set { textbox.Text = value; } }
internal NumericTextbox Textbox { get { return textbox; } }
public StepsList StepValues { get { return steps; } set { steps = value; } }
@ -121,7 +121,7 @@ namespace CodeImp.DoomBuilder.Controls
}
else
{
int newvalue = textbox.GetResult(0) - (buttons.Value * stepsize);
int newvalue = (int)(textbox.GetResult(0) - (buttons.Value * stepsize));
if((newvalue < 0) && !textbox.AllowNegative) newvalue = 0;
textbox.Text = newvalue.ToString();
}

67
Source/Core/GZBuilder/Controls/FloatFieldsSlider.cs Normal file
View file

@ -0,0 +1,67 @@
using System;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.GZBuilder.Tools;
namespace CodeImp.DoomBuilder.GZBuilder.Controls
{
public partial class FloatFieldsSlider : UserControl
{
private bool blockEvents;
private float defaultValue;
private string field;
private float min;
private float max;
public float DefaultValue { get { return defaultValue; } set { defaultValue = value; } }
public string Field { get { return field; } set { field = value; } }
public FloatFieldsSlider() {
InitializeComponent();
}
public void SetLimits(float min, float max) {
blockEvents = true;
this.min = min;
this.max = max;
trackBar1.Value = General.Clamp(trackBar1.Value, (int)(min * 10), (int)(max * 10));
trackBar1.Minimum = (int)(min * 10);
trackBar1.Maximum = (int)(max * 10);
blockEvents = false;
}
public void SetValueFrom(UniFields fields) {
float v1 = UDMFTools.GetFloat(fields, field, defaultValue);
string newValue = String.Format("{0:0.0}", v1);
nudValue.Text = ((!string.IsNullOrEmpty(nudValue.Text) && nudValue.Text != newValue) ? "" : newValue);
}
public void ApplyTo(UniFields fields) {
if(nudValue.Text != "")
UDMFTools.SetFloat(fields, field, General.Clamp(nudValue.GetResultFloat(defaultValue), min, max), defaultValue, false);
}
//events
private void trackBar1_ValueChanged(object sender, EventArgs e) {
if(!blockEvents) nudValue.Text = String.Format("{0:0.0}", (float)Math.Round(((float)trackBar1.Value / 10.0f), 2));
}
private void nudValue_WhenTextChanged(object sender, EventArgs e) {
float value = nudValue.GetResultFloat(0.0f);
if(value > max) {
value = max;
nudValue.Text = String.Format("{0:0.0}", value);
} else if(value < min) {
value = min;
nudValue.Text = String.Format("{0:0.0}", value);
}
blockEvents = true;
trackBar1.Value = General.Clamp((int)(value * 10), trackBar1.Minimum, trackBar1.Maximum);
blockEvents = false;
}
}
}

78
Source/Core/GZBuilder/Controls/FloatFieldsSlider.designer.cs generated Normal file
View file

@ -0,0 +1,78 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
{
partial class FloatFieldsSlider
{
/// <summary>
/// Требуется переменная конструктора.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Освободить все используемые ресурсы.
/// </summary>
/// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
protected override void Dispose(bool disposing) {
if (disposing && (components != null)) {
components.Dispose();
}
base.Dispose(disposing);
}
#region Код, автоматически созданный конструктором компонентов
/// <summary>
/// Обязательный метод для поддержки конструктора - не изменяйте
/// содержимое данного метода при помощи редактора кода.
/// </summary>
private void InitializeComponent() {
this.trackBar1 = new Dotnetrix.Controls.TrackBar();
this.nudValue = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
this.SuspendLayout();
//
// trackBar1
//
this.trackBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.trackBar1.LargeChange = 10;
this.trackBar1.Location = new System.Drawing.Point(3, 3);
this.trackBar1.Maximum = 512;
this.trackBar1.Name = "trackBar1";
this.trackBar1.Size = new System.Drawing.Size(150, 45);
this.trackBar1.TabIndex = 4;
this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_ValueChanged);
//
// nudValue
//
this.nudValue.AllowDecimal = true;
this.nudValue.AllowNegative = false;
this.nudValue.AllowRelative = false;
this.nudValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.nudValue.ButtonStep = 0.1F;
this.nudValue.Location = new System.Drawing.Point(151, 0);
this.nudValue.Name = "nudValue";
this.nudValue.Size = new System.Drawing.Size(59, 24);
this.nudValue.StepValues = null;
this.nudValue.TabIndex = 8;
this.nudValue.WhenTextChanged += new System.EventHandler(this.nudValue_WhenTextChanged);
//
// FloatFieldsSlider
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.nudValue);
this.Controls.Add(this.trackBar1);
this.Name = "FloatFieldsSlider";
this.Size = new System.Drawing.Size(213, 33);
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
protected Dotnetrix.Controls.TrackBar trackBar1;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox nudValue;
}
}

120
Source/Core/GZBuilder/Controls/FloatFieldsSlider.resx Normal file
View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

12
Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs generated
View file

@ -33,21 +33,23 @@
//
// label
//
this.label.Location = new System.Drawing.Point(11, 6);
this.label.Location = new System.Drawing.Point(0, 6);
this.label.Name = "label";
this.label.Size = new System.Drawing.Size(76, 14);
this.label.Size = new System.Drawing.Size(87, 14);
this.label.TabIndex = 36;
this.label.Text = "Upper Offset:";
this.label.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// bReset
//
this.bReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.bReset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
this.bReset.Location = new System.Drawing.Point(222, 1);
this.bReset.Name = "bReset";
this.bReset.Size = new System.Drawing.Size(23, 23);
this.bReset.TabIndex = 39;
this.bReset.UseVisualStyleBackColor = true;
this.bReset.Visible = false;
this.bReset.Click += new System.EventHandler(this.bReset_Click);
//
// value1
@ -55,7 +57,8 @@
this.value1.AllowDecimal = false;
this.value1.AllowNegative = true;
this.value1.AllowRelative = true;
this.value1.ButtonStep = 1;
this.value1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.value1.ButtonStep = 1F;
this.value1.Location = new System.Drawing.Point(89, 1);
this.value1.Name = "value1";
this.value1.Size = new System.Drawing.Size(62, 24);
@ -69,7 +72,8 @@
this.value2.AllowDecimal = false;
this.value2.AllowNegative = true;
this.value2.AllowRelative = true;
this.value2.ButtonStep = 1;
this.value2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.value2.ButtonStep = 1F;
this.value2.Location = new System.Drawing.Point(157, 1);
this.value2.Name = "value2";
this.value2.Size = new System.Drawing.Size(62, 24);

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

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.GZBuilder.Tools;
@ -47,12 +41,13 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
}
private void checkValues() {
float v1 = value1.GetResultFloat(defaultValue);
float v2 = value2.GetResultFloat(defaultValue);
bool changed = (string.IsNullOrEmpty(value1.Text) || string.IsNullOrEmpty(value2.Text));
if(!changed)
changed = (value1.GetResultFloat(defaultValue) != defaultValue || value2.GetResultFloat(defaultValue) != defaultValue);
bool changed = (v1 != defaultValue || v2 != defaultValue);
label.Enabled = changed;
bReset.Enabled = changed;
bReset.Visible = changed;
}
private void bReset_Click(object sender, EventArgs e) {

391
Source/Core/Windows/LinedefEditForm.Designer.cs generated
View file

@ -40,9 +40,11 @@ namespace CodeImp.DoomBuilder.Windows
System.Windows.Forms.Label activationlabel;
System.Windows.Forms.Label label668;
System.Windows.Forms.Label label667;
System.Windows.Forms.Label label17;
System.Windows.Forms.Label label1;
System.Windows.Forms.Label label6;
System.Windows.Forms.Label label7;
System.Windows.Forms.Label label13;
System.Windows.Forms.Label label14;
this.labelLightFront = new System.Windows.Forms.Label();
this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button();
this.actiongroup = new System.Windows.Forms.GroupBox();
@ -65,19 +67,25 @@ namespace CodeImp.DoomBuilder.Windows
this.browseaction = new System.Windows.Forms.Button();
this.udmfpanel = new System.Windows.Forms.Panel();
this.udmfactivates = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
this.settingsgroup = new System.Windows.Forms.GroupBox();
this.flagsgroup = new System.Windows.Forms.GroupBox();
this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.tabs = new System.Windows.Forms.TabControl();
this.tabproperties = new System.Windows.Forms.TabPage();
this.settingsGroup = new System.Windows.Forms.GroupBox();
this.lockNumber = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.cbRenderStyle = new System.Windows.Forms.ComboBox();
this.fsAlpha = new CodeImp.DoomBuilder.GZBuilder.Controls.FloatFieldsSlider();
this.idgroup = new System.Windows.Forms.GroupBox();
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
this.tabsidedefs = new System.Windows.Forms.TabPage();
this.splitter = new System.Windows.Forms.SplitContainer();
this.frontside = new System.Windows.Forms.CheckBox();
this.frontgroup = new System.Windows.Forms.GroupBox();
this.cbLightAbsoluteFront = new System.Windows.Forms.CheckBox();
this.frontoffsety = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.frontoffsetx = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.lightFront = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.frontsector = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.customfrontbutton = new System.Windows.Forms.Button();
this.frontlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
@ -92,8 +100,6 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontOffsetMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcFrontOffsetTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.cbLightAbsoluteFront = new System.Windows.Forms.CheckBox();
this.lightFront = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.cblightfogFront = new System.Windows.Forms.CheckBox();
this.cbsmoothlightingFront = new System.Windows.Forms.CheckBox();
this.cbnodecalsFront = new System.Windows.Forms.CheckBox();
@ -102,6 +108,9 @@ namespace CodeImp.DoomBuilder.Windows
this.cbClipMidtexFront = new System.Windows.Forms.CheckBox();
this.backside = new System.Windows.Forms.CheckBox();
this.backgroup = new System.Windows.Forms.GroupBox();
this.cbLightAbsoluteBack = new System.Windows.Forms.CheckBox();
this.labelLightBack = new System.Windows.Forms.Label();
this.lightBack = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.backoffsety = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.backoffsetx = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.backsector = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
@ -118,8 +127,6 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcBackOffsetMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcBackOffsetTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.cbLightAbsoluteBack = new System.Windows.Forms.CheckBox();
this.lightBack = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.cblightfogBack = new System.Windows.Forms.CheckBox();
this.cbsmoothlightingBack = new System.Windows.Forms.CheckBox();
this.cbnodecalsBack = new System.Windows.Forms.CheckBox();
@ -158,16 +165,18 @@ namespace CodeImp.DoomBuilder.Windows
activationlabel = new System.Windows.Forms.Label();
label668 = new System.Windows.Forms.Label();
label667 = new System.Windows.Forms.Label();
label17 = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
label7 = new System.Windows.Forms.Label();
label13 = new System.Windows.Forms.Label();
label14 = new System.Windows.Forms.Label();
this.actiongroup.SuspendLayout();
this.argspanel.SuspendLayout();
this.hexenpanel.SuspendLayout();
this.udmfpanel.SuspendLayout();
this.settingsgroup.SuspendLayout();
this.flagsgroup.SuspendLayout();
this.tabs.SuspendLayout();
this.tabproperties.SuspendLayout();
this.settingsGroup.SuspendLayout();
this.idgroup.SuspendLayout();
this.tabsidedefs.SuspendLayout();
this.splitter.Panel1.SuspendLayout();
@ -295,16 +304,6 @@ namespace CodeImp.DoomBuilder.Windows
label667.Text = "Texture Offset:";
label667.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label17
//
label17.Location = new System.Drawing.Point(15, 18);
label17.Name = "label17";
label17.Size = new System.Drawing.Size(40, 14);
label17.TabIndex = 25;
label17.Tag = "light";
label17.Text = "Light:";
label17.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label1
//
label1.Location = new System.Drawing.Point(15, 18);
@ -315,21 +314,48 @@ namespace CodeImp.DoomBuilder.Windows
label1.Text = "Light:";
label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label6
// label7
//
label6.Location = new System.Drawing.Point(15, 18);
label6.Name = "label6";
label6.Size = new System.Drawing.Size(40, 14);
label6.TabIndex = 25;
label6.Tag = "light";
label6.Text = "Light:";
label6.TextAlign = System.Drawing.ContentAlignment.TopRight;
label7.AutoSize = true;
label7.Location = new System.Drawing.Point(6, 31);
label7.Name = "label7";
label7.Size = new System.Drawing.Size(71, 14);
label7.TabIndex = 11;
label7.Text = "Render style:";
//
// label13
//
label13.AutoSize = true;
label13.Location = new System.Drawing.Point(182, 31);
label13.Name = "label13";
label13.Size = new System.Drawing.Size(38, 14);
label13.TabIndex = 13;
label13.Text = "Alpha:";
//
// label14
//
label14.AutoSize = true;
label14.Location = new System.Drawing.Point(383, 31);
label14.Name = "label14";
label14.Size = new System.Drawing.Size(73, 14);
label14.TabIndex = 15;
label14.Text = "Lock Number:";
//
// labelLightFront
//
this.labelLightFront.Location = new System.Drawing.Point(17, 97);
this.labelLightFront.Name = "labelLightFront";
this.labelLightFront.Size = new System.Drawing.Size(80, 14);
this.labelLightFront.TabIndex = 25;
this.labelLightFront.Tag = "";
this.labelLightFront.Text = "Brightness:";
this.labelLightFront.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// cancel
//
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancel.Location = new System.Drawing.Point(455, 592);
this.cancel.Location = new System.Drawing.Point(455, 662);
this.cancel.Name = "cancel";
this.cancel.Size = new System.Drawing.Size(112, 25);
this.cancel.TabIndex = 2;
@ -340,7 +366,7 @@ namespace CodeImp.DoomBuilder.Windows
// apply
//
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.apply.Location = new System.Drawing.Point(336, 592);
this.apply.Location = new System.Drawing.Point(336, 662);
this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(112, 25);
this.apply.TabIndex = 1;
@ -358,7 +384,7 @@ namespace CodeImp.DoomBuilder.Windows
this.actiongroup.Controls.Add(this.action);
this.actiongroup.Controls.Add(this.browseaction);
this.actiongroup.Controls.Add(this.udmfpanel);
this.actiongroup.Location = new System.Drawing.Point(8, 181);
this.actiongroup.Location = new System.Drawing.Point(8, 255);
this.actiongroup.Name = "actiongroup";
this.actiongroup.Size = new System.Drawing.Size(533, 291);
this.actiongroup.TabIndex = 1;
@ -562,17 +588,17 @@ namespace CodeImp.DoomBuilder.Windows
this.udmfactivates.Size = new System.Drawing.Size(437, 133);
this.udmfactivates.TabIndex = 0;
//
// settingsgroup
// flagsgroup
//
this.settingsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.flagsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.settingsgroup.Controls.Add(this.flags);
this.settingsgroup.Location = new System.Drawing.Point(8, 3);
this.settingsgroup.Name = "settingsgroup";
this.settingsgroup.Size = new System.Drawing.Size(533, 174);
this.settingsgroup.TabIndex = 0;
this.settingsgroup.TabStop = false;
this.settingsgroup.Text = " Settings ";
this.flagsgroup.Controls.Add(this.flags);
this.flagsgroup.Location = new System.Drawing.Point(8, 3);
this.flagsgroup.Name = "flagsgroup";
this.flagsgroup.Size = new System.Drawing.Size(533, 174);
this.flagsgroup.TabIndex = 0;
this.flagsgroup.TabStop = false;
this.flagsgroup.Text = " Flags";
//
// flags
//
@ -608,30 +634,81 @@ namespace CodeImp.DoomBuilder.Windows
this.tabs.Margin = new System.Windows.Forms.Padding(1);
this.tabs.Name = "tabs";
this.tabs.SelectedIndex = 0;
this.tabs.Size = new System.Drawing.Size(557, 578);
this.tabs.Size = new System.Drawing.Size(557, 648);
this.tabs.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabs.TabIndex = 0;
//
// tabproperties
//
this.tabproperties.Controls.Add(this.settingsGroup);
this.tabproperties.Controls.Add(this.idgroup);
this.tabproperties.Controls.Add(this.settingsgroup);
this.tabproperties.Controls.Add(this.flagsgroup);
this.tabproperties.Controls.Add(this.actiongroup);
this.tabproperties.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabproperties.Location = new System.Drawing.Point(4, 23);
this.tabproperties.Name = "tabproperties";
this.tabproperties.Padding = new System.Windows.Forms.Padding(5);
this.tabproperties.Size = new System.Drawing.Size(549, 551);
this.tabproperties.Size = new System.Drawing.Size(549, 621);
this.tabproperties.TabIndex = 0;
this.tabproperties.Text = "Properties";
this.tabproperties.UseVisualStyleBackColor = true;
//
// settingsGroup
//
this.settingsGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.settingsGroup.Controls.Add(this.lockNumber);
this.settingsGroup.Controls.Add(label14);
this.settingsGroup.Controls.Add(label13);
this.settingsGroup.Controls.Add(this.cbRenderStyle);
this.settingsGroup.Controls.Add(label7);
this.settingsGroup.Controls.Add(this.fsAlpha);
this.settingsGroup.Location = new System.Drawing.Point(8, 183);
this.settingsGroup.Name = "settingsGroup";
this.settingsGroup.Size = new System.Drawing.Size(533, 66);
this.settingsGroup.TabIndex = 3;
this.settingsGroup.TabStop = false;
this.settingsGroup.Text = " Settings";
//
// lockNumber
//
this.lockNumber.AllowDecimal = false;
this.lockNumber.AllowNegative = false;
this.lockNumber.AllowRelative = false;
this.lockNumber.ButtonStep = 1F;
this.lockNumber.Location = new System.Drawing.Point(462, 25);
this.lockNumber.Name = "lockNumber";
this.lockNumber.Size = new System.Drawing.Size(65, 24);
this.lockNumber.StepValues = null;
this.lockNumber.TabIndex = 16;
//
// cbRenderStyle
//
this.cbRenderStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbRenderStyle.FormattingEnabled = true;
this.cbRenderStyle.Items.AddRange(new object[] {
"Translucent",
"Additive"});
this.cbRenderStyle.Location = new System.Drawing.Point(83, 27);
this.cbRenderStyle.Name = "cbRenderStyle";
this.cbRenderStyle.Size = new System.Drawing.Size(86, 22);
this.cbRenderStyle.TabIndex = 12;
//
// fsAlpha
//
this.fsAlpha.DefaultValue = 1F;
this.fsAlpha.Field = "alpha";
this.fsAlpha.Location = new System.Drawing.Point(210, 25);
this.fsAlpha.Name = "fsAlpha";
this.fsAlpha.Size = new System.Drawing.Size(169, 45);
this.fsAlpha.TabIndex = 14;
//
// idgroup
//
this.idgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.idgroup.Controls.Add(this.tagSelector);
this.idgroup.Location = new System.Drawing.Point(8, 478);
this.idgroup.Location = new System.Drawing.Point(8, 552);
this.idgroup.Name = "idgroup";
this.idgroup.Size = new System.Drawing.Size(533, 66);
this.idgroup.TabIndex = 2;
@ -652,7 +729,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabsidedefs.Location = new System.Drawing.Point(4, 23);
this.tabsidedefs.Name = "tabsidedefs";
this.tabsidedefs.Padding = new System.Windows.Forms.Padding(5);
this.tabsidedefs.Size = new System.Drawing.Size(549, 551);
this.tabsidedefs.Size = new System.Drawing.Size(549, 621);
this.tabsidedefs.TabIndex = 1;
this.tabsidedefs.Text = "Sidedefs";
this.tabsidedefs.UseVisualStyleBackColor = true;
@ -674,8 +751,8 @@ namespace CodeImp.DoomBuilder.Windows
//
this.splitter.Panel2.Controls.Add(this.backside);
this.splitter.Panel2.Controls.Add(this.backgroup);
this.splitter.Size = new System.Drawing.Size(539, 541);
this.splitter.SplitterDistance = 268;
this.splitter.Size = new System.Drawing.Size(539, 611);
this.splitter.SplitterDistance = 302;
this.splitter.TabIndex = 3;
//
// frontside
@ -694,8 +771,11 @@ namespace CodeImp.DoomBuilder.Windows
this.frontgroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.frontgroup.Controls.Add(this.cbLightAbsoluteFront);
this.frontgroup.Controls.Add(this.frontoffsety);
this.frontgroup.Controls.Add(this.labelLightFront);
this.frontgroup.Controls.Add(this.frontoffsetx);
this.frontgroup.Controls.Add(this.lightFront);
this.frontgroup.Controls.Add(this.frontsector);
this.frontgroup.Controls.Add(this.customfrontbutton);
this.frontgroup.Controls.Add(label11);
@ -710,17 +790,28 @@ namespace CodeImp.DoomBuilder.Windows
this.frontgroup.Enabled = false;
this.frontgroup.Location = new System.Drawing.Point(3, 3);
this.frontgroup.Name = "frontgroup";
this.frontgroup.Size = new System.Drawing.Size(535, 262);
this.frontgroup.Size = new System.Drawing.Size(535, 296);
this.frontgroup.TabIndex = 1;
this.frontgroup.TabStop = false;
this.frontgroup.Text = " ";
//
// cbLightAbsoluteFront
//
this.cbLightAbsoluteFront.AutoSize = true;
this.cbLightAbsoluteFront.Location = new System.Drawing.Point(171, 96);
this.cbLightAbsoluteFront.Name = "cbLightAbsoluteFront";
this.cbLightAbsoluteFront.Size = new System.Drawing.Size(69, 18);
this.cbLightAbsoluteFront.TabIndex = 27;
this.cbLightAbsoluteFront.Tag = "lightabsolute";
this.cbLightAbsoluteFront.Text = "Absolute";
this.cbLightAbsoluteFront.UseVisualStyleBackColor = true;
//
// frontoffsety
//
this.frontoffsety.AllowDecimal = false;
this.frontoffsety.AllowNegative = true;
this.frontoffsety.AllowRelative = true;
this.frontoffsety.ButtonStep = 1;
this.frontoffsety.ButtonStep = 1F;
this.frontoffsety.Location = new System.Drawing.Point(171, 64);
this.frontoffsety.Name = "frontoffsety";
this.frontoffsety.Size = new System.Drawing.Size(62, 24);
@ -732,19 +823,32 @@ namespace CodeImp.DoomBuilder.Windows
this.frontoffsetx.AllowDecimal = false;
this.frontoffsetx.AllowNegative = true;
this.frontoffsetx.AllowRelative = true;
this.frontoffsetx.ButtonStep = 1;
this.frontoffsetx.ButtonStep = 1F;
this.frontoffsetx.Location = new System.Drawing.Point(103, 64);
this.frontoffsetx.Name = "frontoffsetx";
this.frontoffsetx.Size = new System.Drawing.Size(62, 24);
this.frontoffsetx.StepValues = null;
this.frontoffsetx.TabIndex = 15;
//
// lightFront
//
this.lightFront.AllowDecimal = false;
this.lightFront.AllowNegative = true;
this.lightFront.AllowRelative = true;
this.lightFront.ButtonStep = 1F;
this.lightFront.Location = new System.Drawing.Point(103, 92);
this.lightFront.Name = "lightFront";
this.lightFront.Size = new System.Drawing.Size(62, 24);
this.lightFront.StepValues = null;
this.lightFront.TabIndex = 26;
this.lightFront.Tag = "light";
//
// frontsector
//
this.frontsector.AllowDecimal = false;
this.frontsector.AllowNegative = false;
this.frontsector.AllowRelative = false;
this.frontsector.ButtonStep = 1;
this.frontsector.ButtonStep = 1F;
this.frontsector.Location = new System.Drawing.Point(103, 37);
this.frontsector.Name = "frontsector";
this.frontsector.Size = new System.Drawing.Size(130, 24);
@ -753,7 +857,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// customfrontbutton
//
this.customfrontbutton.Location = new System.Drawing.Point(103, 94);
this.customfrontbutton.Location = new System.Drawing.Point(103, 126);
this.customfrontbutton.Name = "customfrontbutton";
this.customfrontbutton.Size = new System.Drawing.Size(130, 25);
this.customfrontbutton.TabIndex = 3;
@ -794,11 +898,11 @@ namespace CodeImp.DoomBuilder.Windows
this.udmfPropertiesFront.Controls.Add(this.tabPage1);
this.udmfPropertiesFront.Controls.Add(this.tabPage2);
this.udmfPropertiesFront.ItemSize = new System.Drawing.Size(100, 19);
this.udmfPropertiesFront.Location = new System.Drawing.Point(6, 133);
this.udmfPropertiesFront.Location = new System.Drawing.Point(6, 169);
this.udmfPropertiesFront.Margin = new System.Windows.Forms.Padding(1);
this.udmfPropertiesFront.Name = "udmfPropertiesFront";
this.udmfPropertiesFront.SelectedIndex = 0;
this.udmfPropertiesFront.Size = new System.Drawing.Size(511, 123);
this.udmfPropertiesFront.Size = new System.Drawing.Size(525, 123);
this.udmfPropertiesFront.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.udmfPropertiesFront.TabIndex = 24;
//
@ -813,7 +917,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabPage1.Location = new System.Drawing.Point(4, 23);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(503, 96);
this.tabPage1.Size = new System.Drawing.Size(517, 96);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Offsets & Scale";
this.tabPage1.UseVisualStyleBackColor = true;
@ -825,7 +929,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontScaleBottom.Field1 = "scalex_bottom";
this.pfcFrontScaleBottom.Field2 = "scaley_bottom";
this.pfcFrontScaleBottom.Label = "Lower Scale:";
this.pfcFrontScaleBottom.Location = new System.Drawing.Point(254, 64);
this.pfcFrontScaleBottom.Location = new System.Drawing.Point(262, 64);
this.pfcFrontScaleBottom.Name = "pfcFrontScaleBottom";
this.pfcFrontScaleBottom.Size = new System.Drawing.Size(253, 32);
this.pfcFrontScaleBottom.TabIndex = 40;
@ -837,7 +941,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontScaleMid.Field1 = "scalex_mid";
this.pfcFrontScaleMid.Field2 = "scaley_mid";
this.pfcFrontScaleMid.Label = "Middle Scale:";
this.pfcFrontScaleMid.Location = new System.Drawing.Point(254, 34);
this.pfcFrontScaleMid.Location = new System.Drawing.Point(262, 34);
this.pfcFrontScaleMid.Name = "pfcFrontScaleMid";
this.pfcFrontScaleMid.Size = new System.Drawing.Size(253, 32);
this.pfcFrontScaleMid.TabIndex = 39;
@ -849,7 +953,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontScaleTop.Field1 = "scalex_top";
this.pfcFrontScaleTop.Field2 = "scaley_top";
this.pfcFrontScaleTop.Label = "Upper Scale:";
this.pfcFrontScaleTop.Location = new System.Drawing.Point(254, 3);
this.pfcFrontScaleTop.Location = new System.Drawing.Point(262, 3);
this.pfcFrontScaleTop.Name = "pfcFrontScaleTop";
this.pfcFrontScaleTop.Size = new System.Drawing.Size(253, 30);
this.pfcFrontScaleTop.TabIndex = 38;
@ -892,9 +996,6 @@ namespace CodeImp.DoomBuilder.Windows
//
// tabPage2
//
this.tabPage2.Controls.Add(this.cbLightAbsoluteFront);
this.tabPage2.Controls.Add(label17);
this.tabPage2.Controls.Add(this.lightFront);
this.tabPage2.Controls.Add(this.cblightfogFront);
this.tabPage2.Controls.Add(this.cbsmoothlightingFront);
this.tabPage2.Controls.Add(this.cbnodecalsFront);
@ -904,39 +1005,15 @@ namespace CodeImp.DoomBuilder.Windows
this.tabPage2.Location = new System.Drawing.Point(4, 23);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(503, 96);
this.tabPage2.Size = new System.Drawing.Size(517, 96);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Settings";
this.tabPage2.Text = "Flags";
this.tabPage2.UseVisualStyleBackColor = true;
//
// cbLightAbsoluteFront
//
this.cbLightAbsoluteFront.AutoSize = true;
this.cbLightAbsoluteFront.Location = new System.Drawing.Point(26, 41);
this.cbLightAbsoluteFront.Name = "cbLightAbsoluteFront";
this.cbLightAbsoluteFront.Size = new System.Drawing.Size(109, 18);
this.cbLightAbsoluteFront.TabIndex = 27;
this.cbLightAbsoluteFront.Tag = "lightabsolute";
this.cbLightAbsoluteFront.Text = "Absolute Lighting";
this.cbLightAbsoluteFront.UseVisualStyleBackColor = true;
//
// lightFront
//
this.lightFront.AllowDecimal = false;
this.lightFront.AllowNegative = true;
this.lightFront.AllowRelative = true;
this.lightFront.ButtonStep = 1;
this.lightFront.Location = new System.Drawing.Point(57, 13);
this.lightFront.Name = "lightFront";
this.lightFront.Size = new System.Drawing.Size(78, 24);
this.lightFront.StepValues = null;
this.lightFront.TabIndex = 26;
this.lightFront.Tag = "light";
//
// cblightfogFront
//
this.cblightfogFront.AutoSize = true;
this.cblightfogFront.Location = new System.Drawing.Point(314, 65);
this.cblightfogFront.Location = new System.Drawing.Point(152, 65);
this.cblightfogFront.Name = "cblightfogFront";
this.cblightfogFront.Size = new System.Drawing.Size(179, 18);
this.cblightfogFront.TabIndex = 11;
@ -947,7 +1024,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbsmoothlightingFront
//
this.cbsmoothlightingFront.AutoSize = true;
this.cbsmoothlightingFront.Location = new System.Drawing.Point(314, 41);
this.cbsmoothlightingFront.Location = new System.Drawing.Point(152, 41);
this.cbsmoothlightingFront.Name = "cbsmoothlightingFront";
this.cbsmoothlightingFront.Size = new System.Drawing.Size(102, 18);
this.cbsmoothlightingFront.TabIndex = 10;
@ -958,7 +1035,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbnodecalsFront
//
this.cbnodecalsFront.AutoSize = true;
this.cbnodecalsFront.Location = new System.Drawing.Point(314, 17);
this.cbnodecalsFront.Location = new System.Drawing.Point(152, 17);
this.cbnodecalsFront.Name = "cbnodecalsFront";
this.cbnodecalsFront.Size = new System.Drawing.Size(75, 18);
this.cbnodecalsFront.TabIndex = 9;
@ -969,7 +1046,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbnofakecontrastFront
//
this.cbnofakecontrastFront.AutoSize = true;
this.cbnofakecontrastFront.Location = new System.Drawing.Point(172, 65);
this.cbnofakecontrastFront.Location = new System.Drawing.Point(10, 65);
this.cbnofakecontrastFront.Name = "cbnofakecontrastFront";
this.cbnofakecontrastFront.Size = new System.Drawing.Size(109, 18);
this.cbnofakecontrastFront.TabIndex = 8;
@ -980,7 +1057,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbWrapMidtexFront
//
this.cbWrapMidtexFront.AutoSize = true;
this.cbWrapMidtexFront.Location = new System.Drawing.Point(172, 41);
this.cbWrapMidtexFront.Location = new System.Drawing.Point(10, 41);
this.cbWrapMidtexFront.Name = "cbWrapMidtexFront";
this.cbWrapMidtexFront.Size = new System.Drawing.Size(124, 18);
this.cbWrapMidtexFront.TabIndex = 7;
@ -991,7 +1068,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbClipMidtexFront
//
this.cbClipMidtexFront.AutoSize = true;
this.cbClipMidtexFront.Location = new System.Drawing.Point(172, 17);
this.cbClipMidtexFront.Location = new System.Drawing.Point(10, 17);
this.cbClipMidtexFront.Name = "cbClipMidtexFront";
this.cbClipMidtexFront.Size = new System.Drawing.Size(115, 18);
this.cbClipMidtexFront.TabIndex = 6;
@ -1015,6 +1092,9 @@ namespace CodeImp.DoomBuilder.Windows
this.backgroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.backgroup.Controls.Add(this.cbLightAbsoluteBack);
this.backgroup.Controls.Add(this.labelLightBack);
this.backgroup.Controls.Add(this.lightBack);
this.backgroup.Controls.Add(this.backoffsety);
this.backgroup.Controls.Add(this.backoffsetx);
this.backgroup.Controls.Add(this.backsector);
@ -1031,17 +1111,51 @@ namespace CodeImp.DoomBuilder.Windows
this.backgroup.Enabled = false;
this.backgroup.Location = new System.Drawing.Point(3, 3);
this.backgroup.Name = "backgroup";
this.backgroup.Size = new System.Drawing.Size(535, 263);
this.backgroup.Size = new System.Drawing.Size(535, 299);
this.backgroup.TabIndex = 1;
this.backgroup.TabStop = false;
this.backgroup.Text = " ";
//
// cbLightAbsoluteBack
//
this.cbLightAbsoluteBack.AutoSize = true;
this.cbLightAbsoluteBack.Location = new System.Drawing.Point(171, 99);
this.cbLightAbsoluteBack.Name = "cbLightAbsoluteBack";
this.cbLightAbsoluteBack.Size = new System.Drawing.Size(69, 18);
this.cbLightAbsoluteBack.TabIndex = 30;
this.cbLightAbsoluteBack.Tag = "lightabsolute";
this.cbLightAbsoluteBack.Text = "Absolute";
this.cbLightAbsoluteBack.UseVisualStyleBackColor = true;
//
// labelLightBack
//
this.labelLightBack.Location = new System.Drawing.Point(17, 100);
this.labelLightBack.Name = "labelLightBack";
this.labelLightBack.Size = new System.Drawing.Size(80, 14);
this.labelLightBack.TabIndex = 28;
this.labelLightBack.Tag = "";
this.labelLightBack.Text = "Brightness:";
this.labelLightBack.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// lightBack
//
this.lightBack.AllowDecimal = false;
this.lightBack.AllowNegative = true;
this.lightBack.AllowRelative = true;
this.lightBack.ButtonStep = 1F;
this.lightBack.Location = new System.Drawing.Point(103, 95);
this.lightBack.Name = "lightBack";
this.lightBack.Size = new System.Drawing.Size(62, 24);
this.lightBack.StepValues = null;
this.lightBack.TabIndex = 29;
this.lightBack.Tag = "light";
//
// backoffsety
//
this.backoffsety.AllowDecimal = false;
this.backoffsety.AllowNegative = true;
this.backoffsety.AllowRelative = true;
this.backoffsety.ButtonStep = 1;
this.backoffsety.ButtonStep = 1F;
this.backoffsety.Location = new System.Drawing.Point(171, 65);
this.backoffsety.Name = "backoffsety";
this.backoffsety.Size = new System.Drawing.Size(62, 24);
@ -1053,7 +1167,7 @@ namespace CodeImp.DoomBuilder.Windows
this.backoffsetx.AllowDecimal = false;
this.backoffsetx.AllowNegative = true;
this.backoffsetx.AllowRelative = true;
this.backoffsetx.ButtonStep = 1;
this.backoffsetx.ButtonStep = 1F;
this.backoffsetx.Location = new System.Drawing.Point(103, 65);
this.backoffsetx.Name = "backoffsetx";
this.backoffsetx.Size = new System.Drawing.Size(62, 24);
@ -1065,7 +1179,7 @@ namespace CodeImp.DoomBuilder.Windows
this.backsector.AllowDecimal = false;
this.backsector.AllowNegative = false;
this.backsector.AllowRelative = false;
this.backsector.ButtonStep = 1;
this.backsector.ButtonStep = 1F;
this.backsector.Location = new System.Drawing.Point(103, 35);
this.backsector.Name = "backsector";
this.backsector.Size = new System.Drawing.Size(130, 24);
@ -1074,7 +1188,7 @@ namespace CodeImp.DoomBuilder.Windows
//
// custombackbutton
//
this.custombackbutton.Location = new System.Drawing.Point(103, 95);
this.custombackbutton.Location = new System.Drawing.Point(103, 126);
this.custombackbutton.Name = "custombackbutton";
this.custombackbutton.Size = new System.Drawing.Size(130, 25);
this.custombackbutton.TabIndex = 3;
@ -1115,11 +1229,11 @@ namespace CodeImp.DoomBuilder.Windows
this.udmfPropertiesBack.Controls.Add(this.tabPage5);
this.udmfPropertiesBack.Controls.Add(this.tabPage6);
this.udmfPropertiesBack.ItemSize = new System.Drawing.Size(100, 19);
this.udmfPropertiesBack.Location = new System.Drawing.Point(6, 133);
this.udmfPropertiesBack.Location = new System.Drawing.Point(10, 172);
this.udmfPropertiesBack.Margin = new System.Windows.Forms.Padding(1);
this.udmfPropertiesBack.Name = "udmfPropertiesBack";
this.udmfPropertiesBack.SelectedIndex = 0;
this.udmfPropertiesBack.Size = new System.Drawing.Size(511, 123);
this.udmfPropertiesBack.Size = new System.Drawing.Size(525, 123);
this.udmfPropertiesBack.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.udmfPropertiesBack.TabIndex = 25;
//
@ -1134,7 +1248,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabPage5.Location = new System.Drawing.Point(4, 23);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(503, 96);
this.tabPage5.Size = new System.Drawing.Size(517, 96);
this.tabPage5.TabIndex = 0;
this.tabPage5.Text = "Offsets & Scale";
this.tabPage5.UseVisualStyleBackColor = true;
@ -1146,7 +1260,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcBackScaleBottom.Field1 = "scalex_bottom";
this.pfcBackScaleBottom.Field2 = "scaley_bottom";
this.pfcBackScaleBottom.Label = "Lower Scale:";
this.pfcBackScaleBottom.Location = new System.Drawing.Point(254, 64);
this.pfcBackScaleBottom.Location = new System.Drawing.Point(262, 64);
this.pfcBackScaleBottom.Name = "pfcBackScaleBottom";
this.pfcBackScaleBottom.Size = new System.Drawing.Size(253, 32);
this.pfcBackScaleBottom.TabIndex = 40;
@ -1158,7 +1272,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcBackScaleMid.Field1 = "scalex_mid";
this.pfcBackScaleMid.Field2 = "scaley_mid";
this.pfcBackScaleMid.Label = "Middle Scale:";
this.pfcBackScaleMid.Location = new System.Drawing.Point(254, 34);
this.pfcBackScaleMid.Location = new System.Drawing.Point(262, 34);
this.pfcBackScaleMid.Name = "pfcBackScaleMid";
this.pfcBackScaleMid.Size = new System.Drawing.Size(253, 32);
this.pfcBackScaleMid.TabIndex = 39;
@ -1170,7 +1284,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcBackScaleTop.Field1 = "scalex_top";
this.pfcBackScaleTop.Field2 = "scaley_top";
this.pfcBackScaleTop.Label = "Upper Scale:";
this.pfcBackScaleTop.Location = new System.Drawing.Point(254, 3);
this.pfcBackScaleTop.Location = new System.Drawing.Point(262, 3);
this.pfcBackScaleTop.Name = "pfcBackScaleTop";
this.pfcBackScaleTop.Size = new System.Drawing.Size(253, 30);
this.pfcBackScaleTop.TabIndex = 38;
@ -1213,9 +1327,6 @@ namespace CodeImp.DoomBuilder.Windows
//
// tabPage6
//
this.tabPage6.Controls.Add(this.cbLightAbsoluteBack);
this.tabPage6.Controls.Add(label6);
this.tabPage6.Controls.Add(this.lightBack);
this.tabPage6.Controls.Add(this.cblightfogBack);
this.tabPage6.Controls.Add(this.cbsmoothlightingBack);
this.tabPage6.Controls.Add(this.cbnodecalsBack);
@ -1225,39 +1336,15 @@ namespace CodeImp.DoomBuilder.Windows
this.tabPage6.Location = new System.Drawing.Point(4, 23);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(503, 96);
this.tabPage6.Size = new System.Drawing.Size(517, 96);
this.tabPage6.TabIndex = 1;
this.tabPage6.Text = "Settings";
this.tabPage6.Text = "Flags";
this.tabPage6.UseVisualStyleBackColor = true;
//
// cbLightAbsoluteBack
//
this.cbLightAbsoluteBack.AutoSize = true;
this.cbLightAbsoluteBack.Location = new System.Drawing.Point(26, 41);
this.cbLightAbsoluteBack.Name = "cbLightAbsoluteBack";
this.cbLightAbsoluteBack.Size = new System.Drawing.Size(109, 18);
this.cbLightAbsoluteBack.TabIndex = 27;
this.cbLightAbsoluteBack.Tag = "lightabsolute";
this.cbLightAbsoluteBack.Text = "Absolute Lighting";
this.cbLightAbsoluteBack.UseVisualStyleBackColor = true;
//
// lightBack
//
this.lightBack.AllowDecimal = false;
this.lightBack.AllowNegative = true;
this.lightBack.AllowRelative = true;
this.lightBack.ButtonStep = 1;
this.lightBack.Location = new System.Drawing.Point(57, 13);
this.lightBack.Name = "lightBack";
this.lightBack.Size = new System.Drawing.Size(78, 24);
this.lightBack.StepValues = null;
this.lightBack.TabIndex = 26;
this.lightBack.Tag = "light";
//
// cblightfogBack
//
this.cblightfogBack.AutoSize = true;
this.cblightfogBack.Location = new System.Drawing.Point(314, 65);
this.cblightfogBack.Location = new System.Drawing.Point(148, 65);
this.cblightfogBack.Name = "cblightfogBack";
this.cblightfogBack.Size = new System.Drawing.Size(179, 18);
this.cblightfogBack.TabIndex = 11;
@ -1268,7 +1355,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbsmoothlightingBack
//
this.cbsmoothlightingBack.AutoSize = true;
this.cbsmoothlightingBack.Location = new System.Drawing.Point(314, 41);
this.cbsmoothlightingBack.Location = new System.Drawing.Point(148, 41);
this.cbsmoothlightingBack.Name = "cbsmoothlightingBack";
this.cbsmoothlightingBack.Size = new System.Drawing.Size(102, 18);
this.cbsmoothlightingBack.TabIndex = 10;
@ -1279,7 +1366,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbnodecalsBack
//
this.cbnodecalsBack.AutoSize = true;
this.cbnodecalsBack.Location = new System.Drawing.Point(314, 17);
this.cbnodecalsBack.Location = new System.Drawing.Point(148, 17);
this.cbnodecalsBack.Name = "cbnodecalsBack";
this.cbnodecalsBack.Size = new System.Drawing.Size(75, 18);
this.cbnodecalsBack.TabIndex = 9;
@ -1290,7 +1377,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbnofakecontrastBack
//
this.cbnofakecontrastBack.AutoSize = true;
this.cbnofakecontrastBack.Location = new System.Drawing.Point(172, 65);
this.cbnofakecontrastBack.Location = new System.Drawing.Point(6, 65);
this.cbnofakecontrastBack.Name = "cbnofakecontrastBack";
this.cbnofakecontrastBack.Size = new System.Drawing.Size(109, 18);
this.cbnofakecontrastBack.TabIndex = 8;
@ -1301,7 +1388,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbWrapMidtexBack
//
this.cbWrapMidtexBack.AutoSize = true;
this.cbWrapMidtexBack.Location = new System.Drawing.Point(172, 41);
this.cbWrapMidtexBack.Location = new System.Drawing.Point(6, 41);
this.cbWrapMidtexBack.Name = "cbWrapMidtexBack";
this.cbWrapMidtexBack.Size = new System.Drawing.Size(124, 18);
this.cbWrapMidtexBack.TabIndex = 7;
@ -1312,7 +1399,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbClipMidtexBack
//
this.cbClipMidtexBack.AutoSize = true;
this.cbClipMidtexBack.Location = new System.Drawing.Point(172, 17);
this.cbClipMidtexBack.Location = new System.Drawing.Point(6, 17);
this.cbClipMidtexBack.Name = "cbClipMidtexBack";
this.cbClipMidtexBack.Size = new System.Drawing.Size(115, 18);
this.cbClipMidtexBack.TabIndex = 6;
@ -1327,10 +1414,11 @@ namespace CodeImp.DoomBuilder.Windows
this.tabcustom.Location = new System.Drawing.Point(4, 23);
this.tabcustom.Name = "tabcustom";
this.tabcustom.Padding = new System.Windows.Forms.Padding(3);
this.tabcustom.Size = new System.Drawing.Size(549, 551);
this.tabcustom.Size = new System.Drawing.Size(549, 621);
this.tabcustom.TabIndex = 2;
this.tabcustom.Text = "Custom";
this.tabcustom.UseVisualStyleBackColor = true;
this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
//
// fieldslist
//
@ -1346,7 +1434,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist.Name = "fieldslist";
this.fieldslist.PropertyColumnVisible = true;
this.fieldslist.PropertyColumnWidth = 150;
this.fieldslist.Size = new System.Drawing.Size(511, 529);
this.fieldslist.Size = new System.Drawing.Size(527, 602);
this.fieldslist.TabIndex = 0;
this.fieldslist.TypeColumnVisible = true;
this.fieldslist.TypeColumnWidth = 100;
@ -1494,7 +1582,7 @@ namespace CodeImp.DoomBuilder.Windows
this.buttonsNumericTextbox1.AllowDecimal = false;
this.buttonsNumericTextbox1.AllowNegative = true;
this.buttonsNumericTextbox1.AllowRelative = true;
this.buttonsNumericTextbox1.ButtonStep = 1;
this.buttonsNumericTextbox1.ButtonStep = 1F;
this.buttonsNumericTextbox1.Location = new System.Drawing.Point(57, 13);
this.buttonsNumericTextbox1.Name = "buttonsNumericTextbox1";
this.buttonsNumericTextbox1.Size = new System.Drawing.Size(78, 24);
@ -1574,7 +1662,7 @@ namespace CodeImp.DoomBuilder.Windows
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.cancel;
this.ClientSize = new System.Drawing.Size(577, 627);
this.ClientSize = new System.Drawing.Size(577, 697);
this.Controls.Add(this.tabs);
this.Controls.Add(this.cancel);
this.Controls.Add(this.apply);
@ -1597,9 +1685,11 @@ namespace CodeImp.DoomBuilder.Windows
this.hexenpanel.ResumeLayout(false);
this.hexenpanel.PerformLayout();
this.udmfpanel.ResumeLayout(false);
this.settingsgroup.ResumeLayout(false);
this.flagsgroup.ResumeLayout(false);
this.tabs.ResumeLayout(false);
this.tabproperties.ResumeLayout(false);
this.settingsGroup.ResumeLayout(false);
this.settingsGroup.PerformLayout();
this.idgroup.ResumeLayout(false);
this.tabsidedefs.ResumeLayout(false);
this.splitter.Panel1.ResumeLayout(false);
@ -1608,6 +1698,7 @@ namespace CodeImp.DoomBuilder.Windows
this.splitter.Panel2.PerformLayout();
this.splitter.ResumeLayout(false);
this.frontgroup.ResumeLayout(false);
this.frontgroup.PerformLayout();
this.udmfPropertiesFront.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
@ -1631,7 +1722,7 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.Button cancel;
private System.Windows.Forms.Button apply;
private System.Windows.Forms.GroupBox actiongroup;
private System.Windows.Forms.GroupBox settingsgroup;
private System.Windows.Forms.GroupBox flagsgroup;
private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.Button browseaction;
@ -1707,8 +1798,6 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetMid;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetTop;
private System.Windows.Forms.TabPage tabPage6;
private System.Windows.Forms.CheckBox cbLightAbsoluteBack;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox lightBack;
private System.Windows.Forms.CheckBox cblightfogBack;
private System.Windows.Forms.CheckBox cbsmoothlightingBack;
private System.Windows.Forms.CheckBox cbnodecalsBack;
@ -1731,5 +1820,13 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.CheckBox checkBox6;
private System.Windows.Forms.CheckBox checkBox7;
private System.Windows.Forms.CheckBox checkBox8;
private System.Windows.Forms.GroupBox settingsGroup;
private System.Windows.Forms.ComboBox cbRenderStyle;
private CodeImp.DoomBuilder.GZBuilder.Controls.FloatFieldsSlider fsAlpha;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox lockNumber;
private System.Windows.Forms.Label labelLightFront;
private System.Windows.Forms.CheckBox cbLightAbsoluteBack;
private System.Windows.Forms.Label labelLightBack;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox lightBack;
}
}

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

@ -85,22 +85,18 @@ namespace CodeImp.DoomBuilder.Windows
if(General.Map.FormatInterface.HasActionArgs)
argspanel.Visible = true;
// Custom fields?
if(!General.Map.FormatInterface.HasCustomFields)
tabs.TabPages.Remove(tabcustom);
customfrontbutton.Visible = General.Map.FormatInterface.HasCustomFields;
custombackbutton.Visible = General.Map.FormatInterface.HasCustomFields;
// Arrange panels
if(General.Map.FormatInterface.HasPresetActivations)
{
//mxd
actiongroup.Top = settingsGroup.Top;
actiongroup.Height = hexenpanel.Location.Y + hexenpanel.Height;
this.Height = heightpanel1.Height;
} else if(!General.Map.FormatInterface.HasMixedActivations &&
!General.Map.FormatInterface.HasActionArgs &&
!General.Map.FormatInterface.HasPresetActivations)
{
actiongroup.Top = settingsGroup.Top;
actiongroup.Height = action.Bottom + action.Top + (actiongroup.Width - actiongroup.ClientRectangle.Width);
this.Height = heightpanel2.Height;
}
@ -122,7 +118,23 @@ namespace CodeImp.DoomBuilder.Windows
frontUdmfFlags = new List<CheckBox>() { cbLightAbsoluteFront, cblightfogFront, cbnodecalsFront, cbnofakecontrastFront, cbWrapMidtexFront, cbsmoothlightingFront, cbClipMidtexFront };
backUdmfControls = new List<PairedFieldsControl>() { pfcBackOffsetTop, pfcBackOffsetMid, pfcBackOffsetBottom, pfcBackScaleTop, pfcBackScaleMid, pfcBackScaleBottom };
backUdmfFlags = new List<CheckBox>() { cbLightAbsoluteBack, cblightfogBack, cbnodecalsBack, cbnofakecontrastBack, cbWrapMidtexBack, cbsmoothlightingBack, cbClipMidtexBack };
fsAlpha.SetLimits(0f, 1f);
} else {
tabs.TabPages.Remove(tabcustom);
settingsGroup.Visible = false;
customfrontbutton.Visible = false;
custombackbutton.Visible = false;
labelLightFront.Visible = false;
lightFront.Visible = false;
cbLightAbsoluteFront.Visible = false;
labelLightBack.Visible = false;
lightBack.Visible = false;
cbLightAbsoluteBack.Visible = false;
udmfPropertiesFront.Visible = false;
udmfPropertiesBack.Visible = false;
}
@ -168,6 +180,14 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields
fieldslist.SetValues(fl.Fields, true);
//mxd. UDMF Settings
if(General.Map.FormatInterface.HasCustomFields) {
string renderStyle = fl.Fields.GetValue("renderstyle", "");
cbRenderStyle.SelectedIndex = (renderStyle == "add" ? 1 : 0);
fsAlpha.SetValueFrom(fl.Fields);
lockNumber.Text = fl.Fields.GetValue("locknumber", 0).ToString();
}
// Action/tags
action.Value = fl.Action;
@ -289,9 +309,20 @@ namespace CodeImp.DoomBuilder.Windows
}
}
//mxd. UDMF Settings
if(General.Map.FormatInterface.HasCustomFields) {
int i = (l.Fields.GetValue("renderstyle", "") == "add" ? 1 : 0);
if(cbRenderStyle.SelectedIndex != -1 && i != cbRenderStyle.SelectedIndex)
cbRenderStyle.SelectedIndex = -1;
fsAlpha.SetValueFrom(l.Fields);
if(!string.IsNullOrEmpty(lockNumber.Text) && lockNumber.GetResult(0) != fl.Fields.GetValue("locknumber", 0))
lockNumber.Text = "";
}
// Action/tags
if(l.Action != action.Value) action.Empty = true;
//if(l.Tag.ToString() != tag.Text) tag.Text = "";
if(General.Map.FormatInterface.HasLinedefTag && l.Tag != fl.Tag) tagSelector.ClearTag(); //mxd
if(l.Args[0] != arg0.GetResult(-1)) arg0.ClearValue();
if(l.Args[1] != arg1.GetResult(-1)) arg1.ClearValue();
@ -337,7 +368,7 @@ namespace CodeImp.DoomBuilder.Windows
foreach(PairedFieldsControl pfc in frontUdmfControls)
pfc.SetValuesFrom(l.Front.Fields);
if(lightFront.Text != UDMFTools.GetInteger(fl.Front.Fields, lightFront.Tag.ToString(), 0).ToString()) lightFront.Text = "";
if(!string.IsNullOrEmpty(lightFront.Text) && lightFront.Text != UDMFTools.GetInteger(fl.Front.Fields, lightFront.Tag.ToString(), 0).ToString()) lightFront.Text = "";
foreach(CheckBox cb in frontUdmfFlags) {
if(cb.CheckState == CheckState.Indeterminate) continue;
@ -373,7 +404,7 @@ namespace CodeImp.DoomBuilder.Windows
foreach(PairedFieldsControl pfc in backUdmfControls)
pfc.SetValuesFrom(l.Back.Fields);
if(lightBack.Text != UDMFTools.GetInteger(fl.Back.Fields, lightBack.Tag.ToString(), 0).ToString())
if(!string.IsNullOrEmpty(lightBack.Text) && lightBack.Text != UDMFTools.GetInteger(fl.Back.Fields, lightBack.Tag.ToString(), 0).ToString())
lightBack.Text = "";
foreach(CheckBox cb in backUdmfFlags) {
@ -509,6 +540,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd
bool hasAcs = !action.Empty && Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1;
bool hasArg0str = General.Map.UDMF && hasAcs && !string.IsNullOrEmpty(arg0str.Text);
int lockNum = lockNumber.GetResult(0);
// Go for all the lines
foreach(Linedef l in lines)
@ -682,6 +714,23 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields
fieldslist.Apply(l.Fields);
//mxd. UDMF Settings
if(General.Map.FormatInterface.HasCustomFields) {
l.Fields.BeforeFieldsChange();
if(cbRenderStyle.SelectedIndex == 1) { //add
l.Fields["renderstyle"] = new UniValue(UniversalType.String, "add");
} else if(l.Fields.ContainsKey("renderstyle")) {
l.Fields.Remove("renderstyle");
}
fsAlpha.ApplyTo(l.Fields);
if(lockNum > 0)
l.Fields["locknumber"] = new UniValue(UniversalType.Integer, lockNum);
else if(l.Fields.ContainsKey("locknumber"))
l.Fields.Remove("locknumber");
}
//mxd. apply arg0str
if(cbArgStr.Visible && cbArgStr.Checked && hasArg0str) {
if(l.Fields.ContainsKey("arg0str"))
@ -841,6 +890,11 @@ namespace CodeImp.DoomBuilder.Windows
arg0str.Text = (string)fieldslist.GetValue(fieldname);
}
//mxd
private void tabcustom_MouseEnter(object sender, EventArgs e) {
fieldslist.Focus();
}
// Help!
private void LinedefEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{

17
Source/Core/Windows/LinedefEditForm.resx
View file

@ -180,13 +180,16 @@
<metadata name="label667.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label17.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="cancel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -246,16 +249,10 @@
<metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="heightpanel1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="heightpanel2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

31
Source/Core/Windows/SectorEditForm.Designer.cs generated
View file

@ -39,6 +39,7 @@ namespace CodeImp.DoomBuilder.Windows
System.Windows.Forms.Label label5;
System.Windows.Forms.Label label2;
System.Windows.Forms.Label label4;
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
this.brightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.browseeffect = new System.Windows.Forms.Button();
this.effect = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
@ -64,7 +65,6 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
this.flatSelectorControl2 = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
this.flatSelectorControl1 = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
label1 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
groupaction = new System.Windows.Forms.GroupBox();
@ -116,6 +116,13 @@ namespace CodeImp.DoomBuilder.Windows
groupaction.TabStop = false;
groupaction.Text = " Identification ";
//
// tagSelector
//
this.tagSelector.Location = new System.Drawing.Point(6, 21);
this.tagSelector.Name = "tagSelector";
this.tagSelector.Size = new System.Drawing.Size(369, 35);
this.tagSelector.TabIndex = 0;
//
// groupeffect
//
groupeffect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@ -137,7 +144,7 @@ namespace CodeImp.DoomBuilder.Windows
this.brightness.AllowDecimal = false;
this.brightness.AllowNegative = false;
this.brightness.AllowRelative = true;
this.brightness.ButtonStep = 8;
this.brightness.ButtonStep = 8F;
this.brightness.Location = new System.Drawing.Point(89, 61);
this.brightness.Name = "brightness";
this.brightness.Size = new System.Drawing.Size(73, 24);
@ -222,7 +229,7 @@ namespace CodeImp.DoomBuilder.Windows
this.ceilOffsetX.AllowDecimal = false;
this.ceilOffsetX.AllowNegative = true;
this.ceilOffsetX.AllowRelative = true;
this.ceilOffsetX.ButtonStep = 1;
this.ceilOffsetX.ButtonStep = 1F;
this.ceilOffsetX.Location = new System.Drawing.Point(108, 3);
this.ceilOffsetX.Name = "ceilOffsetX";
this.ceilOffsetX.Size = new System.Drawing.Size(56, 24);
@ -243,7 +250,7 @@ namespace CodeImp.DoomBuilder.Windows
this.floorOffsetY.AllowDecimal = false;
this.floorOffsetY.AllowNegative = true;
this.floorOffsetY.AllowRelative = true;
this.floorOffsetY.ButtonStep = 1;
this.floorOffsetY.ButtonStep = 1F;
this.floorOffsetY.Location = new System.Drawing.Point(170, 31);
this.floorOffsetY.Name = "floorOffsetY";
this.floorOffsetY.Size = new System.Drawing.Size(56, 24);
@ -255,7 +262,7 @@ namespace CodeImp.DoomBuilder.Windows
this.ceilOffsetY.AllowDecimal = false;
this.ceilOffsetY.AllowNegative = true;
this.ceilOffsetY.AllowRelative = true;
this.ceilOffsetY.ButtonStep = 1;
this.ceilOffsetY.ButtonStep = 1F;
this.ceilOffsetY.Location = new System.Drawing.Point(170, 3);
this.ceilOffsetY.Name = "ceilOffsetY";
this.ceilOffsetY.Size = new System.Drawing.Size(56, 24);
@ -267,7 +274,7 @@ namespace CodeImp.DoomBuilder.Windows
this.floorOffsetX.AllowDecimal = false;
this.floorOffsetX.AllowNegative = true;
this.floorOffsetX.AllowRelative = true;
this.floorOffsetX.ButtonStep = 1;
this.floorOffsetX.ButtonStep = 1F;
this.floorOffsetX.Location = new System.Drawing.Point(108, 31);
this.floorOffsetX.Name = "floorOffsetX";
this.floorOffsetX.Size = new System.Drawing.Size(56, 24);
@ -301,7 +308,7 @@ namespace CodeImp.DoomBuilder.Windows
this.ceilingheight.AllowDecimal = false;
this.ceilingheight.AllowNegative = true;
this.ceilingheight.AllowRelative = true;
this.ceilingheight.ButtonStep = 8;
this.ceilingheight.ButtonStep = 8F;
this.ceilingheight.Location = new System.Drawing.Point(108, 4);
this.ceilingheight.Name = "ceilingheight";
this.ceilingheight.Size = new System.Drawing.Size(88, 24);
@ -350,7 +357,7 @@ namespace CodeImp.DoomBuilder.Windows
this.floorheight.AllowDecimal = false;
this.floorheight.AllowNegative = true;
this.floorheight.AllowRelative = true;
this.floorheight.ButtonStep = 8;
this.floorheight.ButtonStep = 8F;
this.floorheight.Location = new System.Drawing.Point(108, 34);
this.floorheight.Name = "floorheight";
this.floorheight.Size = new System.Drawing.Size(88, 24);
@ -456,6 +463,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabcustom.TabIndex = 1;
this.tabcustom.Text = "Custom";
this.tabcustom.UseVisualStyleBackColor = true;
this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
//
// fieldslist
//
@ -493,13 +501,6 @@ namespace CodeImp.DoomBuilder.Windows
this.flatSelectorControl1.TabIndex = 12;
this.flatSelectorControl1.TextureName = "";
//
// tagSelector
//
this.tagSelector.Location = new System.Drawing.Point(6, 21);
this.tagSelector.Name = "tagSelector";
this.tagSelector.Size = new System.Drawing.Size(369, 35);
this.tagSelector.TabIndex = 0;
//
// SectorEditForm
//
this.AcceptButton = this.apply;

5
Source/Core/Windows/SectorEditForm.cs
View file

@ -311,6 +311,11 @@ namespace CodeImp.DoomBuilder.Windows
UpdateSectorHeight();
}
//mxd
private void tabcustom_MouseEnter(object sender, EventArgs e) {
fieldslist.Focus();
}
// Help
private void SectorEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{

9
Source/Core/Windows/ThingEditForm.Designer.cs generated
View file

@ -177,7 +177,7 @@ namespace CodeImp.DoomBuilder.Windows
this.posX.AllowDecimal = false;
this.posX.AllowNegative = true;
this.posX.AllowRelative = true;
this.posX.ButtonStep = 8;
this.posX.ButtonStep = 8F;
this.posX.Location = new System.Drawing.Point(68, 16);
this.posX.Name = "posX";
this.posX.Size = new System.Drawing.Size(72, 24);
@ -189,7 +189,7 @@ namespace CodeImp.DoomBuilder.Windows
this.posY.AllowDecimal = false;
this.posY.AllowNegative = true;
this.posY.AllowRelative = true;
this.posY.ButtonStep = 8;
this.posY.ButtonStep = 8F;
this.posY.Location = new System.Drawing.Point(68, 41);
this.posY.Name = "posY";
this.posY.Size = new System.Drawing.Size(72, 24);
@ -201,7 +201,7 @@ namespace CodeImp.DoomBuilder.Windows
this.posZ.AllowDecimal = false;
this.posZ.AllowNegative = true;
this.posZ.AllowRelative = true;
this.posZ.ButtonStep = 8;
this.posZ.ButtonStep = 8F;
this.posZ.Location = new System.Drawing.Point(68, 66);
this.posZ.Name = "posZ";
this.posZ.Size = new System.Drawing.Size(72, 24);
@ -213,7 +213,7 @@ namespace CodeImp.DoomBuilder.Windows
this.angle.AllowDecimal = false;
this.angle.AllowNegative = true;
this.angle.AllowRelative = true;
this.angle.ButtonStep = 1;
this.angle.ButtonStep = 1F;
this.angle.Location = new System.Drawing.Point(186, 16);
this.angle.Name = "angle";
this.angle.Size = new System.Drawing.Size(57, 24);
@ -554,6 +554,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabcustom.TabIndex = 2;
this.tabcustom.Text = "Custom";
this.tabcustom.UseVisualStyleBackColor = true;
this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
//
// fieldslist
//

7
Source/Core/Windows/ThingEditForm.cs
View file

@ -536,6 +536,11 @@ namespace CodeImp.DoomBuilder.Windows
labelAngle.Enabled = !cbRandomAngle.Checked;
}
//mxd
private void tabcustom_MouseEnter(object sender, EventArgs e) {
fieldslist.Focus();
}
// Help
private void ThingEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{
@ -543,8 +548,6 @@ namespace CodeImp.DoomBuilder.Windows
hlpevent.Handled = true;
}
#endregion
}
}

77
Source/Core/Windows/VertexEditForm.Designer.cs generated
View file

@ -29,13 +29,14 @@ namespace CodeImp.DoomBuilder.Windows
private void InitializeComponent()
{
System.Windows.Forms.TabPage tabproperties;
System.Windows.Forms.Label label3;
System.Windows.Forms.Label label2;
System.Windows.Forms.Label label3;
System.Windows.Forms.Label label1;
System.Windows.Forms.Label label6;
this.groupposition = new System.Windows.Forms.GroupBox();
this.zfloor = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.panelHeightControls = new System.Windows.Forms.Panel();
this.zceiling = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.zfloor = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.positiony = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.positionx = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.tabs = new System.Windows.Forms.TabControl();
@ -43,17 +44,16 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button();
this.panelHeightControls = new System.Windows.Forms.Panel();
tabproperties = new System.Windows.Forms.TabPage();
label3 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
tabproperties.SuspendLayout();
this.groupposition.SuspendLayout();
this.panelHeightControls.SuspendLayout();
this.tabs.SuspendLayout();
this.tabcustom.SuspendLayout();
this.panelHeightControls.SuspendLayout();
this.SuspendLayout();
//
// tabproperties
@ -85,38 +85,40 @@ namespace CodeImp.DoomBuilder.Windows
this.groupposition.TabStop = false;
this.groupposition.Text = " Position ";
//
// zfloor
// panelHeightControls
//
this.zfloor.AllowDecimal = false;
this.zfloor.AllowNegative = true;
this.zfloor.AllowRelative = true;
this.zfloor.ButtonStep = 1;
this.zfloor.Location = new System.Drawing.Point(188, 32);
this.zfloor.Name = "zfloor";
this.zfloor.Size = new System.Drawing.Size(120, 24);
this.zfloor.StepValues = null;
this.zfloor.TabIndex = 29;
this.panelHeightControls.Controls.Add(this.zceiling);
this.panelHeightControls.Controls.Add(this.zfloor);
this.panelHeightControls.Controls.Add(label2);
this.panelHeightControls.Controls.Add(label3);
this.panelHeightControls.Location = new System.Drawing.Point(48, 73);
this.panelHeightControls.Name = "panelHeightControls";
this.panelHeightControls.Size = new System.Drawing.Size(308, 100);
this.panelHeightControls.TabIndex = 30;
//
// zceiling
//
this.zceiling.AllowDecimal = false;
this.zceiling.AllowNegative = true;
this.zceiling.AllowRelative = true;
this.zceiling.ButtonStep = 1;
this.zceiling.ButtonStep = 1F;
this.zceiling.Location = new System.Drawing.Point(188, 0);
this.zceiling.Name = "zceiling";
this.zceiling.Size = new System.Drawing.Size(120, 24);
this.zceiling.StepValues = null;
this.zceiling.TabIndex = 28;
//
// label3
// zfloor
//
label3.AutoSize = true;
label3.Location = new System.Drawing.Point(63, 5);
label3.Name = "label3";
label3.Size = new System.Drawing.Size(118, 14);
label3.TabIndex = 27;
label3.Text = "Absolute ceiling height:";
this.zfloor.AllowDecimal = false;
this.zfloor.AllowNegative = true;
this.zfloor.AllowRelative = true;
this.zfloor.ButtonStep = 1F;
this.zfloor.Location = new System.Drawing.Point(188, 32);
this.zfloor.Name = "zfloor";
this.zfloor.Size = new System.Drawing.Size(120, 24);
this.zfloor.StepValues = null;
this.zfloor.TabIndex = 29;
//
// label2
//
@ -127,12 +129,21 @@ namespace CodeImp.DoomBuilder.Windows
label2.TabIndex = 26;
label2.Text = "Absolute floor height:";
//
// label3
//
label3.AutoSize = true;
label3.Location = new System.Drawing.Point(63, 5);
label3.Name = "label3";
label3.Size = new System.Drawing.Size(118, 14);
label3.TabIndex = 27;
label3.Text = "Absolute ceiling height:";
//
// positiony
//
this.positiony.AllowDecimal = false;
this.positiony.AllowNegative = true;
this.positiony.AllowRelative = true;
this.positiony.ButtonStep = 1;
this.positiony.ButtonStep = 1F;
this.positiony.Location = new System.Drawing.Point(236, 34);
this.positiony.Name = "positiony";
this.positiony.Size = new System.Drawing.Size(120, 24);
@ -144,7 +155,7 @@ namespace CodeImp.DoomBuilder.Windows
this.positionx.AllowDecimal = false;
this.positionx.AllowNegative = true;
this.positionx.AllowRelative = true;
this.positionx.ButtonStep = 1;
this.positionx.ButtonStep = 1F;
this.positionx.Location = new System.Drawing.Point(68, 34);
this.positionx.Name = "positionx";
this.positionx.Size = new System.Drawing.Size(120, 24);
@ -196,6 +207,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabcustom.TabIndex = 1;
this.tabcustom.Text = "Custom";
this.tabcustom.UseVisualStyleBackColor = true;
this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
//
// fieldslist
//
@ -240,17 +252,6 @@ namespace CodeImp.DoomBuilder.Windows
this.apply.UseVisualStyleBackColor = true;
this.apply.Click += new System.EventHandler(this.apply_Click);
//
// panelHeightControls
//
this.panelHeightControls.Controls.Add(this.zceiling);
this.panelHeightControls.Controls.Add(this.zfloor);
this.panelHeightControls.Controls.Add(label2);
this.panelHeightControls.Controls.Add(label3);
this.panelHeightControls.Location = new System.Drawing.Point(48, 73);
this.panelHeightControls.Name = "panelHeightControls";
this.panelHeightControls.Size = new System.Drawing.Size(308, 100);
this.panelHeightControls.TabIndex = 30;
//
// VertexEditForm
//
this.AcceptButton = this.apply;
@ -273,10 +274,10 @@ namespace CodeImp.DoomBuilder.Windows
tabproperties.ResumeLayout(false);
this.groupposition.ResumeLayout(false);
this.groupposition.PerformLayout();
this.tabs.ResumeLayout(false);
this.tabcustom.ResumeLayout(false);
this.panelHeightControls.ResumeLayout(false);
this.panelHeightControls.PerformLayout();
this.tabs.ResumeLayout(false);
this.tabcustom.ResumeLayout(false);
this.ResumeLayout(false);
}

5
Source/Core/Windows/VertexEditForm.cs
View file

@ -201,6 +201,11 @@ namespace CodeImp.DoomBuilder.Windows
this.Close();
}
//mxd
private void tabcustom_MouseEnter(object sender, EventArgs e) {
fieldslist.Focus();
}
// Help requested
private void VertexEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{

3
Source/Core/Windows/VertexEditForm.resx
View file

@ -150,9 +150,6 @@
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cancel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>