R26_dev8 - PopZone display, Project manifest XML

This commit is contained in:
dexyfex 2017-09-22 17:31:02 +10:00
parent a8243c3e0e
commit 2b48336e47
7 changed files with 450 additions and 136 deletions

View File

@ -6634,8 +6634,14 @@ zRotation";
CAnchorProps = 2170383875, CAnchorProps = 2170383875,
CBlockDesc = 3072355914, CBlockDesc = 3072355914,
CClassNameOfItemType = 440716365, //array type for (PSO) MAP fields CClassNameOfItemType = 440716365, //array type for (PSO) MAP fields
zones = 2319609287,
spName = 4254542050,
//from rubidium
mpName = 2031203854,
zoneName = 257000,
//dilapidated list - from dav90 hash collider //dilapidated list - from dav90 hash collider

367
ProjectForm.Designer.cs generated
View File

@ -28,17 +28,23 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ProjectTreeView = new System.Windows.Forms.TreeView(); this.ProjectTreeView = new System.Windows.Forms.TreeView();
this.MainTabControl = new System.Windows.Forms.TabControl(); this.MainTabControl = new System.Windows.Forms.TabControl();
this.ProjectTabPage = new System.Windows.Forms.TabPage(); this.ProjectTabPage = new System.Windows.Forms.TabPage();
this.ProjectPanel = new System.Windows.Forms.Panel(); this.ProjectPanel = new System.Windows.Forms.Panel();
this.ProjectTabControl = new System.Windows.Forms.TabControl();
this.ProjectGeneralTabPage = new System.Windows.Forms.TabPage();
this.ProjectNameTextBox = new System.Windows.Forms.TextBox();
this.ProjectHideMapCheckBox = new System.Windows.Forms.CheckBox(); this.ProjectHideMapCheckBox = new System.Windows.Forms.CheckBox();
this.ProjectVersionLabel = new System.Windows.Forms.Label();
this.ProjectShowEntitiesCheckBox = new System.Windows.Forms.CheckBox(); this.ProjectShowEntitiesCheckBox = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.ProjectVersionLabel = new System.Windows.Forms.Label(); this.ProjectManifestTabPage = new System.Windows.Forms.TabPage();
this.ProjectNameTextBox = new System.Windows.Forms.TextBox(); this.ProjectManifestGenerateButton = new System.Windows.Forms.Button();
this.ProjectManifestTextBox = new FastColoredTextBoxNS.FastColoredTextBox();
this.YmapTabPage = new System.Windows.Forms.TabPage(); this.YmapTabPage = new System.Windows.Forms.TabPage();
this.YmapTabControl = new System.Windows.Forms.TabControl(); this.YmapTabControl = new System.Windows.Forms.TabControl();
this.YmapYmapTabPage = new System.Windows.Forms.TabPage(); this.YmapYmapTabPage = new System.Windows.Forms.TabPage();
@ -434,6 +440,10 @@
this.ScenarioEntityTabPage = new System.Windows.Forms.TabPage(); this.ScenarioEntityTabPage = new System.Windows.Forms.TabPage();
this.ScenarioEntityDeleteButton = new System.Windows.Forms.Button(); this.ScenarioEntityDeleteButton = new System.Windows.Forms.Button();
this.ScenarioEntityPanel = new System.Windows.Forms.Panel(); this.ScenarioEntityPanel = new System.Windows.Forms.Panel();
this.label160 = new System.Windows.Forms.Label();
this.ScenarioEntityAddPointButton = new System.Windows.Forms.Button();
this.label161 = new System.Windows.Forms.Label();
this.ScenarioEntityPointsListBox = new System.Windows.Forms.ListBox();
this.ScenarioEntityInfoLabel = new System.Windows.Forms.Label(); this.ScenarioEntityInfoLabel = new System.Windows.Forms.Label();
this.label114 = new System.Windows.Forms.Label(); this.label114 = new System.Windows.Forms.Label();
this.ScenarioEntityUnk2UpDown = new System.Windows.Forms.NumericUpDown(); this.ScenarioEntityUnk2UpDown = new System.Windows.Forms.NumericUpDown();
@ -538,6 +548,10 @@
this.ScenarioClusterAddToProjectButton = new System.Windows.Forms.Button(); this.ScenarioClusterAddToProjectButton = new System.Windows.Forms.Button();
this.ScenarioClusterCheckBox = new System.Windows.Forms.CheckBox(); this.ScenarioClusterCheckBox = new System.Windows.Forms.CheckBox();
this.ScenarioClusterPanel = new System.Windows.Forms.Panel(); this.ScenarioClusterPanel = new System.Windows.Forms.Panel();
this.label159 = new System.Windows.Forms.Label();
this.ScenarioClusterAddPointButton = new System.Windows.Forms.Button();
this.label158 = new System.Windows.Forms.Label();
this.ScenarioClusterPointsListBox = new System.Windows.Forms.ListBox();
this.ScenarioClusterRadiusTextBox = new System.Windows.Forms.TextBox(); this.ScenarioClusterRadiusTextBox = new System.Windows.Forms.TextBox();
this.label157 = new System.Windows.Forms.Label(); this.label157 = new System.Windows.Forms.Label();
this.ScenarioClusterUnk2CheckBox = new System.Windows.Forms.CheckBox(); this.ScenarioClusterUnk2CheckBox = new System.Windows.Forms.CheckBox();
@ -647,16 +661,11 @@
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.ScenarioAddToProjectMenu = new System.Windows.Forms.ToolStripMenuItem(); this.ScenarioAddToProjectMenu = new System.Windows.Forms.ToolStripMenuItem();
this.ScenarioRemoveFromProjectMenu = new System.Windows.Forms.ToolStripMenuItem(); this.ScenarioRemoveFromProjectMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsHideGTAVMapMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SaveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.SaveFileDialog = new System.Windows.Forms.SaveFileDialog();
this.OpenFileDialog = new System.Windows.Forms.OpenFileDialog(); this.OpenFileDialog = new System.Windows.Forms.OpenFileDialog();
this.ScenarioClusterPointsListBox = new System.Windows.Forms.ListBox(); this.label162 = new System.Windows.Forms.Label();
this.label158 = new System.Windows.Forms.Label();
this.ScenarioClusterAddPointButton = new System.Windows.Forms.Button();
this.label159 = new System.Windows.Forms.Label();
this.label160 = new System.Windows.Forms.Label();
this.ScenarioEntityAddPointButton = new System.Windows.Forms.Button();
this.label161 = new System.Windows.Forms.Label();
this.ScenarioEntityPointsListBox = new System.Windows.Forms.ListBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
@ -664,6 +673,10 @@
this.MainTabControl.SuspendLayout(); this.MainTabControl.SuspendLayout();
this.ProjectTabPage.SuspendLayout(); this.ProjectTabPage.SuspendLayout();
this.ProjectPanel.SuspendLayout(); this.ProjectPanel.SuspendLayout();
this.ProjectTabControl.SuspendLayout();
this.ProjectGeneralTabPage.SuspendLayout();
this.ProjectManifestTabPage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ProjectManifestTextBox)).BeginInit();
this.YmapTabPage.SuspendLayout(); this.YmapTabPage.SuspendLayout();
this.YmapTabControl.SuspendLayout(); this.YmapTabControl.SuspendLayout();
this.YmapYmapTabPage.SuspendLayout(); this.YmapYmapTabPage.SuspendLayout();
@ -866,21 +879,55 @@
this.ProjectPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.ProjectPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.ProjectPanel.Controls.Add(this.ProjectHideMapCheckBox); this.ProjectPanel.Controls.Add(this.ProjectTabControl);
this.ProjectPanel.Controls.Add(this.ProjectShowEntitiesCheckBox);
this.ProjectPanel.Controls.Add(this.label1);
this.ProjectPanel.Controls.Add(this.ProjectVersionLabel);
this.ProjectPanel.Controls.Add(this.ProjectNameTextBox);
this.ProjectPanel.Enabled = false; this.ProjectPanel.Enabled = false;
this.ProjectPanel.Location = new System.Drawing.Point(0, 0); this.ProjectPanel.Location = new System.Drawing.Point(0, 0);
this.ProjectPanel.Name = "ProjectPanel"; this.ProjectPanel.Name = "ProjectPanel";
this.ProjectPanel.Size = new System.Drawing.Size(521, 472); this.ProjectPanel.Size = new System.Drawing.Size(521, 472);
this.ProjectPanel.TabIndex = 3; this.ProjectPanel.TabIndex = 3;
// //
// ProjectTabControl
//
this.ProjectTabControl.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.ProjectTabControl.Controls.Add(this.ProjectGeneralTabPage);
this.ProjectTabControl.Controls.Add(this.ProjectManifestTabPage);
this.ProjectTabControl.Location = new System.Drawing.Point(0, 3);
this.ProjectTabControl.Name = "ProjectTabControl";
this.ProjectTabControl.SelectedIndex = 0;
this.ProjectTabControl.Size = new System.Drawing.Size(518, 469);
this.ProjectTabControl.TabIndex = 26;
//
// ProjectGeneralTabPage
//
this.ProjectGeneralTabPage.Controls.Add(this.ProjectNameTextBox);
this.ProjectGeneralTabPage.Controls.Add(this.ProjectHideMapCheckBox);
this.ProjectGeneralTabPage.Controls.Add(this.ProjectVersionLabel);
this.ProjectGeneralTabPage.Controls.Add(this.ProjectShowEntitiesCheckBox);
this.ProjectGeneralTabPage.Controls.Add(this.label1);
this.ProjectGeneralTabPage.Location = new System.Drawing.Point(4, 22);
this.ProjectGeneralTabPage.Name = "ProjectGeneralTabPage";
this.ProjectGeneralTabPage.Padding = new System.Windows.Forms.Padding(3);
this.ProjectGeneralTabPage.Size = new System.Drawing.Size(510, 443);
this.ProjectGeneralTabPage.TabIndex = 0;
this.ProjectGeneralTabPage.Text = "General";
this.ProjectGeneralTabPage.UseVisualStyleBackColor = true;
//
// ProjectNameTextBox
//
this.ProjectNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ProjectNameTextBox.Location = new System.Drawing.Point(82, 16);
this.ProjectNameTextBox.Name = "ProjectNameTextBox";
this.ProjectNameTextBox.Size = new System.Drawing.Size(265, 20);
this.ProjectNameTextBox.TabIndex = 1;
this.ProjectNameTextBox.TextChanged += new System.EventHandler(this.ProjectNameTextBox_TextChanged);
//
// ProjectHideMapCheckBox // ProjectHideMapCheckBox
// //
this.ProjectHideMapCheckBox.AutoSize = true; this.ProjectHideMapCheckBox.AutoSize = true;
this.ProjectHideMapCheckBox.Location = new System.Drawing.Point(69, 116); this.ProjectHideMapCheckBox.Location = new System.Drawing.Point(82, 123);
this.ProjectHideMapCheckBox.Name = "ProjectHideMapCheckBox"; this.ProjectHideMapCheckBox.Name = "ProjectHideMapCheckBox";
this.ProjectHideMapCheckBox.Size = new System.Drawing.Size(103, 17); this.ProjectHideMapCheckBox.Size = new System.Drawing.Size(103, 17);
this.ProjectHideMapCheckBox.TabIndex = 25; this.ProjectHideMapCheckBox.TabIndex = 25;
@ -888,12 +935,22 @@
this.ProjectHideMapCheckBox.UseVisualStyleBackColor = true; this.ProjectHideMapCheckBox.UseVisualStyleBackColor = true;
this.ProjectHideMapCheckBox.CheckedChanged += new System.EventHandler(this.ProjectHideMapCheckBox_CheckedChanged); this.ProjectHideMapCheckBox.CheckedChanged += new System.EventHandler(this.ProjectHideMapCheckBox_CheckedChanged);
// //
// ProjectVersionLabel
//
this.ProjectVersionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.ProjectVersionLabel.AutoSize = true;
this.ProjectVersionLabel.Location = new System.Drawing.Point(375, 19);
this.ProjectVersionLabel.Name = "ProjectVersionLabel";
this.ProjectVersionLabel.Size = new System.Drawing.Size(51, 13);
this.ProjectVersionLabel.TabIndex = 2;
this.ProjectVersionLabel.Text = "Version: -";
//
// ProjectShowEntitiesCheckBox // ProjectShowEntitiesCheckBox
// //
this.ProjectShowEntitiesCheckBox.AutoSize = true; this.ProjectShowEntitiesCheckBox.AutoSize = true;
this.ProjectShowEntitiesCheckBox.Checked = true; this.ProjectShowEntitiesCheckBox.Checked = true;
this.ProjectShowEntitiesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; this.ProjectShowEntitiesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
this.ProjectShowEntitiesCheckBox.Location = new System.Drawing.Point(69, 93); this.ProjectShowEntitiesCheckBox.Location = new System.Drawing.Point(82, 100);
this.ProjectShowEntitiesCheckBox.Name = "ProjectShowEntitiesCheckBox"; this.ProjectShowEntitiesCheckBox.Name = "ProjectShowEntitiesCheckBox";
this.ProjectShowEntitiesCheckBox.Size = new System.Drawing.Size(156, 17); this.ProjectShowEntitiesCheckBox.Size = new System.Drawing.Size(156, 17);
this.ProjectShowEntitiesCheckBox.TabIndex = 24; this.ProjectShowEntitiesCheckBox.TabIndex = 24;
@ -904,31 +961,73 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 12); this.label1.Location = new System.Drawing.Point(19, 19);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(38, 13); this.label1.Size = new System.Drawing.Size(38, 13);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "Name:"; this.label1.Text = "Name:";
// //
// ProjectVersionLabel // ProjectManifestTabPage
// //
this.ProjectVersionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.ProjectManifestTabPage.Controls.Add(this.label162);
this.ProjectVersionLabel.AutoSize = true; this.ProjectManifestTabPage.Controls.Add(this.ProjectManifestGenerateButton);
this.ProjectVersionLabel.Location = new System.Drawing.Point(359, 12); this.ProjectManifestTabPage.Controls.Add(this.ProjectManifestTextBox);
this.ProjectVersionLabel.Name = "ProjectVersionLabel"; this.ProjectManifestTabPage.Location = new System.Drawing.Point(4, 22);
this.ProjectVersionLabel.Size = new System.Drawing.Size(51, 13); this.ProjectManifestTabPage.Name = "ProjectManifestTabPage";
this.ProjectVersionLabel.TabIndex = 2; this.ProjectManifestTabPage.Padding = new System.Windows.Forms.Padding(3);
this.ProjectVersionLabel.Text = "Version: -"; this.ProjectManifestTabPage.Size = new System.Drawing.Size(510, 443);
this.ProjectManifestTabPage.TabIndex = 1;
this.ProjectManifestTabPage.Text = "Manifest";
this.ProjectManifestTabPage.UseVisualStyleBackColor = true;
// //
// ProjectNameTextBox // ProjectManifestGenerateButton
// //
this.ProjectNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.ProjectManifestGenerateButton.Location = new System.Drawing.Point(6, 6);
this.ProjectManifestGenerateButton.Name = "ProjectManifestGenerateButton";
this.ProjectManifestGenerateButton.Size = new System.Drawing.Size(75, 23);
this.ProjectManifestGenerateButton.TabIndex = 1;
this.ProjectManifestGenerateButton.Text = "Generate";
this.ProjectManifestGenerateButton.UseVisualStyleBackColor = true;
this.ProjectManifestGenerateButton.Click += new System.EventHandler(this.ProjectManifestGenerateButton_Click);
//
// ProjectManifestTextBox
//
this.ProjectManifestTextBox.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))); | System.Windows.Forms.AnchorStyles.Right)));
this.ProjectNameTextBox.Location = new System.Drawing.Point(69, 9); this.ProjectManifestTextBox.AutoCompleteBracketsList = new char[] {
this.ProjectNameTextBox.Name = "ProjectNameTextBox"; '(',
this.ProjectNameTextBox.Size = new System.Drawing.Size(262, 20); ')',
this.ProjectNameTextBox.TabIndex = 1; '{',
this.ProjectNameTextBox.TextChanged += new System.EventHandler(this.ProjectNameTextBox_TextChanged); '}',
'[',
']',
'\"',
'\"',
'\'',
'\''};
this.ProjectManifestTextBox.AutoIndentCharsPatterns = "";
this.ProjectManifestTextBox.AutoScrollMinSize = new System.Drawing.Size(27, 14);
this.ProjectManifestTextBox.BackBrush = null;
this.ProjectManifestTextBox.CharHeight = 14;
this.ProjectManifestTextBox.CharWidth = 8;
this.ProjectManifestTextBox.CommentPrefix = null;
this.ProjectManifestTextBox.Cursor = System.Windows.Forms.Cursors.IBeam;
this.ProjectManifestTextBox.DisabledColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
this.ProjectManifestTextBox.IsReplaceMode = false;
this.ProjectManifestTextBox.Language = FastColoredTextBoxNS.Language.XML;
this.ProjectManifestTextBox.LeftBracket = '<';
this.ProjectManifestTextBox.LeftBracket2 = '(';
this.ProjectManifestTextBox.Location = new System.Drawing.Point(3, 35);
this.ProjectManifestTextBox.Name = "ProjectManifestTextBox";
this.ProjectManifestTextBox.Paddings = new System.Windows.Forms.Padding(0);
this.ProjectManifestTextBox.RightBracket = '>';
this.ProjectManifestTextBox.RightBracket2 = ')';
this.ProjectManifestTextBox.SelectionColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
this.ProjectManifestTextBox.ServiceColors = ((FastColoredTextBoxNS.ServiceColors)(resources.GetObject("ProjectManifestTextBox.ServiceColors")));
this.ProjectManifestTextBox.Size = new System.Drawing.Size(504, 408);
this.ProjectManifestTextBox.TabIndex = 0;
this.ProjectManifestTextBox.Zoom = 100;
// //
// YmapTabPage // YmapTabPage
// //
@ -5461,6 +5560,47 @@
this.ScenarioEntityPanel.Size = new System.Drawing.Size(510, 414); this.ScenarioEntityPanel.Size = new System.Drawing.Size(510, 414);
this.ScenarioEntityPanel.TabIndex = 8; this.ScenarioEntityPanel.TabIndex = 8;
// //
// label160
//
this.label160.AutoSize = true;
this.label160.Location = new System.Drawing.Point(332, 160);
this.label160.Name = "label160";
this.label160.Size = new System.Drawing.Size(141, 13);
this.label160.TabIndex = 20;
this.label160.Text = "(Double-click to select point)";
//
// ScenarioEntityAddPointButton
//
this.ScenarioEntityAddPointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ScenarioEntityAddPointButton.Location = new System.Drawing.Point(91, 347);
this.ScenarioEntityAddPointButton.Name = "ScenarioEntityAddPointButton";
this.ScenarioEntityAddPointButton.Size = new System.Drawing.Size(90, 23);
this.ScenarioEntityAddPointButton.TabIndex = 19;
this.ScenarioEntityAddPointButton.Text = "Add Point";
this.ScenarioEntityAddPointButton.UseVisualStyleBackColor = true;
this.ScenarioEntityAddPointButton.Click += new System.EventHandler(this.ScenarioEntityAddPointButton_Click);
//
// label161
//
this.label161.AutoSize = true;
this.label161.Location = new System.Drawing.Point(42, 160);
this.label161.Name = "label161";
this.label161.Size = new System.Drawing.Size(39, 13);
this.label161.TabIndex = 18;
this.label161.Text = "Points:";
//
// ScenarioEntityPointsListBox
//
this.ScenarioEntityPointsListBox.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.ScenarioEntityPointsListBox.FormattingEnabled = true;
this.ScenarioEntityPointsListBox.Location = new System.Drawing.Point(91, 158);
this.ScenarioEntityPointsListBox.Name = "ScenarioEntityPointsListBox";
this.ScenarioEntityPointsListBox.Size = new System.Drawing.Size(235, 173);
this.ScenarioEntityPointsListBox.TabIndex = 17;
this.ScenarioEntityPointsListBox.DoubleClick += new System.EventHandler(this.ScenarioEntityPointsListBox_DoubleClick);
//
// ScenarioEntityInfoLabel // ScenarioEntityInfoLabel
// //
this.ScenarioEntityInfoLabel.AutoSize = true; this.ScenarioEntityInfoLabel.AutoSize = true;
@ -6668,6 +6808,47 @@
this.ScenarioClusterPanel.Size = new System.Drawing.Size(510, 415); this.ScenarioClusterPanel.Size = new System.Drawing.Size(510, 415);
this.ScenarioClusterPanel.TabIndex = 4; this.ScenarioClusterPanel.TabIndex = 4;
// //
// label159
//
this.label159.AutoSize = true;
this.label159.Location = new System.Drawing.Point(341, 150);
this.label159.Name = "label159";
this.label159.Size = new System.Drawing.Size(141, 13);
this.label159.TabIndex = 16;
this.label159.Text = "(Double-click to select point)";
//
// ScenarioClusterAddPointButton
//
this.ScenarioClusterAddPointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ScenarioClusterAddPointButton.Location = new System.Drawing.Point(100, 337);
this.ScenarioClusterAddPointButton.Name = "ScenarioClusterAddPointButton";
this.ScenarioClusterAddPointButton.Size = new System.Drawing.Size(90, 23);
this.ScenarioClusterAddPointButton.TabIndex = 15;
this.ScenarioClusterAddPointButton.Text = "Add Point";
this.ScenarioClusterAddPointButton.UseVisualStyleBackColor = true;
this.ScenarioClusterAddPointButton.Click += new System.EventHandler(this.ScenarioClusterAddPointButton_Click);
//
// label158
//
this.label158.AutoSize = true;
this.label158.Location = new System.Drawing.Point(51, 150);
this.label158.Name = "label158";
this.label158.Size = new System.Drawing.Size(39, 13);
this.label158.TabIndex = 14;
this.label158.Text = "Points:";
//
// ScenarioClusterPointsListBox
//
this.ScenarioClusterPointsListBox.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.ScenarioClusterPointsListBox.FormattingEnabled = true;
this.ScenarioClusterPointsListBox.Location = new System.Drawing.Point(100, 148);
this.ScenarioClusterPointsListBox.Name = "ScenarioClusterPointsListBox";
this.ScenarioClusterPointsListBox.Size = new System.Drawing.Size(235, 173);
this.ScenarioClusterPointsListBox.TabIndex = 13;
this.ScenarioClusterPointsListBox.DoubleClick += new System.EventHandler(this.ScenarioClusterPointsListBox_DoubleClick);
//
// ScenarioClusterRadiusTextBox // ScenarioClusterRadiusTextBox
// //
this.ScenarioClusterRadiusTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.ScenarioClusterRadiusTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@ -7224,7 +7405,8 @@
this.YndMenu, this.YndMenu,
this.YnvMenu, this.YnvMenu,
this.TrainsMenu, this.TrainsMenu,
this.ScenarioMenu}); this.ScenarioMenu,
this.OptionsMenu});
this.TopMenuStrip.Location = new System.Drawing.Point(0, 0); this.TopMenuStrip.Location = new System.Drawing.Point(0, 0);
this.TopMenuStrip.Name = "TopMenuStrip"; this.TopMenuStrip.Name = "TopMenuStrip";
this.TopMenuStrip.Size = new System.Drawing.Size(776, 24); this.TopMenuStrip.Size = new System.Drawing.Size(776, 24);
@ -7727,6 +7909,21 @@
this.ScenarioRemoveFromProjectMenu.Text = "Remove from Project"; this.ScenarioRemoveFromProjectMenu.Text = "Remove from Project";
this.ScenarioRemoveFromProjectMenu.Click += new System.EventHandler(this.ScenarioRemoveFromProjectMenu_Click); this.ScenarioRemoveFromProjectMenu.Click += new System.EventHandler(this.ScenarioRemoveFromProjectMenu_Click);
// //
// OptionsMenu
//
this.OptionsMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.OptionsHideGTAVMapMenu});
this.OptionsMenu.Name = "OptionsMenu";
this.OptionsMenu.Size = new System.Drawing.Size(61, 20);
this.OptionsMenu.Text = "Options";
//
// OptionsHideGTAVMapMenu
//
this.OptionsHideGTAVMapMenu.Name = "OptionsHideGTAVMapMenu";
this.OptionsHideGTAVMapMenu.Size = new System.Drawing.Size(157, 22);
this.OptionsHideGTAVMapMenu.Text = "Hide GTAV map";
this.OptionsHideGTAVMapMenu.Click += new System.EventHandler(this.OptionsHideGTAVMapMenu_Click);
//
// SaveFileDialog // SaveFileDialog
// //
this.SaveFileDialog.Filter = "CodeWalker Projects|*.cwproj"; this.SaveFileDialog.Filter = "CodeWalker Projects|*.cwproj";
@ -7735,87 +7932,14 @@
// //
this.OpenFileDialog.Filter = "CodeWalker Projects|*.cwproj"; this.OpenFileDialog.Filter = "CodeWalker Projects|*.cwproj";
// //
// ScenarioClusterPointsListBox // label162
// //
this.ScenarioClusterPointsListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.label162.AutoSize = true;
| System.Windows.Forms.AnchorStyles.Left) this.label162.Location = new System.Drawing.Point(99, 11);
| System.Windows.Forms.AnchorStyles.Right))); this.label162.Name = "label162";
this.ScenarioClusterPointsListBox.FormattingEnabled = true; this.label162.Size = new System.Drawing.Size(111, 13);
this.ScenarioClusterPointsListBox.Location = new System.Drawing.Point(100, 148); this.label162.TabIndex = 2;
this.ScenarioClusterPointsListBox.Name = "ScenarioClusterPointsListBox"; this.label162.Text = "XML for _manifest.ymf";
this.ScenarioClusterPointsListBox.Size = new System.Drawing.Size(235, 173);
this.ScenarioClusterPointsListBox.TabIndex = 13;
this.ScenarioClusterPointsListBox.DoubleClick += new System.EventHandler(this.ScenarioClusterPointsListBox_DoubleClick);
//
// label158
//
this.label158.AutoSize = true;
this.label158.Location = new System.Drawing.Point(51, 150);
this.label158.Name = "label158";
this.label158.Size = new System.Drawing.Size(39, 13);
this.label158.TabIndex = 14;
this.label158.Text = "Points:";
//
// ScenarioClusterAddPointButton
//
this.ScenarioClusterAddPointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ScenarioClusterAddPointButton.Location = new System.Drawing.Point(100, 337);
this.ScenarioClusterAddPointButton.Name = "ScenarioClusterAddPointButton";
this.ScenarioClusterAddPointButton.Size = new System.Drawing.Size(90, 23);
this.ScenarioClusterAddPointButton.TabIndex = 15;
this.ScenarioClusterAddPointButton.Text = "Add Point";
this.ScenarioClusterAddPointButton.UseVisualStyleBackColor = true;
this.ScenarioClusterAddPointButton.Click += new System.EventHandler(this.ScenarioClusterAddPointButton_Click);
//
// label159
//
this.label159.AutoSize = true;
this.label159.Location = new System.Drawing.Point(341, 150);
this.label159.Name = "label159";
this.label159.Size = new System.Drawing.Size(141, 13);
this.label159.TabIndex = 16;
this.label159.Text = "(Double-click to select point)";
//
// label160
//
this.label160.AutoSize = true;
this.label160.Location = new System.Drawing.Point(332, 160);
this.label160.Name = "label160";
this.label160.Size = new System.Drawing.Size(141, 13);
this.label160.TabIndex = 20;
this.label160.Text = "(Double-click to select point)";
//
// ScenarioEntityAddPointButton
//
this.ScenarioEntityAddPointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.ScenarioEntityAddPointButton.Location = new System.Drawing.Point(91, 347);
this.ScenarioEntityAddPointButton.Name = "ScenarioEntityAddPointButton";
this.ScenarioEntityAddPointButton.Size = new System.Drawing.Size(90, 23);
this.ScenarioEntityAddPointButton.TabIndex = 19;
this.ScenarioEntityAddPointButton.Text = "Add Point";
this.ScenarioEntityAddPointButton.UseVisualStyleBackColor = true;
this.ScenarioEntityAddPointButton.Click += new System.EventHandler(this.ScenarioEntityAddPointButton_Click);
//
// label161
//
this.label161.AutoSize = true;
this.label161.Location = new System.Drawing.Point(42, 160);
this.label161.Name = "label161";
this.label161.Size = new System.Drawing.Size(39, 13);
this.label161.TabIndex = 18;
this.label161.Text = "Points:";
//
// ScenarioEntityPointsListBox
//
this.ScenarioEntityPointsListBox.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.ScenarioEntityPointsListBox.FormattingEnabled = true;
this.ScenarioEntityPointsListBox.Location = new System.Drawing.Point(91, 158);
this.ScenarioEntityPointsListBox.Name = "ScenarioEntityPointsListBox";
this.ScenarioEntityPointsListBox.Size = new System.Drawing.Size(235, 173);
this.ScenarioEntityPointsListBox.TabIndex = 17;
this.ScenarioEntityPointsListBox.DoubleClick += new System.EventHandler(this.ScenarioEntityPointsListBox_DoubleClick);
// //
// ProjectForm // ProjectForm
// //
@ -7837,7 +7961,12 @@
this.MainTabControl.ResumeLayout(false); this.MainTabControl.ResumeLayout(false);
this.ProjectTabPage.ResumeLayout(false); this.ProjectTabPage.ResumeLayout(false);
this.ProjectPanel.ResumeLayout(false); this.ProjectPanel.ResumeLayout(false);
this.ProjectPanel.PerformLayout(); this.ProjectTabControl.ResumeLayout(false);
this.ProjectGeneralTabPage.ResumeLayout(false);
this.ProjectGeneralTabPage.PerformLayout();
this.ProjectManifestTabPage.ResumeLayout(false);
this.ProjectManifestTabPage.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.ProjectManifestTextBox)).EndInit();
this.YmapTabPage.ResumeLayout(false); this.YmapTabPage.ResumeLayout(false);
this.YmapTabControl.ResumeLayout(false); this.YmapTabControl.ResumeLayout(false);
this.YmapYmapTabPage.ResumeLayout(false); this.YmapYmapTabPage.ResumeLayout(false);
@ -8648,5 +8777,13 @@
private System.Windows.Forms.Button ScenarioEntityAddPointButton; private System.Windows.Forms.Button ScenarioEntityAddPointButton;
private System.Windows.Forms.Label label161; private System.Windows.Forms.Label label161;
private System.Windows.Forms.ListBox ScenarioEntityPointsListBox; private System.Windows.Forms.ListBox ScenarioEntityPointsListBox;
private System.Windows.Forms.TabControl ProjectTabControl;
private System.Windows.Forms.TabPage ProjectGeneralTabPage;
private System.Windows.Forms.TabPage ProjectManifestTabPage;
private System.Windows.Forms.ToolStripMenuItem OptionsMenu;
private System.Windows.Forms.ToolStripMenuItem OptionsHideGTAVMapMenu;
private System.Windows.Forms.Button ProjectManifestGenerateButton;
private FastColoredTextBoxNS.FastColoredTextBox ProjectManifestTextBox;
private System.Windows.Forms.Label label162;
} }
} }

