Added missing YNV content flag

This commit is contained in:
dexy 2021-04-17 06:51:33 +10:00
parent 4751818703
commit ac14e716d8
3 changed files with 45 additions and 18 deletions

View File

@ -1136,6 +1136,7 @@ namespace CodeWalker.GameFiles
Portals = 2, Portals = 2,
Vehicle = 4, Vehicle = 4,
Unknown8 = 8, Unknown8 = 8,
Unknown16 = 16,
} }

View File

@ -44,7 +44,7 @@
this.YnvPointCountLabel = new System.Windows.Forms.Label(); this.YnvPointCountLabel = new System.Windows.Forms.Label();
this.YnvByteCountLabel = new System.Windows.Forms.Label(); this.YnvByteCountLabel = new System.Windows.Forms.Label();
this.YnvFlagsGroupBox = new System.Windows.Forms.GroupBox(); this.YnvFlagsGroupBox = new System.Windows.Forms.GroupBox();
this.YnvFlagsUnknownCheckBox = new System.Windows.Forms.CheckBox(); this.YnvFlagsUnknown8CheckBox = new System.Windows.Forms.CheckBox();
this.YnvFlagsVehicleCheckBox = new System.Windows.Forms.CheckBox(); this.YnvFlagsVehicleCheckBox = new System.Windows.Forms.CheckBox();
this.YnvFlagsPortalsCheckBox = new System.Windows.Forms.CheckBox(); this.YnvFlagsPortalsCheckBox = new System.Windows.Forms.CheckBox();
this.YnvFlagsPolygonsCheckBox = new System.Windows.Forms.CheckBox(); this.YnvFlagsPolygonsCheckBox = new System.Windows.Forms.CheckBox();
@ -57,6 +57,7 @@
this.YnvProjectPathTextBox = new System.Windows.Forms.TextBox(); this.YnvProjectPathTextBox = new System.Windows.Forms.TextBox();
this.label47 = new System.Windows.Forms.Label(); this.label47 = new System.Windows.Forms.Label();
this.YnvRpfPathTextBox = new System.Windows.Forms.TextBox(); this.YnvRpfPathTextBox = new System.Windows.Forms.TextBox();
this.YnvFlagsUnknown16CheckBox = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.YnvAreaIDYUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.YnvAreaIDYUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.YnvAreaIDXUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.YnvAreaIDXUpDown)).BeginInit();
this.YnvFlagsGroupBox.SuspendLayout(); this.YnvFlagsGroupBox.SuspendLayout();
@ -197,7 +198,8 @@
// //
// YnvFlagsGroupBox // YnvFlagsGroupBox
// //
this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsUnknownCheckBox); this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsUnknown16CheckBox);
this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsUnknown8CheckBox);
this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsVehicleCheckBox); this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsVehicleCheckBox);
this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsPortalsCheckBox); this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsPortalsCheckBox);
this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsPolygonsCheckBox); this.YnvFlagsGroupBox.Controls.Add(this.YnvFlagsPolygonsCheckBox);
@ -208,21 +210,21 @@
this.YnvFlagsGroupBox.TabStop = false; this.YnvFlagsGroupBox.TabStop = false;
this.YnvFlagsGroupBox.Text = "Content flags"; this.YnvFlagsGroupBox.Text = "Content flags";
// //
// YnvFlagsUnknownCheckBox // YnvFlagsUnknown8CheckBox
// //
this.YnvFlagsUnknownCheckBox.AutoSize = true; this.YnvFlagsUnknown8CheckBox.AutoSize = true;
this.YnvFlagsUnknownCheckBox.Location = new System.Drawing.Point(12, 88); this.YnvFlagsUnknown8CheckBox.Location = new System.Drawing.Point(12, 76);
this.YnvFlagsUnknownCheckBox.Name = "YnvFlagsUnknownCheckBox"; this.YnvFlagsUnknown8CheckBox.Name = "YnvFlagsUnknown8CheckBox";
this.YnvFlagsUnknownCheckBox.Size = new System.Drawing.Size(78, 17); this.YnvFlagsUnknown8CheckBox.Size = new System.Drawing.Size(84, 17);
this.YnvFlagsUnknownCheckBox.TabIndex = 3; this.YnvFlagsUnknown8CheckBox.TabIndex = 3;
this.YnvFlagsUnknownCheckBox.Text = "[Unknown]"; this.YnvFlagsUnknown8CheckBox.Text = "[Unknown8]";
this.YnvFlagsUnknownCheckBox.UseVisualStyleBackColor = true; this.YnvFlagsUnknown8CheckBox.UseVisualStyleBackColor = true;
this.YnvFlagsUnknownCheckBox.CheckedChanged += new System.EventHandler(this.YnvFlagsUnknownCheckBox_CheckedChanged); this.YnvFlagsUnknown8CheckBox.CheckedChanged += new System.EventHandler(this.YnvFlagsUnknown8CheckBox_CheckedChanged);
// //
// YnvFlagsVehicleCheckBox // YnvFlagsVehicleCheckBox
// //
this.YnvFlagsVehicleCheckBox.AutoSize = true; this.YnvFlagsVehicleCheckBox.AutoSize = true;
this.YnvFlagsVehicleCheckBox.Location = new System.Drawing.Point(12, 65); this.YnvFlagsVehicleCheckBox.Location = new System.Drawing.Point(12, 57);
this.YnvFlagsVehicleCheckBox.Name = "YnvFlagsVehicleCheckBox"; this.YnvFlagsVehicleCheckBox.Name = "YnvFlagsVehicleCheckBox";
this.YnvFlagsVehicleCheckBox.Size = new System.Drawing.Size(61, 17); this.YnvFlagsVehicleCheckBox.Size = new System.Drawing.Size(61, 17);
this.YnvFlagsVehicleCheckBox.TabIndex = 2; this.YnvFlagsVehicleCheckBox.TabIndex = 2;
@ -233,7 +235,7 @@
// YnvFlagsPortalsCheckBox // YnvFlagsPortalsCheckBox
// //
this.YnvFlagsPortalsCheckBox.AutoSize = true; this.YnvFlagsPortalsCheckBox.AutoSize = true;
this.YnvFlagsPortalsCheckBox.Location = new System.Drawing.Point(12, 42); this.YnvFlagsPortalsCheckBox.Location = new System.Drawing.Point(12, 38);
this.YnvFlagsPortalsCheckBox.Name = "YnvFlagsPortalsCheckBox"; this.YnvFlagsPortalsCheckBox.Name = "YnvFlagsPortalsCheckBox";
this.YnvFlagsPortalsCheckBox.Size = new System.Drawing.Size(58, 17); this.YnvFlagsPortalsCheckBox.Size = new System.Drawing.Size(58, 17);
this.YnvFlagsPortalsCheckBox.TabIndex = 1; this.YnvFlagsPortalsCheckBox.TabIndex = 1;
@ -341,6 +343,17 @@
this.YnvRpfPathTextBox.Size = new System.Drawing.Size(470, 20); this.YnvRpfPathTextBox.Size = new System.Drawing.Size(470, 20);
this.YnvRpfPathTextBox.TabIndex = 54; this.YnvRpfPathTextBox.TabIndex = 54;
// //
// YnvFlagsUnknown16CheckBox
//
this.YnvFlagsUnknown16CheckBox.AutoSize = true;
this.YnvFlagsUnknown16CheckBox.Location = new System.Drawing.Point(12, 95);
this.YnvFlagsUnknown16CheckBox.Name = "YnvFlagsUnknown16CheckBox";
this.YnvFlagsUnknown16CheckBox.Size = new System.Drawing.Size(90, 17);
this.YnvFlagsUnknown16CheckBox.TabIndex = 4;
this.YnvFlagsUnknown16CheckBox.Text = "[Unknown16]";
this.YnvFlagsUnknown16CheckBox.UseVisualStyleBackColor = true;
this.YnvFlagsUnknown16CheckBox.CheckedChanged += new System.EventHandler(this.YnvFlagsUnknown16CheckBox_CheckedChanged);
//
// EditYnvPanel // EditYnvPanel
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -399,7 +412,7 @@
private System.Windows.Forms.Label YnvPointCountLabel; private System.Windows.Forms.Label YnvPointCountLabel;
private System.Windows.Forms.Label YnvByteCountLabel; private System.Windows.Forms.Label YnvByteCountLabel;
private System.Windows.Forms.GroupBox YnvFlagsGroupBox; private System.Windows.Forms.GroupBox YnvFlagsGroupBox;
private System.Windows.Forms.CheckBox YnvFlagsUnknownCheckBox; private System.Windows.Forms.CheckBox YnvFlagsUnknown8CheckBox;
private System.Windows.Forms.CheckBox YnvFlagsVehicleCheckBox; private System.Windows.Forms.CheckBox YnvFlagsVehicleCheckBox;
private System.Windows.Forms.CheckBox YnvFlagsPortalsCheckBox; private System.Windows.Forms.CheckBox YnvFlagsPortalsCheckBox;
private System.Windows.Forms.CheckBox YnvFlagsPolygonsCheckBox; private System.Windows.Forms.CheckBox YnvFlagsPolygonsCheckBox;
@ -412,5 +425,6 @@
private System.Windows.Forms.TextBox YnvProjectPathTextBox; private System.Windows.Forms.TextBox YnvProjectPathTextBox;
private System.Windows.Forms.Label label47; private System.Windows.Forms.Label label47;
private System.Windows.Forms.TextBox YnvRpfPathTextBox; private System.Windows.Forms.TextBox YnvRpfPathTextBox;
private System.Windows.Forms.CheckBox YnvFlagsUnknown16CheckBox;
} }
} }

