ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-26 17:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Audio dat.rel to XML conversion

Browse Source
This commit is contained in:
dexy 2019-01-16 00:51:53 +11:00
parent 2c5a907a8e
commit 179afd5794
13 changed files with 2008 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1982
CodeWalker.Core/GameFiles/FileTypes/RelFile.cs
View File

File diff suppressed because it is too large Load Diff

23
CodeWalker.Core/GameFiles/GameFileCache.cs
View File

@ -2413,13 +2413,14 @@ namespace CodeWalker.GameFiles
} }
} }
int ctot = Dat151RelData.TotCount;
StringBuilder sbp = new StringBuilder(); //int ctot = Dat151RelData.TotCount;
foreach (string s in Dat151RelData.FoundCoords) //StringBuilder sbp = new StringBuilder();
{ //foreach (string s in Dat151RelData.FoundCoords)
sbp.AppendLine(s); //{
} // sbp.AppendLine(s);
string posz = sbp.ToString(); //}
//string posz = sbp.ToString();
string relstrs = sb.ToString(); string relstrs = sb.ToString();
string hashstrs = sbh.ToString(); string hashstrs = sbh.ToString();
@ -2638,8 +2639,8 @@ namespace CodeWalker.GameFiles
} }
if (entry.NameLower == "clip_sets.ymt") //if (entry.NameLower == "clip_sets.ymt")
{ } //{ }
//if (entry.NameLower == "vfxinteriorinfo.ymt") //if (entry.NameLower == "vfxinteriorinfo.ymt")
//{ } //{ }
//if (entry.NameLower == "vfxvehicleinfo.ymt") //if (entry.NameLower == "vfxvehicleinfo.ymt")
@ -2650,8 +2651,8 @@ namespace CodeWalker.GameFiles
//{ } //{ }
//if (entry.NameLower == "vfxweaponinfo.ymt") //if (entry.NameLower == "vfxweaponinfo.ymt")
//{ } //{ }
if (entry.NameLower == "physicstasks.ymt") //if (entry.NameLower == "physicstasks.ymt")
{ } //{ }
} }
} }

4
CodeWalker.Core/GameFiles/MetaTypes/MetaXml.cs
View File

@ -1726,6 +1726,10 @@ namespace CodeWalker.GameFiles
{ {
return FloatUtil.GetVector4String(v); return FloatUtil.GetVector4String(v);
} }
public static string FormatHexByte(byte b)
{
return Convert.ToString(b, 16).ToUpperInvariant().PadLeft(2, '0'); //hex byte array
}
public static string FormatHashSwap(MetaHash h) //for use with WriteItemArray, swaps endianness public static string FormatHashSwap(MetaHash h) //for use with WriteItemArray, swaps endianness
{ {

14
CodeWalker.Core/GameFiles/Resources/ResourceBaseTypes.cs
View File

@ -194,6 +194,10 @@ namespace CodeWalker.GameFiles
{ {
return new FlagsByte(v); return new FlagsByte(v);
} }
public static implicit operator byte(FlagsByte v)
{
return v.Value; //implicit conversion
}
} }
[TypeConverter(typeof(ExpandableObjectConverter))] public struct FlagsUshort [TypeConverter(typeof(ExpandableObjectConverter))] public struct FlagsUshort
@ -234,6 +238,11 @@ namespace CodeWalker.GameFiles
{ {
return new FlagsUshort(v); return new FlagsUshort(v);
} }
public static implicit operator ushort(FlagsUshort v)
{
return v.Value; //implicit conversion
}
} }
[TypeConverter(typeof(ExpandableObjectConverter))] public struct FlagsUint [TypeConverter(typeof(ExpandableObjectConverter))] public struct FlagsUint
@ -274,6 +283,11 @@ namespace CodeWalker.GameFiles
{ {
return new FlagsUint(v); return new FlagsUint(v);
} }
public static implicit operator uint(FlagsUint v)
{
return v.Value; //implicit conversion
}
} }