View File

@ -915,6 +915,83 @@ namespace CodeWalker
} }
private void GenerateProjectManifest()
{
StringBuilder sb = new StringBuilder();
Dictionary<string, YtypFile> deps = new Dictionary<string, YtypFile>();
sb.AppendLine("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>");
sb.AppendLine("<CPackFileMetaData>");
sb.AppendLine(" <MapDataGroups/>");
sb.AppendLine(" <HDTxdBindingArray/>");
sb.AppendLine(" <imapDependencies/>");
if ((CurrentProjectFile != null) && (CurrentProjectFile.YmapFiles.Count > 0))
{
sb.AppendLine(" <imapDependencies_2>");
foreach (var ymap in CurrentProjectFile.YmapFiles)
{
var ymapname = ymap.RpfFileEntry?.NameLower;
if (string.IsNullOrEmpty(ymapname))
{
ymapname = ymap.Name.ToLowerInvariant();
}
if (ymapname.EndsWith(".ymap"))
{
ymapname = ymapname.Substring(0, ymapname.Length - 5);
}
deps.Clear();
if (ymap.AllEntities != null)
{
foreach (var ent in ymap.AllEntities)
{
var ytyp = ent.Archetype?.Ytyp;
if (ytyp != null)
{
var ytypname = ytyp.FileEntry?.NameLower;
if (string.IsNullOrEmpty(ytypname))
{
ytypname = ytyp.FileEntry?.Name?.ToLowerInvariant();
if (ytypname == null) ytypname = "";
}
if (ytypname.EndsWith(".ytyp"))
{
ytypname = ytypname.Substring(0, ytypname.Length - 5);
}
deps[ytypname] = ytyp;
}
}
}
sb.AppendLine(" <Item>");
sb.AppendLine(" <imapName>" + ymapname + "</imapName>");
sb.AppendLine(" <manifestFlags/>");
sb.AppendLine(" <itypDepArray>");
foreach (var kvp in deps)
{
sb.AppendLine(" <Item>" + kvp.Key + "</Item>");
}
sb.AppendLine(" </itypDepArray>");
sb.AppendLine(" </Item>");
}
sb.AppendLine(" </imapDependencies_2>");
}
else
{
sb.AppendLine(" <imapDependencies_2/>");
}
sb.AppendLine(" <itypDependencies_2/>");
sb.AppendLine(" <Interiors/>");
sb.AppendLine("</CPackFileMetaData>");
ProjectManifestTextBox.Text = sb.ToString();
}
public void NewYmap() public void NewYmap()
{ {
@ -6606,6 +6683,11 @@ namespace CodeWalker
RemoveScenarioFromProject(); RemoveScenarioFromProject();
} }
private void OptionsHideGTAVMapMenu_Click(object sender, EventArgs e)
{
ProjectHideMapCheckBox.Checked = !hidegtavmap;
}
@ -6745,6 +6827,12 @@ namespace CodeWalker
private void ProjectHideMapCheckBox_CheckedChanged(object sender, EventArgs e) private void ProjectHideMapCheckBox_CheckedChanged(object sender, EventArgs e)
{ {
hidegtavmap = ProjectHideMapCheckBox.Checked; hidegtavmap = ProjectHideMapCheckBox.Checked;
OptionsHideGTAVMapMenu.Checked = hidegtavmap;
}
private void ProjectManifestGenerateButton_Click(object sender, EventArgs e)
{
GenerateProjectManifest();
} }

