mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-31 12:50:52 +00:00
Edit Selection Mode: improved handling of texture transformation (still doesn't work 100% correctly)
This commit is contained in:
biwa
parent
6a55d0086f
commit
9b08454138
4 changed files with 100 additions and 347 deletions
|
|
@ -19,6 +19,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using CodeImp.DoomBuilder.Actions;
|
||||
using CodeImp.DoomBuilder.Config;
|
||||
|
|
@ -182,14 +183,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
private bool usepreciseposition; //mxd
|
||||
|
||||
//mxd. Texture modification
|
||||
private static bool transformflooroffsets;
|
||||
private static bool transformceiloffsets;
|
||||
private static bool rotateflooroffsets;
|
||||
private static bool rotateceiloffsets;
|
||||
private static bool scaleflooroffsets;
|
||||
private static bool scaleceiloffsets;
|
||||
private static bool pintextures;
|
||||
private Vector2D selectioncenter;
|
||||
private Vector2D selectionbasecenter;
|
||||
private Vector2D referencepoint;
|
||||
|
||||
// Modifying Modes
|
||||
private ModifyMode mode;
|
||||
|
|
@ -230,13 +227,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//mxd. Modification
|
||||
internal bool UsePrecisePosition { get { return usepreciseposition; } set { usepreciseposition = value; } }
|
||||
|
||||
//mxd. Texture offset properties
|
||||
internal bool TransformFloorOffsets { get { return transformflooroffsets; } set { transformflooroffsets = value; UpdateAllChanges(); } }
|
||||
internal bool TransformCeilingOffsets { get { return transformceiloffsets; } set { transformceiloffsets = value; UpdateAllChanges(); } }
|
||||
internal bool RotateFloorOffsets { get { return rotateflooroffsets; } set { rotateflooroffsets = value; UpdateAllChanges(); } }
|
||||
internal bool RotateCeilingOffsets { get { return rotateceiloffsets; } set { rotateceiloffsets = value; UpdateAllChanges(); } }
|
||||
internal bool ScaleFloorOffsets { get { return scaleflooroffsets; } set { scaleflooroffsets = value; UpdateAllChanges(); } }
|
||||
internal bool ScaleCeilingOffsets { get { return scaleceiloffsets; } set { scaleceiloffsets = value; UpdateAllChanges(); } }
|
||||
// Texture offset properties
|
||||
internal bool PinTextures { get { return pintextures; } set { pintextures = value; UpdateAllChanges(); } }
|
||||
|
||||
//mxd. Height offset mode
|
||||
internal HeightAdjustMode SectorHeightAdjustMode { get { return heightadjustmode; } set { heightadjustmode = value; } }
|
||||
|
|
@ -888,8 +880,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
group.Key.Fields.BeforeFieldsChange();
|
||||
|
||||
// Apply transforms
|
||||
UpdateTextureTransform(group.Key.Fields, group.Value.Ceiling, transformceiloffsets, rotateceiloffsets, scaleceiloffsets);
|
||||
UpdateTextureTransform(group.Key.Fields, group.Value.Floor, transformflooroffsets, rotateflooroffsets, scaleflooroffsets);
|
||||
UpdateTextureTransform(group.Key.Fields, group.Value.Ceiling /*, transformceiloffsets, rotateceiloffsets, scaleceiloffsets */);
|
||||
UpdateTextureTransform(group.Key.Fields, group.Value.Floor /*, transformflooroffsets, rotateflooroffsets, scaleflooroffsets */);
|
||||
|
||||
// Update cache
|
||||
group.Key.UpdateNeeded = true;
|
||||
|
|
@ -901,47 +893,28 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
}
|
||||
|
||||
//mxd. This updates texture transforms in given UniFields
|
||||
private void UpdateTextureTransform(UniFields fields, SurfaceTextureInfo si, bool transformoffsets, bool rotateoffsets, bool scaleoffsets)
|
||||
private void UpdateTextureTransform(UniFields fields, SurfaceTextureInfo si /*, bool transformoffsets, bool rotateoffsets, bool scaleoffsets */)
|
||||
{
|
||||
// Get offset-ready values
|
||||
double texrotation = Angle2D.PI2 - rotation;
|
||||
|
||||
// Update texture offsets
|
||||
if (transformoffsets)
|
||||
if (pintextures)
|
||||
{
|
||||
double trotation = rotateoffsets ? (si.Rotation + texrotation) : (si.Rotation);
|
||||
Vector2D offset = selectioncenter.GetRotated(trotation);
|
||||
double texrotation = Angle2D.PI2 - rotation;
|
||||
|
||||
fields["xpanning" + si.Part] = new UniValue(UniversalType.Float, Math.Round(-offset.x, General.Map.FormatInterface.VertexDecimals));
|
||||
fields["ypanning" + si.Part] = new UniValue(UniversalType.Float, Math.Round(offset.y, General.Map.FormatInterface.VertexDecimals));
|
||||
double trotation = texrotation + si.Rotation;
|
||||
Vector2D o = ((referencepoint - selectionbasecenter).GetRotated(-trotation) + selectionbasecenter + this.offset - this.baseoffset).GetRotated(trotation);
|
||||
|
||||
fields["xpanning" + si.Part] = new UniValue(UniversalType.Float, Math.Round(-o.x + si.Offset.x, General.Map.FormatInterface.VertexDecimals));
|
||||
fields["ypanning" + si.Part] = new UniValue(UniversalType.Float, Math.Round(o.y + si.Offset.y, General.Map.FormatInterface.VertexDecimals));
|
||||
fields["rotation" + si.Part] = new UniValue(UniversalType.Float, General.ClampAngle(Math.Round(Angle2D.RadToDeg(trotation), General.Map.FormatInterface.VertexDecimals)));
|
||||
}
|
||||
// Restore texture offsets
|
||||
else
|
||||
else
|
||||
{
|
||||
// Reset values
|
||||
fields["xpanning" + si.Part] = new UniValue(UniversalType.Float, si.Offset.x);
|
||||
fields["ypanning" + si.Part] = new UniValue(UniversalType.Float, si.Offset.y);
|
||||
}
|
||||
|
||||
// Update rotation
|
||||
if(rotateoffsets)
|
||||
fields["rotation" + si.Part] = new UniValue(UniversalType.AngleDegreesFloat, General.ClampAngle(Math.Round(Angle2D.RadToDeg(si.Rotation + texrotation), General.Map.FormatInterface.VertexDecimals)));
|
||||
// Restore rotation
|
||||
else
|
||||
fields["rotation" + si.Part] = new UniValue(UniversalType.AngleDegreesFloat, Angle2D.RadToDeg(si.Rotation));
|
||||
|
||||
// Update scale
|
||||
if(scaleoffsets)
|
||||
{
|
||||
fields["xscale" + si.Part] = new UniValue(UniversalType.Float, Math.Round(si.Scale.x * scale.x, General.Map.FormatInterface.VertexDecimals));
|
||||
fields["yscale" + si.Part] = new UniValue(UniversalType.Float, Math.Round(-si.Scale.y * scale.y, General.Map.FormatInterface.VertexDecimals));
|
||||
}
|
||||
// Restore scale
|
||||
else
|
||||
{
|
||||
fields["xscale" + si.Part] = new UniValue(UniversalType.Float, si.Scale.x);
|
||||
fields["yscale" + si.Part] = new UniValue(UniversalType.Float, -si.Scale.y);
|
||||
}
|
||||
}
|
||||
|
||||
//mxd. This restores texture transforms for all sectors
|
||||
|
|
@ -1344,8 +1317,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
Vector2D right;
|
||||
right.x = float.MinValue;
|
||||
right.y = float.MinValue;
|
||||
|
||||
foreach(Vertex v in selectedvertices)
|
||||
|
||||
if(selectedvertices.Count > 0)
|
||||
referencepoint = selectedvertices.First().Position;
|
||||
|
||||
foreach (Vertex v in selectedvertices)
|
||||
{
|
||||
// Find left-top and right-bottom
|
||||
if(v.Position.x < offset.x) offset.x = v.Position.x;
|
||||
|
|
|
|||
|
|
@ -67,28 +67,19 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.label13 = new System.Windows.Forms.Label();
|
||||
this.label11 = new System.Windows.Forms.Label();
|
||||
this.absrot = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
|
||||
this.ceiltexgroup = new System.Windows.Forms.GroupBox();
|
||||
this.ceiltexoffset = new System.Windows.Forms.CheckBox();
|
||||
this.ceiltexrotation = new System.Windows.Forms.CheckBox();
|
||||
this.ceiltexscale = new System.Windows.Forms.CheckBox();
|
||||
this.ceiltexall = new System.Windows.Forms.CheckBox();
|
||||
this.floortexrotation = new System.Windows.Forms.CheckBox();
|
||||
this.floortexoffset = new System.Windows.Forms.CheckBox();
|
||||
this.floortexscale = new System.Windows.Forms.CheckBox();
|
||||
this.floortexall = new System.Windows.Forms.CheckBox();
|
||||
this.floortexgroup = new System.Windows.Forms.GroupBox();
|
||||
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.pintextures = new System.Windows.Forms.CheckBox();
|
||||
this.gbTextures = new System.Windows.Forms.GroupBox();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.groupBox2.SuspendLayout();
|
||||
this.groupBox3.SuspendLayout();
|
||||
this.ceiltexgroup.SuspendLayout();
|
||||
this.floortexgroup.SuspendLayout();
|
||||
this.gbTextures.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// groupBox1
|
||||
//
|
||||
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox1.Controls.Add(this.preciseposition);
|
||||
this.groupBox1.Controls.Add(this.orgposy);
|
||||
this.groupBox1.Controls.Add(this.orgposx);
|
||||
|
|
@ -118,7 +109,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.preciseposition.TabIndex = 6;
|
||||
this.preciseposition.Text = "High precision positioning";
|
||||
this.tooltip.SetToolTip(this.preciseposition, "When checked, thing and vertex positions will be set using floating point precisi" +
|
||||
"on.\r\nOtherwise, they will be rounded to the nearest integer.");
|
||||
"on.\r\nOtherwise, they will be rounded to the nearest integer.");
|
||||
this.preciseposition.UseVisualStyleBackColor = true;
|
||||
this.preciseposition.CheckedChanged += new System.EventHandler(this.preciseposition_CheckedChanged);
|
||||
//
|
||||
|
|
@ -183,6 +174,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// relposy
|
||||
//
|
||||
this.relposy.AllowDecimal = true;
|
||||
this.relposy.AllowExpressions = false;
|
||||
this.relposy.AllowNegative = true;
|
||||
this.relposy.AllowRelative = true;
|
||||
this.relposy.ButtonStep = 1;
|
||||
|
|
@ -196,14 +188,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.relposy.Size = new System.Drawing.Size(72, 24);
|
||||
this.relposy.StepValues = null;
|
||||
this.relposy.TabIndex = 5;
|
||||
this.relposy.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.relposy.WhenButtonsClicked += new System.EventHandler(this.relposy_Validated);
|
||||
this.relposy.WhenEnterPressed += new System.EventHandler(this.relposy_Validated);
|
||||
this.relposy.Validated += new System.EventHandler(this.relposy_Validated);
|
||||
this.relposy.WhenButtonsClicked += new System.EventHandler(this.relposy_Validated);
|
||||
this.relposy.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// relposx
|
||||
//
|
||||
this.relposx.AllowDecimal = true;
|
||||
this.relposx.AllowExpressions = false;
|
||||
this.relposx.AllowNegative = true;
|
||||
this.relposx.AllowRelative = true;
|
||||
this.relposx.ButtonStep = 1;
|
||||
|
|
@ -217,14 +210,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.relposx.Size = new System.Drawing.Size(72, 24);
|
||||
this.relposx.StepValues = null;
|
||||
this.relposx.TabIndex = 4;
|
||||
this.relposx.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.relposx.WhenButtonsClicked += new System.EventHandler(this.relposx_Validated);
|
||||
this.relposx.WhenEnterPressed += new System.EventHandler(this.relposx_Validated);
|
||||
this.relposx.Validated += new System.EventHandler(this.relposx_Validated);
|
||||
this.relposx.WhenButtonsClicked += new System.EventHandler(this.relposx_Validated);
|
||||
this.relposx.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// absposy
|
||||
//
|
||||
this.absposy.AllowDecimal = true;
|
||||
this.absposy.AllowExpressions = false;
|
||||
this.absposy.AllowNegative = true;
|
||||
this.absposy.AllowRelative = true;
|
||||
this.absposy.ButtonStep = 1;
|
||||
|
|
@ -238,14 +232,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.absposy.Size = new System.Drawing.Size(72, 24);
|
||||
this.absposy.StepValues = null;
|
||||
this.absposy.TabIndex = 3;
|
||||
this.absposy.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.absposy.WhenButtonsClicked += new System.EventHandler(this.absposy_Validated);
|
||||
this.absposy.WhenEnterPressed += new System.EventHandler(this.absposy_Validated);
|
||||
this.absposy.Validated += new System.EventHandler(this.absposy_Validated);
|
||||
this.absposy.WhenButtonsClicked += new System.EventHandler(this.absposy_Validated);
|
||||
this.absposy.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// absposx
|
||||
//
|
||||
this.absposx.AllowDecimal = true;
|
||||
this.absposx.AllowExpressions = false;
|
||||
this.absposx.AllowNegative = true;
|
||||
this.absposx.AllowRelative = true;
|
||||
this.absposx.ButtonStep = 1;
|
||||
|
|
@ -259,10 +254,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.absposx.Size = new System.Drawing.Size(72, 24);
|
||||
this.absposx.StepValues = null;
|
||||
this.absposx.TabIndex = 2;
|
||||
this.absposx.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.absposx.WhenButtonsClicked += new System.EventHandler(this.absposx_Validated);
|
||||
this.absposx.WhenEnterPressed += new System.EventHandler(this.absposx_Validated);
|
||||
this.absposx.Validated += new System.EventHandler(this.absposx_Validated);
|
||||
this.absposx.WhenButtonsClicked += new System.EventHandler(this.absposx_Validated);
|
||||
this.absposx.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// label2
|
||||
//
|
||||
|
|
@ -284,8 +279,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//
|
||||
// groupBox2
|
||||
//
|
||||
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox2.Controls.Add(this.orgsizey);
|
||||
this.groupBox2.Controls.Add(this.orgsizex);
|
||||
this.groupBox2.Controls.Add(this.label12);
|
||||
|
|
@ -366,6 +361,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// relsizey
|
||||
//
|
||||
this.relsizey.AllowDecimal = true;
|
||||
this.relsizey.AllowExpressions = false;
|
||||
this.relsizey.AllowNegative = true;
|
||||
this.relsizey.AllowRelative = true;
|
||||
this.relsizey.ButtonStep = 1;
|
||||
|
|
@ -379,14 +375,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.relsizey.Size = new System.Drawing.Size(72, 24);
|
||||
this.relsizey.StepValues = null;
|
||||
this.relsizey.TabIndex = 5;
|
||||
this.relsizey.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.relsizey.WhenButtonsClicked += new System.EventHandler(this.relsizey_Validated);
|
||||
this.relsizey.WhenEnterPressed += new System.EventHandler(this.relsizey_Validated);
|
||||
this.relsizey.Validated += new System.EventHandler(this.relsizey_Validated);
|
||||
this.relsizey.WhenButtonsClicked += new System.EventHandler(this.relsizey_Validated);
|
||||
this.relsizey.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// relsizex
|
||||
//
|
||||
this.relsizex.AllowDecimal = true;
|
||||
this.relsizex.AllowExpressions = false;
|
||||
this.relsizex.AllowNegative = true;
|
||||
this.relsizex.AllowRelative = true;
|
||||
this.relsizex.ButtonStep = 1;
|
||||
|
|
@ -400,10 +397,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.relsizex.Size = new System.Drawing.Size(72, 24);
|
||||
this.relsizex.StepValues = null;
|
||||
this.relsizex.TabIndex = 4;
|
||||
this.relsizex.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.relsizex.WhenButtonsClicked += new System.EventHandler(this.relsizex_Validated);
|
||||
this.relsizex.WhenEnterPressed += new System.EventHandler(this.relsizex_Validated);
|
||||
this.relsizex.Validated += new System.EventHandler(this.relsizex_Validated);
|
||||
this.relsizex.WhenButtonsClicked += new System.EventHandler(this.relsizex_Validated);
|
||||
this.relsizex.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// label4
|
||||
//
|
||||
|
|
@ -417,6 +414,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// abssizey
|
||||
//
|
||||
this.abssizey.AllowDecimal = true;
|
||||
this.abssizey.AllowExpressions = false;
|
||||
this.abssizey.AllowNegative = true;
|
||||
this.abssizey.AllowRelative = true;
|
||||
this.abssizey.ButtonStep = 1;
|
||||
|
|
@ -430,14 +428,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.abssizey.Size = new System.Drawing.Size(72, 24);
|
||||
this.abssizey.StepValues = null;
|
||||
this.abssizey.TabIndex = 3;
|
||||
this.abssizey.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.abssizey.WhenButtonsClicked += new System.EventHandler(this.abssizey_Validated);
|
||||
this.abssizey.WhenEnterPressed += new System.EventHandler(this.abssizey_Validated);
|
||||
this.abssizey.Validated += new System.EventHandler(this.abssizey_Validated);
|
||||
this.abssizey.WhenButtonsClicked += new System.EventHandler(this.abssizey_Validated);
|
||||
this.abssizey.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// abssizex
|
||||
//
|
||||
this.abssizex.AllowDecimal = true;
|
||||
this.abssizex.AllowExpressions = false;
|
||||
this.abssizex.AllowNegative = true;
|
||||
this.abssizex.AllowRelative = true;
|
||||
this.abssizex.ButtonStep = 1;
|
||||
|
|
@ -451,10 +450,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.abssizex.Size = new System.Drawing.Size(72, 24);
|
||||
this.abssizex.StepValues = null;
|
||||
this.abssizex.TabIndex = 2;
|
||||
this.abssizex.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.abssizex.WhenButtonsClicked += new System.EventHandler(this.abssizex_Validated);
|
||||
this.abssizex.WhenEnterPressed += new System.EventHandler(this.abssizex_Validated);
|
||||
this.abssizex.Validated += new System.EventHandler(this.abssizex_Validated);
|
||||
this.abssizex.WhenButtonsClicked += new System.EventHandler(this.abssizex_Validated);
|
||||
this.abssizex.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// label3
|
||||
//
|
||||
|
|
@ -467,8 +466,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//
|
||||
// groupBox3
|
||||
//
|
||||
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox3.Controls.Add(this.heightmode);
|
||||
this.groupBox3.Controls.Add(this.label10);
|
||||
this.groupBox3.Controls.Add(this.label14);
|
||||
|
|
@ -565,6 +564,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// absrot
|
||||
//
|
||||
this.absrot.AllowDecimal = true;
|
||||
this.absrot.AllowExpressions = false;
|
||||
this.absrot.AllowNegative = true;
|
||||
this.absrot.AllowRelative = true;
|
||||
this.absrot.ButtonStep = 1;
|
||||
|
|
@ -578,135 +578,39 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.absrot.Size = new System.Drawing.Size(82, 24);
|
||||
this.absrot.StepValues = null;
|
||||
this.absrot.TabIndex = 0;
|
||||
this.absrot.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
this.absrot.WhenButtonsClicked += new System.EventHandler(this.absrot_Validated);
|
||||
this.absrot.WhenEnterPressed += new System.EventHandler(this.absrot_Validated);
|
||||
this.absrot.Validated += new System.EventHandler(this.absrot_Validated);
|
||||
this.absrot.WhenButtonsClicked += new System.EventHandler(this.absrot_Validated);
|
||||
this.absrot.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
|
||||
//
|
||||
// ceiltexgroup
|
||||
// pintextures
|
||||
//
|
||||
this.ceiltexgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ceiltexgroup.Controls.Add(this.ceiltexoffset);
|
||||
this.ceiltexgroup.Controls.Add(this.ceiltexrotation);
|
||||
this.ceiltexgroup.Controls.Add(this.ceiltexscale);
|
||||
this.ceiltexgroup.Location = new System.Drawing.Point(3, 401);
|
||||
this.ceiltexgroup.Name = "ceiltexgroup";
|
||||
this.ceiltexgroup.Size = new System.Drawing.Size(243, 58);
|
||||
this.ceiltexgroup.TabIndex = 3;
|
||||
this.ceiltexgroup.TabStop = false;
|
||||
this.ceiltexgroup.Text = " ";
|
||||
this.pintextures.AutoSize = true;
|
||||
this.pintextures.Location = new System.Drawing.Point(9, 19);
|
||||
this.pintextures.Name = "pintextures";
|
||||
this.pintextures.Size = new System.Drawing.Size(81, 17);
|
||||
this.pintextures.TabIndex = 39;
|
||||
this.pintextures.Text = "Pin textures";
|
||||
this.pintextures.UseVisualStyleBackColor = true;
|
||||
this.pintextures.CheckedChanged += new System.EventHandler(this.cbPinTextures_CheckedChanged);
|
||||
//
|
||||
// ceiltexoffset
|
||||
// gbTextures
|
||||
//
|
||||
this.ceiltexoffset.AutoSize = true;
|
||||
this.ceiltexoffset.Location = new System.Drawing.Point(27, 28);
|
||||
this.ceiltexoffset.Name = "ceiltexoffset";
|
||||
this.ceiltexoffset.Size = new System.Drawing.Size(54, 17);
|
||||
this.ceiltexoffset.TabIndex = 0;
|
||||
this.ceiltexoffset.Text = "Offset";
|
||||
this.ceiltexoffset.UseVisualStyleBackColor = true;
|
||||
this.ceiltexoffset.CheckedChanged += new System.EventHandler(this.ceiltexoffset_CheckedChanged);
|
||||
//
|
||||
// ceiltexrotation
|
||||
//
|
||||
this.ceiltexrotation.AutoSize = true;
|
||||
this.ceiltexrotation.Location = new System.Drawing.Point(89, 28);
|
||||
this.ceiltexrotation.Name = "ceiltexrotation";
|
||||
this.ceiltexrotation.Size = new System.Drawing.Size(66, 17);
|
||||
this.ceiltexrotation.TabIndex = 1;
|
||||
this.ceiltexrotation.Text = "Rotation";
|
||||
this.ceiltexrotation.UseVisualStyleBackColor = true;
|
||||
this.ceiltexrotation.CheckedChanged += new System.EventHandler(this.ceiltexrotation_CheckedChanged);
|
||||
//
|
||||
// ceiltexscale
|
||||
//
|
||||
this.ceiltexscale.AutoSize = true;
|
||||
this.ceiltexscale.Location = new System.Drawing.Point(163, 28);
|
||||
this.ceiltexscale.Name = "ceiltexscale";
|
||||
this.ceiltexscale.Size = new System.Drawing.Size(53, 17);
|
||||
this.ceiltexscale.TabIndex = 2;
|
||||
this.ceiltexscale.Text = "Scale";
|
||||
this.ceiltexscale.UseVisualStyleBackColor = true;
|
||||
this.ceiltexscale.CheckedChanged += new System.EventHandler(this.ceiltexscale_CheckedChanged);
|
||||
//
|
||||
// ceiltexall
|
||||
//
|
||||
this.ceiltexall.AutoSize = true;
|
||||
this.ceiltexall.Location = new System.Drawing.Point(14, 400);
|
||||
this.ceiltexall.Name = "ceiltexall";
|
||||
this.ceiltexall.Size = new System.Drawing.Size(154, 17);
|
||||
this.ceiltexall.TabIndex = 0;
|
||||
this.ceiltexall.Text = "Ceiling Textures Transform:";
|
||||
this.ceiltexall.UseVisualStyleBackColor = true;
|
||||
this.ceiltexall.CheckedChanged += new System.EventHandler(this.ceiltexall_CheckedChanged);
|
||||
//
|
||||
// floortexrotation
|
||||
//
|
||||
this.floortexrotation.AutoSize = true;
|
||||
this.floortexrotation.Location = new System.Drawing.Point(89, 28);
|
||||
this.floortexrotation.Name = "floortexrotation";
|
||||
this.floortexrotation.Size = new System.Drawing.Size(66, 17);
|
||||
this.floortexrotation.TabIndex = 1;
|
||||
this.floortexrotation.Text = "Rotation";
|
||||
this.floortexrotation.UseVisualStyleBackColor = true;
|
||||
this.floortexrotation.CheckedChanged += new System.EventHandler(this.floortexrotation_CheckedChanged);
|
||||
//
|
||||
// floortexoffset
|
||||
//
|
||||
this.floortexoffset.AutoSize = true;
|
||||
this.floortexoffset.Location = new System.Drawing.Point(27, 28);
|
||||
this.floortexoffset.Name = "floortexoffset";
|
||||
this.floortexoffset.Size = new System.Drawing.Size(54, 17);
|
||||
this.floortexoffset.TabIndex = 0;
|
||||
this.floortexoffset.Text = "Offset";
|
||||
this.floortexoffset.UseVisualStyleBackColor = true;
|
||||
this.floortexoffset.CheckedChanged += new System.EventHandler(this.floortexoffset_CheckedChanged);
|
||||
//
|
||||
// floortexscale
|
||||
//
|
||||
this.floortexscale.AutoSize = true;
|
||||
this.floortexscale.Location = new System.Drawing.Point(163, 28);
|
||||
this.floortexscale.Name = "floortexscale";
|
||||
this.floortexscale.Size = new System.Drawing.Size(53, 17);
|
||||
this.floortexscale.TabIndex = 2;
|
||||
this.floortexscale.Text = "Scale";
|
||||
this.floortexscale.UseVisualStyleBackColor = true;
|
||||
this.floortexscale.CheckedChanged += new System.EventHandler(this.floortexscale_CheckedChanged);
|
||||
//
|
||||
// floortexall
|
||||
//
|
||||
this.floortexall.AutoSize = true;
|
||||
this.floortexall.Location = new System.Drawing.Point(14, 464);
|
||||
this.floortexall.Name = "floortexall";
|
||||
this.floortexall.Size = new System.Drawing.Size(146, 17);
|
||||
this.floortexall.TabIndex = 1;
|
||||
this.floortexall.Text = "Floor Textures Transform:";
|
||||
this.floortexall.UseVisualStyleBackColor = true;
|
||||
this.floortexall.CheckedChanged += new System.EventHandler(this.floortexall_CheckedChanged);
|
||||
//
|
||||
// floortexgroup
|
||||
//
|
||||
this.floortexgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.floortexgroup.Controls.Add(this.floortexoffset);
|
||||
this.floortexgroup.Controls.Add(this.floortexrotation);
|
||||
this.floortexgroup.Controls.Add(this.floortexscale);
|
||||
this.floortexgroup.Location = new System.Drawing.Point(3, 465);
|
||||
this.floortexgroup.Name = "floortexgroup";
|
||||
this.floortexgroup.Size = new System.Drawing.Size(243, 58);
|
||||
this.floortexgroup.TabIndex = 38;
|
||||
this.floortexgroup.TabStop = false;
|
||||
this.floortexgroup.Text = " ";
|
||||
this.gbTextures.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.gbTextures.Controls.Add(this.pintextures);
|
||||
this.gbTextures.Location = new System.Drawing.Point(3, 400);
|
||||
this.gbTextures.Name = "gbTextures";
|
||||
this.gbTextures.Size = new System.Drawing.Size(243, 47);
|
||||
this.gbTextures.TabIndex = 40;
|
||||
this.gbTextures.TabStop = false;
|
||||
this.gbTextures.Text = "Textures";
|
||||
//
|
||||
// EditSelectionPanel
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.Controls.Add(this.ceiltexall);
|
||||
this.Controls.Add(this.floortexall);
|
||||
this.Controls.Add(this.floortexgroup);
|
||||
this.Controls.Add(this.ceiltexgroup);
|
||||
this.Controls.Add(this.gbTextures);
|
||||
this.Controls.Add(this.groupBox3);
|
||||
this.Controls.Add(this.groupBox2);
|
||||
this.Controls.Add(this.groupBox1);
|
||||
|
|
@ -718,12 +622,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.groupBox2.PerformLayout();
|
||||
this.groupBox3.ResumeLayout(false);
|
||||
this.groupBox3.PerformLayout();
|
||||
this.ceiltexgroup.ResumeLayout(false);
|
||||
this.ceiltexgroup.PerformLayout();
|
||||
this.floortexgroup.ResumeLayout(false);
|
||||
this.floortexgroup.PerformLayout();
|
||||
this.gbTextures.ResumeLayout(false);
|
||||
this.gbTextures.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -762,19 +663,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
private System.Windows.Forms.Button orgposy;
|
||||
private System.Windows.Forms.Button orgsizey;
|
||||
private System.Windows.Forms.Button orgsizex;
|
||||
private System.Windows.Forms.GroupBox ceiltexgroup;
|
||||
private System.Windows.Forms.CheckBox ceiltexrotation;
|
||||
private System.Windows.Forms.CheckBox floortexrotation;
|
||||
private System.Windows.Forms.CheckBox ceiltexoffset;
|
||||
private System.Windows.Forms.CheckBox floortexoffset;
|
||||
private System.Windows.Forms.CheckBox ceiltexscale;
|
||||
private System.Windows.Forms.CheckBox floortexscale;
|
||||
private System.Windows.Forms.CheckBox ceiltexall;
|
||||
private System.Windows.Forms.CheckBox floortexall;
|
||||
private System.Windows.Forms.GroupBox floortexgroup;
|
||||
private System.Windows.Forms.CheckBox preciseposition;
|
||||
private System.Windows.Forms.ToolTip tooltip;
|
||||
private System.Windows.Forms.ComboBox heightmode;
|
||||
private System.Windows.Forms.Label label10;
|
||||
private System.Windows.Forms.CheckBox pintextures;
|
||||
private System.Windows.Forms.GroupBox gbTextures;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,24 +125,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// Disable groups?
|
||||
if(!enable)
|
||||
{
|
||||
ceiltexgroup.Enabled = false;
|
||||
floortexgroup.Enabled = false;
|
||||
ceiltexall.Enabled = false;
|
||||
floortexall.Enabled = false;
|
||||
pintextures.Enabled = false;
|
||||
return;
|
||||
}
|
||||
|
||||
// Update checkboxes
|
||||
preventchanges = true;
|
||||
|
||||
floortexoffset.Checked = mode.TransformFloorOffsets;
|
||||
ceiltexoffset.Checked = mode.TransformCeilingOffsets;
|
||||
floortexrotation.Checked = mode.RotateFloorOffsets;
|
||||
ceiltexrotation.Checked = mode.RotateCeilingOffsets;
|
||||
floortexscale.Checked = mode.ScaleFloorOffsets;
|
||||
ceiltexscale.Checked = mode.ScaleCeilingOffsets;
|
||||
floortexall.Checked = (mode.TransformFloorOffsets && mode.RotateFloorOffsets && mode.ScaleFloorOffsets);
|
||||
ceiltexall.Checked = (mode.TransformCeilingOffsets && mode.RotateCeilingOffsets && mode.ScaleCeilingOffsets);
|
||||
pintextures.Checked = mode.PinTextures;
|
||||
|
||||
preventchanges = false;
|
||||
}
|
||||
|
|
@ -156,34 +146,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
preventchanges = false;
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void UpdateAllFloorTransformsCheckbox()
|
||||
{
|
||||
preventchanges = true;
|
||||
|
||||
int i = 0;
|
||||
if(floortexoffset.Checked) i++;
|
||||
if(floortexrotation.Checked) i++;
|
||||
if(floortexscale.Checked) i++;
|
||||
floortexall.Checked = (i == 3);
|
||||
|
||||
preventchanges = false;
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void UpdateAllCeilingTransformsCheckbox()
|
||||
{
|
||||
preventchanges = true;
|
||||
|
||||
int i = 0;
|
||||
if(ceiltexoffset.Checked) i++;
|
||||
if(ceiltexrotation.Checked) i++;
|
||||
if(ceiltexscale.Checked) i++;
|
||||
ceiltexall.Checked = (i == 3);
|
||||
|
||||
preventchanges = false;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region ================== Events
|
||||
|
|
@ -287,94 +249,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
General.Interface.FocusDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void floortexoffset_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
mode.TransformFloorOffsets = floortexoffset.Checked;
|
||||
UpdateAllFloorTransformsCheckbox();
|
||||
General.Interface.FocusDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void ceiltexoffset_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
mode.TransformCeilingOffsets = ceiltexoffset.Checked;
|
||||
UpdateAllCeilingTransformsCheckbox();
|
||||
General.Interface.FocusDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void floortexrotation_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
mode.RotateFloorOffsets = floortexrotation.Checked;
|
||||
UpdateAllFloorTransformsCheckbox();
|
||||
General.Interface.FocusDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void ceiltexrotation_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
mode.RotateCeilingOffsets = ceiltexrotation.Checked;
|
||||
UpdateAllCeilingTransformsCheckbox();
|
||||
General.Interface.FocusDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void floortexscale_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
mode.ScaleFloorOffsets = floortexscale.Checked;
|
||||
UpdateAllFloorTransformsCheckbox();
|
||||
General.Interface.FocusDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void ceiltexscale_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
mode.ScaleCeilingOffsets = ceiltexscale.Checked;
|
||||
UpdateAllCeilingTransformsCheckbox();
|
||||
General.Interface.FocusDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void floortexall_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
preventchanges = true;
|
||||
|
||||
floortexoffset.Checked = floortexall.Checked;
|
||||
floortexrotation.Checked = floortexall.Checked;
|
||||
floortexscale.Checked = floortexall.Checked;
|
||||
|
||||
mode.TransformFloorOffsets = floortexoffset.Checked;
|
||||
mode.RotateFloorOffsets = floortexrotation.Checked;
|
||||
mode.ScaleFloorOffsets = floortexscale.Checked;
|
||||
|
||||
preventchanges = false;
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void ceiltexall_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(preventchanges) return;
|
||||
preventchanges = true;
|
||||
|
||||
ceiltexoffset.Checked = ceiltexall.Checked;
|
||||
ceiltexrotation.Checked = ceiltexall.Checked;
|
||||
ceiltexscale.Checked = ceiltexall.Checked;
|
||||
|
||||
mode.TransformCeilingOffsets = ceiltexoffset.Checked;
|
||||
mode.RotateCeilingOffsets = ceiltexrotation.Checked;
|
||||
mode.ScaleCeilingOffsets = ceiltexscale.Checked;
|
||||
|
||||
preventchanges = false;
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void preciseposition_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
|
@ -389,7 +263,17 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
if(preventchanges || heightmode.SelectedIndex == -1) return;
|
||||
mode.SectorHeightAdjustMode = (EditSelectionMode.HeightAdjustMode)heightmode.SelectedIndex;
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
private void cbPinTextures_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (preventchanges) return;
|
||||
preventchanges = true;
|
||||
|
||||
mode.PinTextures = pintextures.Checked;
|
||||
|
||||
preventchanges = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,12 +112,12 @@
|
|||
<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>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="label10.ToolTip" xml:space="preserve">
|
||||
|
|
@ -130,7 +130,7 @@ by sectors with the same target height when the mode
|
|||
was enabled, and are surrounded by sectors with the
|
||||
same target height when the mode is applied.</value>
|
||||
</data>
|
||||
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
</root>
|
||||
Loading…
Reference in a new issue