148
Forms/RelForm.Designer.cs generated
View File

@ -28,24 +28,29 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RelForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RelForm));
this.RelPropertyGrid = new CodeWalker.WinForms.PropertyGridFix(); this.RelPropertyGrid = new CodeWalker.WinForms.PropertyGridFix();
this.MainTabControl = new System.Windows.Forms.TabControl(); this.MainTabControl = new System.Windows.Forms.TabControl();
this.DetailsTabPage = new System.Windows.Forms.TabPage(); this.DetailsTabPage = new System.Windows.Forms.TabPage();
this.NameTableTabPage = new System.Windows.Forms.TabPage(); this.NameTableTabPage = new System.Windows.Forms.TabPage();
this.MainTextBox = new CodeWalker.WinForms.TextBoxFix(); this.MainTextBox = new CodeWalker.WinForms.TextBoxFix();
this.CloseButton = new System.Windows.Forms.Button();
this.SearchTabPage = new System.Windows.Forms.TabPage(); this.SearchTabPage = new System.Windows.Forms.TabPage();
this.SearchResultsGrid = new CodeWalker.WinForms.PropertyGridFix(); this.SearchTextRadio = new System.Windows.Forms.RadioButton();
this.SearchHashRadio = new System.Windows.Forms.RadioButton();
this.label12 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label();
this.SearchTextBox = new System.Windows.Forms.TextBox(); this.SearchTextBox = new System.Windows.Forms.TextBox();
this.SearchButton = new System.Windows.Forms.Button(); this.SearchButton = new System.Windows.Forms.Button();
this.SearchHashRadio = new System.Windows.Forms.RadioButton(); this.SearchResultsGrid = new CodeWalker.WinForms.PropertyGridFix();
this.SearchTextRadio = new System.Windows.Forms.RadioButton(); this.CloseButton = new System.Windows.Forms.Button();
this.XmlTabPage = new System.Windows.Forms.TabPage();
this.XmlTextBox = new FastColoredTextBoxNS.FastColoredTextBox();
this.MainTabControl.SuspendLayout(); this.MainTabControl.SuspendLayout();
this.DetailsTabPage.SuspendLayout(); this.DetailsTabPage.SuspendLayout();
this.NameTableTabPage.SuspendLayout(); this.NameTableTabPage.SuspendLayout();
this.SearchTabPage.SuspendLayout(); this.SearchTabPage.SuspendLayout();
this.XmlTabPage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.XmlTextBox)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// RelPropertyGrid // RelPropertyGrid
@ -64,6 +69,7 @@
this.MainTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.MainTabControl.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.MainTabControl.Controls.Add(this.XmlTabPage);
this.MainTabControl.Controls.Add(this.DetailsTabPage); this.MainTabControl.Controls.Add(this.DetailsTabPage);
this.MainTabControl.Controls.Add(this.NameTableTabPage); this.MainTabControl.Controls.Add(this.NameTableTabPage);
this.MainTabControl.Controls.Add(this.SearchTabPage); this.MainTabControl.Controls.Add(this.SearchTabPage);
@ -111,17 +117,6 @@
this.MainTextBox.TabIndex = 1; this.MainTextBox.TabIndex = 1;
this.MainTextBox.WordWrap = false; this.MainTextBox.WordWrap = false;
// //
// CloseButton
//
this.CloseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.CloseButton.Location = new System.Drawing.Point(584, 409);
this.CloseButton.Name = "CloseButton";
this.CloseButton.Size = new System.Drawing.Size(75, 23);
this.CloseButton.TabIndex = 2;
this.CloseButton.Text = "Close";
this.CloseButton.UseVisualStyleBackColor = true;
this.CloseButton.Click += new System.EventHandler(this.CloseButton_Click);
//
// SearchTabPage // SearchTabPage
// //
this.SearchTabPage.Controls.Add(this.SearchTextRadio); this.SearchTabPage.Controls.Add(this.SearchTextRadio);
@ -137,16 +132,29 @@
this.SearchTabPage.Text = "Search"; this.SearchTabPage.Text = "Search";
this.SearchTabPage.UseVisualStyleBackColor = true; this.SearchTabPage.UseVisualStyleBackColor = true;
// //
// SearchResultsGrid // SearchTextRadio
// //
this.SearchResultsGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.SearchTextRadio.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
| System.Windows.Forms.AnchorStyles.Left) this.SearchTextRadio.AutoSize = true;
| System.Windows.Forms.AnchorStyles.Right))); this.SearchTextRadio.Location = new System.Drawing.Point(343, 4);
this.SearchResultsGrid.HelpVisible = false; this.SearchTextRadio.Name = "SearchTextRadio";
this.SearchResultsGrid.Location = new System.Drawing.Point(3, 31); this.SearchTextRadio.Size = new System.Drawing.Size(46, 17);
this.SearchResultsGrid.Name = "SearchResultsGrid"; this.SearchTextRadio.TabIndex = 36;
this.SearchResultsGrid.Size = new System.Drawing.Size(647, 331); this.SearchTextRadio.Text = "Text";
this.SearchResultsGrid.TabIndex = 1; this.SearchTextRadio.UseVisualStyleBackColor = true;
//
// SearchHashRadio
//
this.SearchHashRadio.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.SearchHashRadio.AutoSize = true;
this.SearchHashRadio.Checked = true;
this.SearchHashRadio.Location = new System.Drawing.Point(287, 4);
this.SearchHashRadio.Name = "SearchHashRadio";
this.SearchHashRadio.Size = new System.Drawing.Size(50, 17);
this.SearchHashRadio.TabIndex = 35;
this.SearchHashRadio.TabStop = true;
this.SearchHashRadio.Text = "Hash";
this.SearchHashRadio.UseVisualStyleBackColor = true;
// //
// label12 // label12
// //
@ -178,29 +186,77 @@
this.SearchButton.UseVisualStyleBackColor = true; this.SearchButton.UseVisualStyleBackColor = true;
this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click); this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click);
// //
// SearchHashRadio // SearchResultsGrid
// //
this.SearchHashRadio.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.SearchResultsGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.SearchHashRadio.AutoSize = true; | System.Windows.Forms.AnchorStyles.Left)
this.SearchHashRadio.Checked = true; | System.Windows.Forms.AnchorStyles.Right)));
this.SearchHashRadio.Location = new System.Drawing.Point(287, 4); this.SearchResultsGrid.HelpVisible = false;
this.SearchHashRadio.Name = "SearchHashRadio"; this.SearchResultsGrid.Location = new System.Drawing.Point(3, 31);
this.SearchHashRadio.Size = new System.Drawing.Size(50, 17); this.SearchResultsGrid.Name = "SearchResultsGrid";
this.SearchHashRadio.TabIndex = 35; this.SearchResultsGrid.Size = new System.Drawing.Size(647, 331);
this.SearchHashRadio.TabStop = true; this.SearchResultsGrid.TabIndex = 1;
this.SearchHashRadio.Text = "Hash";
this.SearchHashRadio.UseVisualStyleBackColor = true;
// //
// SearchTextRadio // CloseButton
// //
this.SearchTextRadio.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.CloseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.SearchTextRadio.AutoSize = true; this.CloseButton.Location = new System.Drawing.Point(584, 409);
this.SearchTextRadio.Location = new System.Drawing.Point(343, 4); this.CloseButton.Name = "CloseButton";
this.SearchTextRadio.Name = "SearchTextRadio"; this.CloseButton.Size = new System.Drawing.Size(75, 23);
this.SearchTextRadio.Size = new System.Drawing.Size(46, 17); this.CloseButton.TabIndex = 2;
this.SearchTextRadio.TabIndex = 36; this.CloseButton.Text = "Close";
this.SearchTextRadio.Text = "Text"; this.CloseButton.UseVisualStyleBackColor = true;
this.SearchTextRadio.UseVisualStyleBackColor = true; this.CloseButton.Click += new System.EventHandler(this.CloseButton_Click);
//
// XmlTabPage
//
this.XmlTabPage.Controls.Add(this.XmlTextBox);
this.XmlTabPage.Location = new System.Drawing.Point(4, 22);
this.XmlTabPage.Name = "XmlTabPage";
this.XmlTabPage.Size = new System.Drawing.Size(656, 368);
this.XmlTabPage.TabIndex = 3;
this.XmlTabPage.Text = "XML";
this.XmlTabPage.UseVisualStyleBackColor = true;
//
// XmlTextBox
//
this.XmlTextBox.AutoCompleteBracketsList = new char[] {
'(',
')',
'{',
'}',
'[',
']',
'\"',
'\"',
'\'',
'\''};
this.XmlTextBox.AutoIndentChars = false;
this.XmlTextBox.AutoIndentCharsPatterns = "";
this.XmlTextBox.AutoIndentExistingLines = false;
this.XmlTextBox.AutoScrollMinSize = new System.Drawing.Size(27, 14);
this.XmlTextBox.BackBrush = null;
this.XmlTextBox.CharHeight = 14;
this.XmlTextBox.CharWidth = 8;
this.XmlTextBox.CommentPrefix = null;
this.XmlTextBox.Cursor = System.Windows.Forms.Cursors.IBeam;
this.XmlTextBox.DelayedEventsInterval = 1;
this.XmlTextBox.DisabledColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
this.XmlTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.XmlTextBox.IsReplaceMode = false;
this.XmlTextBox.Language = FastColoredTextBoxNS.Language.XML;
this.XmlTextBox.LeftBracket = '<';
this.XmlTextBox.LeftBracket2 = '(';
this.XmlTextBox.Location = new System.Drawing.Point(0, 0);
this.XmlTextBox.Name = "XmlTextBox";
this.XmlTextBox.Paddings = new System.Windows.Forms.Padding(0);
this.XmlTextBox.RightBracket = '>';
this.XmlTextBox.RightBracket2 = ')';
this.XmlTextBox.SelectionColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
this.XmlTextBox.ServiceColors = ((FastColoredTextBoxNS.ServiceColors)(resources.GetObject("XmlTextBox.ServiceColors")));
this.XmlTextBox.Size = new System.Drawing.Size(656, 368);
this.XmlTextBox.TabIndex = 2;
this.XmlTextBox.Zoom = 100;
// //
// RelForm // RelForm
// //
@ -218,6 +274,8 @@
this.NameTableTabPage.PerformLayout(); this.NameTableTabPage.PerformLayout();
this.SearchTabPage.ResumeLayout(false); this.SearchTabPage.ResumeLayout(false);
this.SearchTabPage.PerformLayout(); this.SearchTabPage.PerformLayout();
this.XmlTabPage.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.XmlTextBox)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@ -237,5 +295,7 @@
private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label12;
private System.Windows.Forms.TextBox SearchTextBox; private System.Windows.Forms.TextBox SearchTextBox;
private System.Windows.Forms.Button SearchButton; private System.Windows.Forms.Button SearchButton;
private System.Windows.Forms.TabPage XmlTabPage;
private FastColoredTextBoxNS.FastColoredTextBox XmlTextBox;
} }
} }