View File

@ -117,6 +117,24 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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> </resheader>
<data name="ProjectManifestTextBox.ServiceColors" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdGYXN0Q29sb3JlZFRleHRCb3gsIFZlcnNpb249Mi4xNi4yMS4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWZiOGFhMTJiOTk0ZWY2MWIMAwAAAFFTeXN0
ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACJGYXN0Q29sb3JlZFRleHRCb3hOUy5TZXJ2aWNlQ29sb3JzBgAA
ACg8Q29sbGFwc2VNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxDb2xsYXBzZU1hcmtlckJh
Y2tDb2xvcj5rX19CYWNraW5nRmllbGQqPENvbGxhcHNlTWFya2VyQm9yZGVyQ29sb3I+a19fQmFja2lu
Z0ZpZWxkJjxFeHBhbmRNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkJjxFeHBhbmRNYXJrZXJC
YWNrQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxFeHBhbmRNYXJrZXJCb3JkZXJDb2xvcj5rX19CYWNraW5n
RmllbGQEBAQEBAQUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAA
ABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5E
cmF3aW5nLkNvbG9yAwAAABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAACAAAABfz///8UU3lzdGVtLkRy
YXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAACgAAAAAA
AAAAlgABAAH7/////P///woAAAAAAAAAAKQAAQAB+v////z///8KAAAAAAAAAACWAAEAAfn////8////
CgAAAAAAAAAAjQABAAH4/////P///woAAAAAAAAAAKQAAQAB9/////z///8KAAAAAAAAAACWAAEACw==
</value>
</data>
<metadata name="TopMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TopMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

