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

Sector, Linedef, Thing Edit forms: when several map elements are selected, you can set a tag range by entering "++N" or "--N" as a tag.

Browse source
This commit is contained in:
MaxED 2014-08-05 11:03:55 +00:00
parent 566ff2855e
commit bed613694d
9 changed files with 88 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Help/gzdb/features/all_modes/incremental_tags1.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 95 KiB

BIN
Help/gzdb/features/all_modes/incremental_tags2.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 36 KiB

96
Help/gzdb/features/all_modes/tag_support.html
View file

@ -1,53 +1,67 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>GZDoom Builder features</title>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
<title>Enhanced Tag Support</title>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
<style type="text/css">
<!--
.style1 {
color: #990000;
font-weight: bold;
}
-->
</style>
</head>
<body>
<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="Template">
</object>
<div id="gz_title"><h1>Enhanced Tag support</h1>
<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="Template">
</object>
<div id="gz_title">
<h1>Enhanced Tag Support</h1>
</div>
<div id="contents">
<h2><strong>New Tag vs. Unused Tag:</strong></h2>
<p><img src="tags_newlabel.jpg" /><br />
<div id="contents">
<h2><strong>New Tag vs. Unused Tag:</strong></h2>
<p><img src="tags_newlabel.jpg" /><br />
Two methods can be used to assign a new tag to a map element.<br />
Pressing &quot;<strong>New</strong>&quot; button will find a tag number, which is not used by any map element or any action argument, which expects a tag (classic Doom Builder 2 behaviour).<br />
Pressing "<strong>Unused</strong>" button will find a tag number, which is not used by any map element of current type (e.g. not used by any linedef in the map, if the button is pressed in Edit Linedefs form).</p>
<h2><strong>Tag support:</strong></h2>
<table width="100%" border="0" cellspacing="3" cellpadding="3">
<tr>
<td valign="top">If a tag is already used in a map, you can pick it from the list:
<h2><strong>Setting Tag Range:</strong></h2>
<p>When several map elements are selected, you can set a tag range by entering "<strong>++N</strong>" or "<strong>--N</strong>" as a tag.<br />
<strong>Example:</strong> to tag selected sectors starting from 10 and going up, enter "<strong>++10</strong>" as the tag and press <strong>OK</strong> button:<br />
<img src="incremental_tags1.jpg" /><br />
<br />
The result:<br />
<img src="incremental_tags2.jpg" /><br />
<br />
<span class="style1">Warning:</span> setting tag ranges this way doesn't check if tags being set are already used in the map. If you need that functionality, set tag ranges using <strong>Tag Range</strong> plugin.</p>
<h2><strong>Enhanced Tag Support:</strong></h2>
<table width="100%" border="0" cellspacing="3" cellpadding="3">
<tr>
<td valign="top">If a tag is already used in a map, you can pick it from the list:
</p></td>
<td><img src="tags_dropdown.jpg" alt="" width="398" height="400" /></td>
</tr>
<tr>
<td valign="top"><p>This also works for action arguments. Only relevant tags will be shown in this case (e.g. if an argument is a sector tag, only sector tags will be shown in the drop down).<br />
<strong>If you want, you can type the tag number manually.</strong></p></td>
<td><img src="tags_action_arg.jpg" alt="" width="400" height="329" /></td>
</tr>
</table>
<h2><strong>Tag Labels</strong>:</h2>
<p>You can add labels to tags. This can be done in several ways:<br />
1. If you type any text in the tag selector, then an unused tag number will be found, and your text will be assigned to it as a label (this won't work for action arguments).
<p><img src="tags_newlabel.jpg" />
<p>2. You can use the <strong>Tag statistics</strong> form to view all tags used in a map, and view and edit labels, if any are assigned to them:
<p><img src="tags_view1.jpg" alt="" width="264" height="399" /><br /><br /><img src="tags_table.jpg" alt="" />
<p>Double-click on a value in the &quot;Label&quot; column to edit the tag label.<br />
Double-click on Sectors, Linedefs or Things cells to select map elements, right click to open their properties.<br />
All columns are sortable.
<p>Tag labels support autocompletion. Start typing a tag label to show the autocompletion list:
<p><img src="tags_autocomplete.jpg" alt="" width="356" height="400" />
<p>When sort mode is set to &quot;By Tag&quot;, then tag labels will be shown in Tag Explorer:
<p><img src="tags_tagexplorer.jpg" alt="" width="285" height="311" />
<td><img src="tags_dropdown.jpg" alt="" width="398" height="400" /></td>
</tr>
<tr>
<td valign="top"><p>This also works for action arguments. Only relevant tags will be shown in this case (e.g. if an argument is a sector tag, only sector tags will be shown in the drop down).<br />
<strong>If you want, you can type the tag number manually.</strong></p></td>
<td><img src="tags_action_arg.jpg" alt="" width="400" height="329" /></td>
</tr>
</table>
<h2><strong>Tag Labels</strong>:</h2>
<p>You can add labels to tags. This can be done in several ways:<br />
1. If you type any text in the tag selector, then an unused tag number will be found, and your text will be assigned to it as a label (this won't work for action arguments).
<p><img src="tags_newlabel.jpg" />
<p>2. You can use the <strong>Tag statistics</strong> form to view all tags used in a map, and view and edit labels, if any are assigned to them:
<p><img src="tags_view1.jpg" alt="" width="264" height="399" /><br />
<br />
<img src="tags_table.jpg" alt="" />
<p>Double-click on a value in the &quot;<strong>Label</strong>&quot; column to edit the tag label.<br />
Double-click on Sectors, Linedefs or Things cells to select map elements, right click to open their properties.<br />
All columns are sortable.
<p>Tag labels support autocompletion. Start typing a tag label to show the autocompletion list:
<p><img src="tags_autocomplete.jpg" alt="" width="356" height="400" />
<p>When sort mode is set to &quot;By Tag&quot;, then tag labels will be shown in Tag Explorer:
<p><img src="tags_tagexplorer.jpg" alt="" width="285" height="311" />
</div>
</body>

27
Source/Core/GZBuilder/Controls/TagSelector.cs
View file

@ -29,6 +29,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
private bool valid;
private int tag;
private UniversalType elementType;
private int offsetmode; //0 - none, 1 - positive (++), -1 - negative (--)
public TagSelector() {
InitializeComponent();
@ -92,12 +93,17 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
public void ClearTag() {
cbTagPicker.SelectedIndex = -1;
cbTagPicker.Text = string.Empty;
offsetmode = 0;
valid = false;
}
public int GetTag(int original) {
return GetTag(original, 0);
}
public int GetTag(int original, int offset) {
if(!valid) return original;
return tag;
return tag + offset * offsetmode;
}
public void ValidateTag() {
@ -110,10 +116,26 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
//check text
string text = cbTagPicker.Text.Trim().ToLowerInvariant();
if(string.IsNullOrEmpty(text)) {
offsetmode = 0;
valid = false;
return;
}
//incremental?
if(text.Length > 2){
if(text.StartsWith("++")) {
offsetmode = 1;
text = text.Substring(2, text.Length - 2);
} else if (text.StartsWith("--")) {
offsetmode = -1;
text = text.Substring(2, text.Length - 2);
} else {
offsetmode = 0;
}
} else {
offsetmode = 0;
}
if(!int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out tag)) {
//maybe it's user-pasted label?
foreach(TagInfo info in infos) {
@ -131,9 +153,6 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
General.Map.Options.TagLabels[tag] = cbTagPicker.Text.Trim();
else
General.Map.Options.TagLabels.Add(tag, cbTagPicker.Text.Trim());
valid = true;
return;
}
valid = true;

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

@ -705,6 +705,7 @@ namespace CodeImp.DoomBuilder.Windows
int lockNum = lockNumber.GetResult(0);
// Go for all the lines
int tagoffset = 0; //mxd
foreach(Linedef l in lines)
{
// Apply chosen activation flag
@ -720,7 +721,7 @@ namespace CodeImp.DoomBuilder.Windows
}
// Action/tags
l.Tag = tagSelector.GetTag(l.Tag); //mxd
l.Tag = General.Clamp(tagSelector.GetTag(l.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
if(!action.Empty) {
l.Action = action.Value;

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

@ -224,12 +224,13 @@ namespace CodeImp.DoomBuilder.Windows
}
// Go for all sectors
int tagoffset = 0; //mxd
foreach(Sector s in sectors) {
// Effects
if(!effect.Empty) s.Effect = effect.Value;
// Action
s.Tag = tagSelector.GetTag(s.Tag); //mxd
s.Tag = General.Clamp(tagSelector.GetTag(s.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
}
// Done

3
Source/Core/Windows/SectorEditFormUDMF.cs
View file

@ -536,6 +536,7 @@ namespace CodeImp.DoomBuilder.Windows
}
// Go for all sectors
int tagoffset = 0; //mxd
foreach(Sector s in sectors) {
// Apply all flags
foreach(CheckBox c in flags.Checkboxes) {
@ -548,7 +549,7 @@ namespace CodeImp.DoomBuilder.Windows
s.Brightness = General.Clamp(brightness.GetResult(s.Brightness), General.Map.FormatInterface.MinBrightness, General.Map.FormatInterface.MaxBrightness);
// Action
s.Tag = tagSelector.GetTag(s.Tag); //mxd
s.Tag = General.Clamp(tagSelector.GetTag(s.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
//Fields
fieldslist.Apply(s.Fields);

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

@ -386,6 +386,7 @@ namespace CodeImp.DoomBuilder.Windows
bool hasAcs = !action.Empty && Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1; //mxd
// Go for all the things
int tagoffset = 0; //mxd
foreach(Thing t in things)
{
// Coordination
@ -404,7 +405,7 @@ namespace CodeImp.DoomBuilder.Windows
}
// Action/tags
t.Tag = tagSelector.GetTag(t.Tag); //mxd
t.Tag = General.Clamp(tagSelector.GetTag(t.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
if (!action.Empty) {
t.Action = action.Value;

3
Source/Core/Windows/ThingEditFormUDMF.cs
View file

@ -534,6 +534,7 @@ namespace CodeImp.DoomBuilder.Windows
}
// Go for all the things
int tagoffset = 0; //mxd
foreach(Thing t in things) {
// Coordination
//mxd. Check position
@ -550,7 +551,7 @@ namespace CodeImp.DoomBuilder.Windows
}
// Action/tags
t.Tag = tagSelector.GetTag(t.Tag); //mxd
t.Tag = General.Clamp(tagSelector.GetTag(t.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
if(!action.Empty) {
t.Action = action.Value;