View File

@ -68,6 +68,11 @@ namespace CodeWalker.Project.Panels
YnvAreaIDYUpDown.Value = 0; YnvAreaIDYUpDown.Value = 0;
YnvAreaIDInfoLabel.Text = "ID: -"; YnvAreaIDInfoLabel.Text = "ID: -";
YnvAABBSizeTextBox.Text = string.Empty; YnvAABBSizeTextBox.Text = string.Empty;
YnvFlagsPolygonsCheckBox.Checked = false;
YnvFlagsPortalsCheckBox.Checked = false;
YnvFlagsVehicleCheckBox.Checked = false;
YnvFlagsUnknown8CheckBox.Checked = false;
YnvFlagsUnknown16CheckBox.Checked = false;
YnvVertexCountLabel.Text = "Vertex count: -"; YnvVertexCountLabel.Text = "Vertex count: -";
YnvPolyCountLabel.Text = "Poly count: -"; YnvPolyCountLabel.Text = "Poly count: -";
YnvPortalCountLabel.Text = "Portal count: -"; YnvPortalCountLabel.Text = "Portal count: -";
@ -90,7 +95,8 @@ namespace CodeWalker.Project.Panels
YnvFlagsPolygonsCheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Polygons); YnvFlagsPolygonsCheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Polygons);
YnvFlagsPortalsCheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Portals); YnvFlagsPortalsCheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Portals);
YnvFlagsVehicleCheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Vehicle); YnvFlagsVehicleCheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Vehicle);
YnvFlagsUnknownCheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Unknown8); YnvFlagsUnknown8CheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Unknown8);
YnvFlagsUnknown16CheckBox.Checked = nv.ContentFlags.HasFlag(NavMeshFlags.Unknown16);
YnvVertexCountLabel.Text = "Vertex count: " + nv.VerticesCount.ToString(); YnvVertexCountLabel.Text = "Vertex count: " + nv.VerticesCount.ToString();
YnvPolyCountLabel.Text = "Poly count: " + nv.PolysCount.ToString(); YnvPolyCountLabel.Text = "Poly count: " + nv.PolysCount.ToString();
YnvPortalCountLabel.Text = "Portal count: " + nv.PortalsCount.ToString(); YnvPortalCountLabel.Text = "Portal count: " + nv.PortalsCount.ToString();
@ -157,8 +163,9 @@ namespace CodeWalker.Project.Panels
var verts = YnvFlagsPolygonsCheckBox.Checked ? NavMeshFlags.Polygons : NavMeshFlags.None; var verts = YnvFlagsPolygonsCheckBox.Checked ? NavMeshFlags.Polygons : NavMeshFlags.None;
var ports = YnvFlagsPortalsCheckBox.Checked ? NavMeshFlags.Portals : NavMeshFlags.None; var ports = YnvFlagsPortalsCheckBox.Checked ? NavMeshFlags.Portals : NavMeshFlags.None;
var vehcs = YnvFlagsVehicleCheckBox.Checked ? NavMeshFlags.Vehicle : NavMeshFlags.None; var vehcs = YnvFlagsVehicleCheckBox.Checked ? NavMeshFlags.Vehicle : NavMeshFlags.None;
var unk8s = YnvFlagsUnknownCheckBox.Checked ? NavMeshFlags.Unknown8 : NavMeshFlags.None; var unk8s = YnvFlagsUnknown8CheckBox.Checked ? NavMeshFlags.Unknown8 : NavMeshFlags.None;
var f = verts | ports | vehcs | unk8s; var unk16s = YnvFlagsUnknown16CheckBox.Checked ? NavMeshFlags.Unknown16 : NavMeshFlags.None;
var f = verts | ports | vehcs | unk8s | unk16s;
lock (ProjectForm.ProjectSyncRoot) lock (ProjectForm.ProjectSyncRoot)
{ {
if (Ynv.Nav.ContentFlags != f) if (Ynv.Nav.ContentFlags != f)
@ -212,7 +219,12 @@ namespace CodeWalker.Project.Panels
YnvFlagsCheckBoxChange(); YnvFlagsCheckBoxChange();
} }
private void YnvFlagsUnknownCheckBox_CheckedChanged(object sender, EventArgs e) private void YnvFlagsUnknown8CheckBox_CheckedChanged(object sender, EventArgs e)
{
YnvFlagsCheckBoxChange();
}
private void YnvFlagsUnknown16CheckBox_CheckedChanged(object sender, EventArgs e)
{ {
YnvFlagsCheckBoxChange(); YnvFlagsCheckBoxChange();
} }