View File

@ -103,12 +103,52 @@ namespace CodeWalker.World
public void BuildVertices() public void BuildVertices()
{ {
var vlist = new List<VertexTypePC>();
var v1 = new VertexTypePC();
var v2 = new VertexTypePC();
var v3 = new VertexTypePC();
var v4 = new VertexTypePC();
foreach (var group in Groups.Values) foreach (var group in Groups.Values)
{ {
var hash = JenkHash.GenHash(group.NameLabel.ToLowerInvariant());
byte cr = (byte)((hash >> 8) & 0xFF);
byte cg = (byte)((hash >> 16) & 0xFF);
byte cb = (byte)((hash >> 24) & 0xFF);
byte ca = 60;
uint cv = (uint)new Color(cr, cg, cb, ca).ToRgba();
v1.Colour = cv;
v2.Colour = cv;
v3.Colour = cv;
v4.Colour = cv;
foreach (var box in group.Boxes)
{
var min = box.Box.Minimum;
var max = box.Box.Maximum;
v1.Position = new Vector3(min.X, min.Y, 0);
v2.Position = new Vector3(max.X, min.Y, 0);
v3.Position = new Vector3(min.X, max.Y, 0);
v4.Position = new Vector3(max.X, max.Y, 0);
vlist.Add(v1);
vlist.Add(v2);
vlist.Add(v3);
vlist.Add(v3);
vlist.Add(v2);
vlist.Add(v4);
}
} }
if (vlist.Count > 0)
{
TriangleVerts = vlist.ToArray();
}
else
{
TriangleVerts = null;
}
} }