1
Forms/RelForm.cs
View File

@ -59,6 +59,7 @@ namespace CodeWalker.Forms
CurrentFile = rel; CurrentFile = rel;
XmlTextBox.Text = RelXml.GetXml(rel);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (rel != null) if (rel != null)

18
Forms/RelForm.resx
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="XmlTextBox.ServiceColors" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdGYXN0Q29sb3JlZFRleHRCb3gsIFZlcnNpb249Mi4xNi4yNC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWZiOGFhMTJiOTk0ZWY2MWIMAwAAAFFTeXN0
ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACJGYXN0Q29sb3JlZFRleHRCb3hOUy5TZXJ2aWNlQ29sb3JzBgAA
ACg8Q29sbGFwc2VNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxDb2xsYXBzZU1hcmtlckJh
Y2tDb2xvcj5rX19CYWNraW5nRmllbGQqPENvbGxhcHNlTWFya2VyQm9yZGVyQ29sb3I+a19fQmFja2lu
Z0ZpZWxkJjxFeHBhbmRNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkJjxFeHBhbmRNYXJrZXJC
YWNrQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxFeHBhbmRNYXJrZXJCb3JkZXJDb2xvcj5rX19CYWNraW5n
RmllbGQEBAQEBAQUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAA
ABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5E
cmF3aW5nLkNvbG9yAwAAABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAACAAAABfz///8UU3lzdGVtLkRy
YXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAACgAAAAAA
AAAAlgABAAH7/////P///woAAAAAAAAAAKQAAQAB+v////z///8KAAAAAAAAAACWAAEAAfn////8////
CgAAAAAAAAAATgABAAH4/////P///woAAAAAAAAAAKQAAQAB9/////z///8KAAAAAAAAAACWAAEACw==
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>