48
WorldForm.Designer.cs generated
View File

@ -222,11 +222,13 @@ namespace CodeWalker
this.ToolbarNewYmapButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarNewYmapButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarNewYndButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarNewYndButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarNewTrainsButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarNewTrainsButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarNewScenarioButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarOpenButton = new System.Windows.Forms.ToolStripSplitButton(); this.ToolbarOpenButton = new System.Windows.Forms.ToolStripSplitButton();
this.ToolbarOpenProjectButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarOpenProjectButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarOpenYmapButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarOpenYmapButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarOpenYndButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarOpenYndButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarOpenTrainsButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarOpenTrainsButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarOpenScenarioButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarSaveButton = new System.Windows.Forms.ToolStripButton(); this.ToolbarSaveButton = new System.Windows.Forms.ToolStripButton();
this.ToolbarSaveAllButton = new System.Windows.Forms.ToolStripButton(); this.ToolbarSaveAllButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
@ -272,8 +274,7 @@ namespace CodeWalker
this.ToolbarCameraMapViewButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarCameraMapViewButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarCameraOrthographicButton = new System.Windows.Forms.ToolStripMenuItem(); this.ToolbarCameraOrthographicButton = new System.Windows.Forms.ToolStripMenuItem();
this.ToolbarPanel = new System.Windows.Forms.Panel(); this.ToolbarPanel = new System.Windows.Forms.Panel();
this.ToolbarNewScenarioButton = new System.Windows.Forms.ToolStripMenuItem(); this.PopZonesCheckBox = new System.Windows.Forms.CheckBox();
this.ToolbarOpenScenarioButton = new System.Windows.Forms.ToolStripMenuItem();
this.StatusStrip.SuspendLayout(); this.StatusStrip.SuspendLayout();
this.ToolsPanel.SuspendLayout(); this.ToolsPanel.SuspendLayout();
this.ToolsTabControl.SuspendLayout(); this.ToolsTabControl.SuspendLayout();
@ -1741,6 +1742,7 @@ namespace CodeWalker
// //
// tabPage9 // tabPage9
// //
this.tabPage9.Controls.Add(this.PopZonesCheckBox);
this.tabPage9.Controls.Add(this.NavMeshesCheckBox); this.tabPage9.Controls.Add(this.NavMeshesCheckBox);
this.tabPage9.Controls.Add(this.TrainPathsCheckBox); this.tabPage9.Controls.Add(this.TrainPathsCheckBox);
this.tabPage9.Controls.Add(this.PathsDepthClipCheckBox); this.tabPage9.Controls.Add(this.PathsDepthClipCheckBox);
@ -1792,10 +1794,10 @@ namespace CodeWalker
// PathsDepthClipCheckBox // PathsDepthClipCheckBox
// //
this.PathsDepthClipCheckBox.AutoSize = true; this.PathsDepthClipCheckBox.AutoSize = true;
this.PathsDepthClipCheckBox.Location = new System.Drawing.Point(10, 388); this.PathsDepthClipCheckBox.Location = new System.Drawing.Point(10, 411);
this.PathsDepthClipCheckBox.Name = "PathsDepthClipCheckBox"; this.PathsDepthClipCheckBox.Name = "PathsDepthClipCheckBox";
this.PathsDepthClipCheckBox.Size = new System.Drawing.Size(102, 17); this.PathsDepthClipCheckBox.Size = new System.Drawing.Size(102, 17);
this.PathsDepthClipCheckBox.TabIndex = 52; this.PathsDepthClipCheckBox.TabIndex = 53;
this.PathsDepthClipCheckBox.Text = "Paths depth clip"; this.PathsDepthClipCheckBox.Text = "Paths depth clip";
this.PathsDepthClipCheckBox.UseVisualStyleBackColor = true; this.PathsDepthClipCheckBox.UseVisualStyleBackColor = true;
this.PathsDepthClipCheckBox.CheckedChanged += new System.EventHandler(this.PathsDepthClipCheckBox_CheckedChanged); this.PathsDepthClipCheckBox.CheckedChanged += new System.EventHandler(this.PathsDepthClipCheckBox_CheckedChanged);
@ -2585,7 +2587,7 @@ namespace CodeWalker
this.ToolbarCameraModeButton}); this.ToolbarCameraModeButton});
this.Toolbar.Location = new System.Drawing.Point(1, 0); this.Toolbar.Location = new System.Drawing.Point(1, 0);
this.Toolbar.Name = "Toolbar"; this.Toolbar.Name = "Toolbar";
this.Toolbar.Size = new System.Drawing.Size(553, 25); this.Toolbar.Size = new System.Drawing.Size(522, 25);
this.Toolbar.TabIndex = 6; this.Toolbar.TabIndex = 6;
this.Toolbar.Text = "toolStrip1"; this.Toolbar.Text = "toolStrip1";
// //
@ -2635,6 +2637,13 @@ namespace CodeWalker
this.ToolbarNewTrainsButton.Text = "New trains file"; this.ToolbarNewTrainsButton.Text = "New trains file";
this.ToolbarNewTrainsButton.Click += new System.EventHandler(this.ToolbarNewTrainsButton_Click); this.ToolbarNewTrainsButton.Click += new System.EventHandler(this.ToolbarNewTrainsButton_Click);
// //
// ToolbarNewScenarioButton
//
this.ToolbarNewScenarioButton.Name = "ToolbarNewScenarioButton";
this.ToolbarNewScenarioButton.Size = new System.Drawing.Size(164, 22);
this.ToolbarNewScenarioButton.Text = "New scenario file";
this.ToolbarNewScenarioButton.Click += new System.EventHandler(this.ToolbarNewScenarioButton_Click);
//
// ToolbarOpenButton // ToolbarOpenButton
// //
this.ToolbarOpenButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.ToolbarOpenButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -2681,6 +2690,13 @@ namespace CodeWalker
this.ToolbarOpenTrainsButton.Text = "Open trains file..."; this.ToolbarOpenTrainsButton.Text = "Open trains file...";
this.ToolbarOpenTrainsButton.Click += new System.EventHandler(this.ToolbarOpenTrainsButton_Click); this.ToolbarOpenTrainsButton.Click += new System.EventHandler(this.ToolbarOpenTrainsButton_Click);
// //
// ToolbarOpenScenarioButton
//
this.ToolbarOpenScenarioButton.Name = "ToolbarOpenScenarioButton";
this.ToolbarOpenScenarioButton.Size = new System.Drawing.Size(178, 22);
this.ToolbarOpenScenarioButton.Text = "Open scenario file...";
this.ToolbarOpenScenarioButton.Click += new System.EventHandler(this.ToolbarOpenScenarioButton_Click);
//
// ToolbarSaveButton // ToolbarSaveButton
// //
this.ToolbarSaveButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.ToolbarSaveButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -3088,19 +3104,16 @@ namespace CodeWalker
this.ToolbarPanel.TabIndex = 7; this.ToolbarPanel.TabIndex = 7;
this.ToolbarPanel.Visible = false; this.ToolbarPanel.Visible = false;
// //
// ToolbarNewScenarioButton // PopZonesCheckBox
// //
this.ToolbarNewScenarioButton.Name = "ToolbarNewScenarioButton"; this.PopZonesCheckBox.AutoSize = true;
this.ToolbarNewScenarioButton.Size = new System.Drawing.Size(164, 22); this.PopZonesCheckBox.Location = new System.Drawing.Point(10, 388);
this.ToolbarNewScenarioButton.Text = "New scenario file"; this.PopZonesCheckBox.Name = "PopZonesCheckBox";
this.ToolbarNewScenarioButton.Click += new System.EventHandler(this.ToolbarNewScenarioButton_Click); this.PopZonesCheckBox.Size = new System.Drawing.Size(136, 17);
// this.PopZonesCheckBox.TabIndex = 52;
// ToolbarOpenScenarioButton this.PopZonesCheckBox.Text = "Show population zones";
// this.PopZonesCheckBox.UseVisualStyleBackColor = true;
this.ToolbarOpenScenarioButton.Name = "ToolbarOpenScenarioButton"; this.PopZonesCheckBox.CheckedChanged += new System.EventHandler(this.PopZonesCheckBox_CheckedChanged);
this.ToolbarOpenScenarioButton.Size = new System.Drawing.Size(178, 22);
this.ToolbarOpenScenarioButton.Text = "Open scenario file...";
this.ToolbarOpenScenarioButton.Click += new System.EventHandler(this.ToolbarOpenScenarioButton_Click);
// //
// WorldForm // WorldForm
// //
@ -3430,5 +3443,6 @@ namespace CodeWalker
private System.Windows.Forms.ToolStripMenuItem ToolsMenuRPFExplorer; private System.Windows.Forms.ToolStripMenuItem ToolsMenuRPFExplorer;
private System.Windows.Forms.ToolStripMenuItem ToolbarNewScenarioButton; private System.Windows.Forms.ToolStripMenuItem ToolbarNewScenarioButton;
private System.Windows.Forms.ToolStripMenuItem ToolbarOpenScenarioButton; private System.Windows.Forms.ToolStripMenuItem ToolbarOpenScenarioButton;
private System.Windows.Forms.CheckBox PopZonesCheckBox;
} }
} }

View File

@ -182,8 +182,7 @@ namespace CodeWalker
bool renderscenarios = false; bool renderscenarios = false;
List<YmtFile> renderscenariolist = new List<YmtFile>(); List<YmtFile> renderscenariolist = new List<YmtFile>();
bool renderpopzones = true; bool renderpopzones = false;
List<PopZone> renderpopzonelist = new List<PopZone>();
float timeofday = 12.0f; float timeofday = 12.0f;
@ -2031,8 +2030,8 @@ namespace CodeWalker
{ {
if (!popzones.Inited) return; if (!popzones.Inited) return;
renderpopzonelist.Clear(); //renderpopzonelist.Clear();
renderpopzonelist.AddRange(popzones.Groups.Values); //renderpopzonelist.AddRange(popzones.Groups.Values);
if (ProjectForm != null) if (ProjectForm != null)
{ {
@ -2040,6 +2039,13 @@ namespace CodeWalker
} }
RenderablePathBatch rnd = renderableCache.GetRenderablePathBatch(popzones);
if ((rnd != null) && (rnd.IsLoaded))
{
shaders.Enqueue(rnd);
}
} }
@ -8057,6 +8063,11 @@ namespace CodeWalker
ShowSelectionBounds = SelectionBoundsCheckBox.Checked; ShowSelectionBounds = SelectionBoundsCheckBox.Checked;
} }
private void PopZonesCheckBox_CheckedChanged(object sender, EventArgs e)
{
renderpopzones = PopZonesCheckBox.Checked;
}
private void ToolsPanelExpandButton_Click(object sender, EventArgs e) private void ToolsPanelExpandButton_Click(object sender, EventArgs e)
{ {
toolspanelexpanded = !toolspanelexpanded; toolspanelexpanded = !toolspanelexpanded;