14
Project/Panels/EditAudioEmitterPanel.cs
View File

@ -455,7 +455,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentEmitter.AudioEmitter.Flags0.Value != flags) if (CurrentEmitter.AudioEmitter.Flags0 != flags)
{ {
CurrentEmitter.AudioEmitter.Flags0 = flags; CurrentEmitter.AudioEmitter.Flags0 = flags;
@ -472,7 +472,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags1TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags1TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentEmitter.AudioEmitter.Flags1.Value != flags) if (CurrentEmitter.AudioEmitter.Flags1 != flags)
{ {
CurrentEmitter.AudioEmitter.Flags1 = flags; CurrentEmitter.AudioEmitter.Flags1 = flags;
@ -489,7 +489,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags2TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags2TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentEmitter.AudioEmitter.Flags2.Value != flags) if (CurrentEmitter.AudioEmitter.Flags2 != flags)
{ {
CurrentEmitter.AudioEmitter.Flags2 = flags; CurrentEmitter.AudioEmitter.Flags2 = flags;
@ -506,7 +506,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags3TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags3TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentEmitter.AudioEmitter.Flags3.Value != flags) if (CurrentEmitter.AudioEmitter.Flags3 != flags)
{ {
CurrentEmitter.AudioEmitter.Flags3 = flags; CurrentEmitter.AudioEmitter.Flags3 = flags;
@ -523,7 +523,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags4TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags4TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentEmitter.AudioEmitter.Flags4.Value != flags) if (CurrentEmitter.AudioEmitter.Flags4 != flags)
{ {
CurrentEmitter.AudioEmitter.Flags4 = flags; CurrentEmitter.AudioEmitter.Flags4 = flags;
@ -540,7 +540,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags5TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags5TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentEmitter.AudioEmitter.Flags5.Value != flags) if (CurrentEmitter.AudioEmitter.Flags5 != flags)
{ {
CurrentEmitter.AudioEmitter.Flags5 = flags; CurrentEmitter.AudioEmitter.Flags5 = flags;
@ -583,7 +583,7 @@ namespace CodeWalker.Project.Panels
} }
CurrentEmitter.AudioEmitter.ExtParams = paramlist.ToArray(); CurrentEmitter.AudioEmitter.ExtParams = paramlist.ToArray();
CurrentEmitter.AudioEmitter.ExtParamCount = (ushort)paramlist.Count; CurrentEmitter.AudioEmitter.ExtParamsCount = (ushort)paramlist.Count;
ProjectItemChanged(); ProjectItemChanged();
} }

6
Project/Panels/EditAudioInteriorPanel.cs
View File

@ -128,7 +128,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentInterior.Unk0.Value != flags) if (CurrentInterior.Unk0 != flags)
{ {
CurrentInterior.Unk0 = flags; CurrentInterior.Unk0 = flags;
@ -145,7 +145,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags1TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags1TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentInterior.Unk1.Value != flags) if (CurrentInterior.Unk1 != flags)
{ {
CurrentInterior.Unk1 = flags; CurrentInterior.Unk1 = flags;
@ -162,7 +162,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags2TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags2TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentInterior.Unk2.Value != flags) if (CurrentInterior.Unk2 != flags)
{ {
CurrentInterior.Unk2 = flags; CurrentInterior.Unk2 = flags;

2
Project/Panels/EditAudioInteriorRoomPanel.cs
View File

@ -418,7 +418,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentRoom.Flags0.Value != flags) if (CurrentRoom.Flags0 != flags)
{ {
CurrentRoom.Flags0 = flags; CurrentRoom.Flags0 = flags;

6
Project/Panels/EditAudioZonePanel.cs
View File

@ -445,7 +445,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags0TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentZone.AudioZone.Flags0.Value != flags) if (CurrentZone.AudioZone.Flags0 != flags)
{ {
CurrentZone.AudioZone.Flags0 = flags; CurrentZone.AudioZone.Flags0 = flags;
@ -463,7 +463,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags1TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags1TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentZone.AudioZone.Flags1.Value != flags) if (CurrentZone.AudioZone.Flags1 != flags)
{ {
CurrentZone.AudioZone.Flags1 = flags; CurrentZone.AudioZone.Flags1 = flags;
@ -480,7 +480,7 @@ namespace CodeWalker.Project.Panels
uint flags = 0; uint flags = 0;
if (uint.TryParse(Flags2TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags)) if (uint.TryParse(Flags2TextBox.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out flags))
{ {
if (CurrentZone.AudioZone.Flags2.Value != flags) if (CurrentZone.AudioZone.Flags2 != flags)
{ {
CurrentZone.AudioZone.Flags2 = flags; CurrentZone.AudioZone.Flags2 = flags;

2
Project/Panels/ProjectExplorerPanel.cs
View File

@ -1577,6 +1577,7 @@ namespace CodeWalker.Project.Panels
var tn = FindAudioZoneTreeNode(zone); var tn = FindAudioZoneTreeNode(zone);
if (tn != null) if (tn != null)
{ {
tn.Text = zone.NameHash.ToString();
} }
} }
public void UpdateAudioEmitterTreeNode(AudioPlacement emitter) public void UpdateAudioEmitterTreeNode(AudioPlacement emitter)
@ -1584,6 +1585,7 @@ namespace CodeWalker.Project.Panels
var tn = FindAudioEmitterTreeNode(emitter); var tn = FindAudioEmitterTreeNode(emitter);
if (tn != null) if (tn != null)
{ {
tn.Text = emitter.NameHash.ToString();
} }
} }
public void UpdateAudioZoneListTreeNode(Dat151AmbientZoneList list) public void UpdateAudioZoneListTreeNode(Dat151AmbientZoneList list)

30
Project/ProjectForm.cs
View File

@ -4575,7 +4575,7 @@ namespace CodeWalker.Project
//AA800424 box, line //AA800424 box, line
//AA800420 sphere //AA800420 sphere
zone.Flags0 = cp ? copy.AudioZone.Flags0 : 0xAA800424; zone.Flags0 = cp ? copy.AudioZone.Flags0.Value : 0xAA800424;
zone.Flags1 = cp ? copy.AudioZone.Flags1 : 0; zone.Flags1 = cp ? copy.AudioZone.Flags1 : 0;
zone.Flags2 = cp ? copy.AudioZone.Flags2 : 0; zone.Flags2 = cp ? copy.AudioZone.Flags2 : 0;
zone.Shape = cp ? copy.AudioZone.Shape : Dat151ZoneShape.Box; zone.Shape = cp ? copy.AudioZone.Shape : Dat151ZoneShape.Box;
@ -4697,23 +4697,23 @@ namespace CodeWalker.Project
var emitter = new Dat151AmbientEmitter(CurrentAudioFile); var emitter = new Dat151AmbientEmitter(CurrentAudioFile);
emitter.Flags0 = cp ? copy.AudioEmitter.Flags0 : 0xAA001100; emitter.Flags0 = cp ? copy.AudioEmitter.Flags0.Value : 0xAA001100;
emitter.Flags5 = cp ? copy.AudioEmitter.Flags5 : 0xFFFFFFFF; emitter.Flags5 = cp ? copy.AudioEmitter.Flags5.Value : 0xFFFFFFFF;
emitter.InnerRad = cp ? copy.AudioEmitter.InnerRad : 0.0f; emitter.InnerRad = cp ? copy.AudioEmitter.InnerRad : 0.0f;
emitter.OuterRad = cp ? copy.AudioEmitter.OuterRad : 20.0f; emitter.OuterRad = cp ? copy.AudioEmitter.OuterRad : 20.0f;
emitter.Unk01 = cp ? copy.AudioEmitter.Unk01 : 1.0f; emitter.Unk01 = cp ? copy.AudioEmitter.Unk01 : 1.0f;
emitter.Unk02 = cp ? copy.AudioEmitter.Unk02 : 0; emitter.Unk02 = cp ? copy.AudioEmitter.Unk02.Value : (byte)0;
emitter.Unk03 = cp ? copy.AudioEmitter.Unk03 : 0; emitter.Unk03 = cp ? copy.AudioEmitter.Unk03.Value : (byte)0;
emitter.Unk04 = cp ? copy.AudioEmitter.Unk04 : 160; emitter.Unk04 = cp ? copy.AudioEmitter.Unk04.Value : (byte)160;
emitter.Unk05 = cp ? copy.AudioEmitter.Unk05 : 5; emitter.Unk05 = cp ? copy.AudioEmitter.Unk05.Value : (byte)5;
emitter.Unk06 = cp ? copy.AudioEmitter.Unk06 : 0; emitter.Unk06 = cp ? copy.AudioEmitter.Unk06.Value : (ushort)0;
emitter.Unk07 = cp ? copy.AudioEmitter.Unk07 : 0; emitter.Unk07 = cp ? copy.AudioEmitter.Unk07.Value : (ushort)0;
emitter.Unk08 = cp ? copy.AudioEmitter.Unk08 : 0; emitter.Unk08 = cp ? copy.AudioEmitter.Unk08.Value : (byte)0;
emitter.Unk09 = cp ? copy.AudioEmitter.Unk09 : 1; emitter.Unk09 = cp ? copy.AudioEmitter.Unk09.Value : (byte)1;
emitter.Unk10 = cp ? copy.AudioEmitter.Unk10 : 1; emitter.Unk10 = cp ? copy.AudioEmitter.Unk10.Value : (byte)1;
emitter.Unk11 = cp ? copy.AudioEmitter.Unk11 : 1; emitter.Unk11 = cp ? copy.AudioEmitter.Unk11.Value : (byte)1;
emitter.Unk12 = cp ? copy.AudioEmitter.Unk12 : 100; emitter.Unk12 = cp ? copy.AudioEmitter.Unk12.Value : (byte)100;
emitter.Unk13 = cp ? copy.AudioEmitter.Unk13 : 3; emitter.Unk13 = cp ? copy.AudioEmitter.Unk13.Value : (byte)3;
emitter.Name = "emitter1"; emitter.Name = "emitter1";