diff --git a/Mafia2Libs/Forms/Docking/DockSceneTree.Designer.cs b/Mafia2Libs/Forms/Docking/DockSceneTree.Designer.cs index 7b38b8da..31ac4a82 100644 --- a/Mafia2Libs/Forms/Docking/DockSceneTree.Designer.cs +++ b/Mafia2Libs/Forms/Docking/DockSceneTree.Designer.cs @@ -29,334 +29,334 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DockSceneTree)); - this.EntryMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.JumpToButton = new System.Windows.Forms.ToolStripMenuItem(); - this.DeleteButton = new System.Windows.Forms.ToolStripMenuItem(); - this.DuplicateButton = new System.Windows.Forms.ToolStripMenuItem(); - this.Export3DButton = new System.Windows.Forms.ToolStripMenuItem(); - this.TranslokatorNewInstanceButton = new System.Windows.Forms.ToolStripMenuItem(); - this.ActorEntryNewTRObjectButton = new System.Windows.Forms.ToolStripMenuItem(); - this.FrameActions = new System.Windows.Forms.ToolStripMenuItem(); - this.UpdateParent1Button = new System.Windows.Forms.ToolStripMenuItem(); - this.UpdateParent2Button = new System.Windows.Forms.ToolStripMenuItem(); - this.ExportFrameButton = new System.Windows.Forms.ToolStripMenuItem(); - this.LinkToActorButton = new System.Windows.Forms.ToolStripMenuItem(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); - this.TreeView_Explorer = new Mafia2Tool.Controls.MTreeView(); - this.Tab_Explorer = new System.Windows.Forms.TabControl(); - this.TabPage_Explorer = new System.Windows.Forms.TabPage(); - this.TabPage_Searcher = new System.Windows.Forms.TabPage(); - this.Split_Searcher_Root = new System.Windows.Forms.SplitContainer(); - this.Split_Searcher_TextButton = new System.Windows.Forms.SplitContainer(); - this.TextBox_Search = new System.Windows.Forms.TextBox(); - this.Button_Search = new System.Windows.Forms.Button(); - this.TreeView_Searcher = new Mafia2Tool.Controls.MTreeView(); - this.tooltipPanel = new System.Windows.Forms.Panel(); - this.tooltipText = new System.Windows.Forms.Label(); - this.EntryMenuStrip.SuspendLayout(); - this.Tab_Explorer.SuspendLayout(); - this.TabPage_Explorer.SuspendLayout(); - this.TabPage_Searcher.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.Split_Searcher_Root)).BeginInit(); - this.Split_Searcher_Root.Panel1.SuspendLayout(); - this.Split_Searcher_Root.Panel2.SuspendLayout(); - this.Split_Searcher_Root.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.Split_Searcher_TextButton)).BeginInit(); - this.Split_Searcher_TextButton.Panel1.SuspendLayout(); - this.Split_Searcher_TextButton.Panel2.SuspendLayout(); - this.Split_Searcher_TextButton.SuspendLayout(); - this.tooltipPanel.SuspendLayout(); - this.SuspendLayout(); + EntryMenuStrip = new System.Windows.Forms.ContextMenuStrip(components); + JumpToButton = new System.Windows.Forms.ToolStripMenuItem(); + DeleteButton = new System.Windows.Forms.ToolStripMenuItem(); + DuplicateButton = new System.Windows.Forms.ToolStripMenuItem(); + Export3DButton = new System.Windows.Forms.ToolStripMenuItem(); + FrameActions = new System.Windows.Forms.ToolStripMenuItem(); + UpdateParent1Button = new System.Windows.Forms.ToolStripMenuItem(); + UpdateParent2Button = new System.Windows.Forms.ToolStripMenuItem(); + ExportFrameButton = new System.Windows.Forms.ToolStripMenuItem(); + LinkToActorButton = new System.Windows.Forms.ToolStripMenuItem(); + TranslokatorNewInstanceButton = new System.Windows.Forms.ToolStripMenuItem(); + ActorEntryNewTRObjectButton = new System.Windows.Forms.ToolStripMenuItem(); + TRRebuildObjectButton = new System.Windows.Forms.ToolStripMenuItem(); + imageList1 = new System.Windows.Forms.ImageList(components); + TreeView_Explorer = new Mafia2Tool.Controls.MTreeView(); + Tab_Explorer = new System.Windows.Forms.TabControl(); + TabPage_Explorer = new System.Windows.Forms.TabPage(); + tooltipPanel = new System.Windows.Forms.Panel(); + tooltipText = new System.Windows.Forms.Label(); + TabPage_Searcher = new System.Windows.Forms.TabPage(); + Split_Searcher_Root = new System.Windows.Forms.SplitContainer(); + Split_Searcher_TextButton = new System.Windows.Forms.SplitContainer(); + TextBox_Search = new System.Windows.Forms.TextBox(); + Button_Search = new System.Windows.Forms.Button(); + TreeView_Searcher = new Mafia2Tool.Controls.MTreeView(); + EntryMenuStrip.SuspendLayout(); + Tab_Explorer.SuspendLayout(); + TabPage_Explorer.SuspendLayout(); + tooltipPanel.SuspendLayout(); + TabPage_Searcher.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)Split_Searcher_Root).BeginInit(); + Split_Searcher_Root.Panel1.SuspendLayout(); + Split_Searcher_Root.Panel2.SuspendLayout(); + Split_Searcher_Root.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)Split_Searcher_TextButton).BeginInit(); + Split_Searcher_TextButton.Panel1.SuspendLayout(); + Split_Searcher_TextButton.Panel2.SuspendLayout(); + Split_Searcher_TextButton.SuspendLayout(); + SuspendLayout(); // // EntryMenuStrip // - this.EntryMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.JumpToButton, - this.DeleteButton, - this.DuplicateButton, - this.Export3DButton, - this.FrameActions, - this.TranslokatorNewInstanceButton, - this.ActorEntryNewTRObjectButton }); - this.EntryMenuStrip.Name = "EntryMenuStrip"; - this.EntryMenuStrip.Size = new System.Drawing.Size(165, 114); - this.EntryMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.OpenEntryContext); + EntryMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { JumpToButton, DeleteButton, DuplicateButton, Export3DButton, FrameActions, TranslokatorNewInstanceButton, ActorEntryNewTRObjectButton,TRRebuildObjectButton }); + EntryMenuStrip.Name = "EntryMenuStrip"; + EntryMenuStrip.Size = new System.Drawing.Size(204, 158); + EntryMenuStrip.Opening += OpenEntryContext; // // JumpToButton // - this.JumpToButton.Name = "JumpToButton"; - this.JumpToButton.Size = new System.Drawing.Size(164, 22); - this.JumpToButton.Text = "Jump To Position"; + JumpToButton.Name = "JumpToButton"; + JumpToButton.Size = new System.Drawing.Size(203, 22); + JumpToButton.Text = "Jump To Position"; // // DeleteButton // - this.DeleteButton.Name = "DeleteButton"; - this.DeleteButton.Size = new System.Drawing.Size(164, 22); - this.DeleteButton.Text = "Delete"; + DeleteButton.Name = "DeleteButton"; + DeleteButton.Size = new System.Drawing.Size(203, 22); + DeleteButton.Text = "Delete"; // // DuplicateButton // - this.DuplicateButton.Name = "DuplicateButton"; - this.DuplicateButton.Size = new System.Drawing.Size(164, 22); - this.DuplicateButton.Text = "Duplicate"; + DuplicateButton.Name = "DuplicateButton"; + DuplicateButton.Size = new System.Drawing.Size(203, 22); + DuplicateButton.Text = "Duplicate"; // // Export3DButton // - this.Export3DButton.Name = "Export3DButton"; - this.Export3DButton.Size = new System.Drawing.Size(164, 22); - this.Export3DButton.Text = "Export 3D"; - // - // TranslokatorNewInstanceButton - // - this.TranslokatorNewInstanceButton.Name = "TranslokatorNewInstanceButton"; - this.TranslokatorNewInstanceButton.Size = new System.Drawing.Size(164, 22); - this.TranslokatorNewInstanceButton.Text = "New Instance"; - // - // ActorEntryNewTRObjectButton - // - this.ActorEntryNewTRObjectButton.Name = "ActorEntryNewTRObjectButton"; - this.ActorEntryNewTRObjectButton.Size = new System.Drawing.Size(164, 22); - this.ActorEntryNewTRObjectButton.Text = "New Translokator Object"; + Export3DButton.Name = "Export3DButton"; + Export3DButton.Size = new System.Drawing.Size(203, 22); + Export3DButton.Text = "Export 3D"; // // FrameActions // - this.FrameActions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.UpdateParent1Button, - this.UpdateParent2Button, - this.ExportFrameButton, - this.LinkToActorButton}); - this.FrameActions.Name = "FrameActions"; - this.FrameActions.Size = new System.Drawing.Size(164, 22); - this.FrameActions.Text = "Frame Actions"; + FrameActions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { UpdateParent1Button, UpdateParent2Button, ExportFrameButton, LinkToActorButton }); + FrameActions.Name = "FrameActions"; + FrameActions.Size = new System.Drawing.Size(203, 22); + FrameActions.Text = "Frame Actions"; // // UpdateParent1Button // - this.UpdateParent1Button.Name = "UpdateParent1Button"; - this.UpdateParent1Button.Size = new System.Drawing.Size(166, 22); - this.UpdateParent1Button.Text = "Update Parent 1"; + UpdateParent1Button.Name = "UpdateParent1Button"; + UpdateParent1Button.Size = new System.Drawing.Size(166, 22); + UpdateParent1Button.Text = "Update Parent 1"; // // UpdateParent2Button // - this.UpdateParent2Button.Name = "UpdateParent2Button"; - this.UpdateParent2Button.Size = new System.Drawing.Size(166, 22); - this.UpdateParent2Button.Text = "Update Parent 2"; + UpdateParent2Button.Name = "UpdateParent2Button"; + UpdateParent2Button.Size = new System.Drawing.Size(166, 22); + UpdateParent2Button.Text = "Update Parent 2"; // // ExportFrameButton // - this.ExportFrameButton.Name = "ExportFrameButton"; - this.ExportFrameButton.Size = new System.Drawing.Size(166, 22); - this.ExportFrameButton.Text = "Export Frame"; + ExportFrameButton.Name = "ExportFrameButton"; + ExportFrameButton.Size = new System.Drawing.Size(166, 22); + ExportFrameButton.Text = "Export Frame"; // // LinkToActorButton // - this.LinkToActorButton.Name = "LinkToActorButton"; - this.LinkToActorButton.Size = new System.Drawing.Size(166, 22); - this.LinkToActorButton.Text = "$LINK_TO_ACTOR"; + LinkToActorButton.Name = "LinkToActorButton"; + LinkToActorButton.Size = new System.Drawing.Size(166, 22); + LinkToActorButton.Text = "$LINK_TO_ACTOR"; // - // imageList1 + // TranslokatorNewInstanceButton // - this.imageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit; - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "ActorFrame.png"); - this.imageList1.Images.SetKeyName(1, "AreaFrame.png"); - this.imageList1.Images.SetKeyName(2, "CameraFrame.png"); - this.imageList1.Images.SetKeyName(3, "CollisionFrame.png"); - this.imageList1.Images.SetKeyName(4, "CollisionObject.png"); - this.imageList1.Images.SetKeyName(5, "LightFrame.png"); - this.imageList1.Images.SetKeyName(6, "MeshFrame.png"); - this.imageList1.Images.SetKeyName(7, "Placeholder.png"); - this.imageList1.Images.SetKeyName(8, "SceneObject.png"); - this.imageList1.Images.SetKeyName(9, "SkinnedFrame.png"); - this.imageList1.Images.SetKeyName(10, "DummyFrame.png"); + TranslokatorNewInstanceButton.Name = "TranslokatorNewInstanceButton"; + TranslokatorNewInstanceButton.Size = new System.Drawing.Size(203, 22); + TranslokatorNewInstanceButton.Text = "New Instance"; // - // tooltipPanel + // TRRebuildObjectButton // - this.tooltipPanel.BackColor = System.Drawing.Color.Silver; - this.tooltipPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.tooltipPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tooltipPanel.Controls.Add(tooltipText); - this.tooltipPanel.Location = new System.Drawing.Point(3, 438); - this.tooltipPanel.Name = "tooltipPanel"; - this.tooltipPanel.Size = new System.Drawing.Size(316, 50); - this.tooltipPanel.TabIndex = 1; + TRRebuildObjectButton.Name = "TRRebuildObjectButton"; + TRRebuildObjectButton.Size = new System.Drawing.Size(203, 22); + TRRebuildObjectButton.Text = "Rebuild Object"; // - // tooltipText + // ActorEntryNewTRObjectButton // - this.tooltipText.AutoSize = true; - this.tooltipText.Location = new System.Drawing.Point(-2, 0); - this.tooltipText.Name = "tooltipText"; - this.tooltipText.Size = new System.Drawing.Size(266, 45); - this.tooltipText.TabIndex = 0; - this.tooltipText.Text = "Drag with Left Mouse Button to set Parent1\r\nDrag with Right Mouse Button to set Parent2\r\nDrag with Middle Mouse Button to switch frames"; + ActorEntryNewTRObjectButton.Name = "ActorEntryNewTRObjectButton"; + ActorEntryNewTRObjectButton.Size = new System.Drawing.Size(203, 22); + ActorEntryNewTRObjectButton.Text = "New Translokator Object"; + // + // imageList1 + // + imageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit; + imageList1.ImageStream = (System.Windows.Forms.ImageListStreamer)resources.GetObject("imageList1.ImageStream"); + imageList1.TransparentColor = System.Drawing.Color.Transparent; + imageList1.Images.SetKeyName(0, "ActorFrame.png"); + imageList1.Images.SetKeyName(1, "AreaFrame.png"); + imageList1.Images.SetKeyName(2, "CameraFrame.png"); + imageList1.Images.SetKeyName(3, "CollisionFrame.png"); + imageList1.Images.SetKeyName(4, "CollisionObject.png"); + imageList1.Images.SetKeyName(5, "LightFrame.png"); + imageList1.Images.SetKeyName(6, "MeshFrame.png"); + imageList1.Images.SetKeyName(7, "Placeholder.png"); + imageList1.Images.SetKeyName(8, "SceneObject.png"); + imageList1.Images.SetKeyName(9, "SkinnedFrame.png"); + imageList1.Images.SetKeyName(10, "DummyFrame.png"); + imageList1.Images.SetKeyName(11, "grid.png"); + imageList1.Images.SetKeyName(12, "instance.png"); + imageList1.Images.SetKeyName(13, "object.png"); // // TreeView_Explorer // - this.TreeView_Explorer.CheckBoxes = true; - this.TreeView_Explorer.ContextMenuStrip = this.EntryMenuStrip; - this.TreeView_Explorer.Dock = System.Windows.Forms.DockStyle.Fill; - this.TreeView_Explorer.HideSelection = false; - this.TreeView_Explorer.ImageIndex = 3; - this.TreeView_Explorer.ImageList = this.imageList1; - this.TreeView_Explorer.Location = new System.Drawing.Point(3, 3); - this.TreeView_Explorer.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.TreeView_Explorer.Name = "TreeView_Explorer"; - this.TreeView_Explorer.SelectedImageIndex = 0; - this.TreeView_Explorer.Size = new System.Drawing.Size(316, 485); - this.TreeView_Explorer.TabIndex = 0; - this.TreeView_Explorer.DoubleClick += new System.EventHandler(this.OnDoubleClick); - this.TreeView_Explorer.AllowDrop = true; - this.TreeView_Explorer.ItemDrag += TreeView_Explorer_ItemDrag; - this.TreeView_Explorer.DragEnter += TreeView_Explorer_DragEnter; - this.TreeView_Explorer.DragDrop += TreeView_Explorer_DragDrop; - this.TreeView_Explorer.MouseDown += TreeView_Explorer_MouseDown; - this.TreeView_Explorer.DragOver += TreeView_Explorer_DragOver; - this.TreeView_Explorer.DragLeave += TreeView_Explorer_DragLeave; + TreeView_Explorer.AllowDrop = true; + TreeView_Explorer.CheckBoxes = true; + TreeView_Explorer.ContextMenuStrip = EntryMenuStrip; + TreeView_Explorer.Dock = System.Windows.Forms.DockStyle.Fill; + TreeView_Explorer.HideSelection = false; + TreeView_Explorer.ImageIndex = 3; + TreeView_Explorer.ImageList = imageList1; + TreeView_Explorer.Location = new System.Drawing.Point(3, 3); + TreeView_Explorer.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + TreeView_Explorer.Name = "TreeView_Explorer"; + TreeView_Explorer.SelectedImageIndex = 0; + TreeView_Explorer.Size = new System.Drawing.Size(316, 435); + TreeView_Explorer.TabIndex = 0; + TreeView_Explorer.ItemDrag += TreeView_Explorer_ItemDrag; + TreeView_Explorer.DragDrop += TreeView_Explorer_DragDrop; + TreeView_Explorer.DragEnter += TreeView_Explorer_DragEnter; + TreeView_Explorer.DragOver += TreeView_Explorer_DragOver; + TreeView_Explorer.DragLeave += TreeView_Explorer_DragLeave; + TreeView_Explorer.DoubleClick += OnDoubleClick; + TreeView_Explorer.MouseDown += TreeView_Explorer_MouseDown; // // Tab_Explorer // - this.Tab_Explorer.Controls.Add(this.TabPage_Explorer); - this.Tab_Explorer.Controls.Add(this.TabPage_Searcher); - this.Tab_Explorer.Dock = System.Windows.Forms.DockStyle.Fill; - this.Tab_Explorer.Location = new System.Drawing.Point(0, 0); - this.Tab_Explorer.Name = "Tab_Explorer"; - this.Tab_Explorer.SelectedIndex = 0; - this.Tab_Explorer.Size = new System.Drawing.Size(330, 519); - this.Tab_Explorer.TabIndex = 1; + Tab_Explorer.Controls.Add(TabPage_Explorer); + Tab_Explorer.Controls.Add(TabPage_Searcher); + Tab_Explorer.Dock = System.Windows.Forms.DockStyle.Fill; + Tab_Explorer.Location = new System.Drawing.Point(0, 0); + Tab_Explorer.Name = "Tab_Explorer"; + Tab_Explorer.SelectedIndex = 0; + Tab_Explorer.Size = new System.Drawing.Size(330, 519); + Tab_Explorer.TabIndex = 1; // // TabPage_Explorer // - this.TabPage_Explorer.Controls.Add(this.TreeView_Explorer); - this.TabPage_Explorer.Controls.Add(this.tooltipPanel); - this.TabPage_Explorer.Location = new System.Drawing.Point(4, 24); - this.TabPage_Explorer.Name = "TabPage_Explorer"; - this.TabPage_Explorer.Padding = new System.Windows.Forms.Padding(3); - this.TabPage_Explorer.Size = new System.Drawing.Size(322, 491); - this.TabPage_Explorer.TabIndex = 0; - this.TabPage_Explorer.Text = "tabPage1"; - this.TabPage_Explorer.UseVisualStyleBackColor = true; + TabPage_Explorer.Controls.Add(TreeView_Explorer); + TabPage_Explorer.Controls.Add(tooltipPanel); + TabPage_Explorer.Location = new System.Drawing.Point(4, 24); + TabPage_Explorer.Name = "TabPage_Explorer"; + TabPage_Explorer.Padding = new System.Windows.Forms.Padding(3); + TabPage_Explorer.Size = new System.Drawing.Size(322, 491); + TabPage_Explorer.TabIndex = 0; + TabPage_Explorer.Text = "tabPage1"; + TabPage_Explorer.UseVisualStyleBackColor = true; + // + // tooltipPanel + // + tooltipPanel.BackColor = System.Drawing.Color.Silver; + tooltipPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + tooltipPanel.Controls.Add(tooltipText); + tooltipPanel.Dock = System.Windows.Forms.DockStyle.Bottom; + tooltipPanel.Location = new System.Drawing.Point(3, 438); + tooltipPanel.Name = "tooltipPanel"; + tooltipPanel.Size = new System.Drawing.Size(316, 50); + tooltipPanel.TabIndex = 1; + // + // tooltipText + // + tooltipText.AutoSize = true; + tooltipText.Location = new System.Drawing.Point(-2, 0); + tooltipText.Name = "tooltipText"; + tooltipText.Size = new System.Drawing.Size(266, 45); + tooltipText.TabIndex = 0; + tooltipText.Text = "Drag with Left Mouse Button to set Parent1\r\nDrag with Right Mouse Button to set Parent2\r\nDrag with Middle Mouse Button to switch frames"; // // TabPage_Searcher // - this.TabPage_Searcher.Controls.Add(this.Split_Searcher_Root); - this.TabPage_Searcher.Location = new System.Drawing.Point(4, 24); - this.TabPage_Searcher.Name = "TabPage_Searcher"; - this.TabPage_Searcher.Padding = new System.Windows.Forms.Padding(3); - this.TabPage_Searcher.Size = new System.Drawing.Size(322, 491); - this.TabPage_Searcher.TabIndex = 1; - this.TabPage_Searcher.Text = "tabPage2"; - this.TabPage_Searcher.UseVisualStyleBackColor = true; + TabPage_Searcher.Controls.Add(Split_Searcher_Root); + TabPage_Searcher.Location = new System.Drawing.Point(4, 24); + TabPage_Searcher.Name = "TabPage_Searcher"; + TabPage_Searcher.Padding = new System.Windows.Forms.Padding(3); + TabPage_Searcher.Size = new System.Drawing.Size(322, 491); + TabPage_Searcher.TabIndex = 1; + TabPage_Searcher.Text = "tabPage2"; + TabPage_Searcher.UseVisualStyleBackColor = true; // // Split_Searcher_Root // - this.Split_Searcher_Root.Cursor = System.Windows.Forms.Cursors.HSplit; - this.Split_Searcher_Root.Dock = System.Windows.Forms.DockStyle.Fill; - this.Split_Searcher_Root.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.Split_Searcher_Root.IsSplitterFixed = true; - this.Split_Searcher_Root.Location = new System.Drawing.Point(3, 3); - this.Split_Searcher_Root.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.Split_Searcher_Root.Name = "Split_Searcher_Root"; - this.Split_Searcher_Root.Orientation = System.Windows.Forms.Orientation.Horizontal; + Split_Searcher_Root.Cursor = System.Windows.Forms.Cursors.HSplit; + Split_Searcher_Root.Dock = System.Windows.Forms.DockStyle.Fill; + Split_Searcher_Root.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + Split_Searcher_Root.IsSplitterFixed = true; + Split_Searcher_Root.Location = new System.Drawing.Point(3, 3); + Split_Searcher_Root.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + Split_Searcher_Root.Name = "Split_Searcher_Root"; + Split_Searcher_Root.Orientation = System.Windows.Forms.Orientation.Horizontal; // // Split_Searcher_Root.Panel1 // - this.Split_Searcher_Root.Panel1.Controls.Add(this.Split_Searcher_TextButton); + Split_Searcher_Root.Panel1.Controls.Add(Split_Searcher_TextButton); // // Split_Searcher_Root.Panel2 // - this.Split_Searcher_Root.Panel2.Controls.Add(this.TreeView_Searcher); - this.Split_Searcher_Root.Size = new System.Drawing.Size(316, 485); - this.Split_Searcher_Root.SplitterDistance = 25; - this.Split_Searcher_Root.SplitterWidth = 5; - this.Split_Searcher_Root.TabIndex = 2; + Split_Searcher_Root.Panel2.Controls.Add(TreeView_Searcher); + Split_Searcher_Root.Size = new System.Drawing.Size(316, 485); + Split_Searcher_Root.SplitterDistance = 25; + Split_Searcher_Root.SplitterWidth = 5; + Split_Searcher_Root.TabIndex = 2; // // Split_Searcher_TextButton // - this.Split_Searcher_TextButton.Cursor = System.Windows.Forms.Cursors.VSplit; - this.Split_Searcher_TextButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.Split_Searcher_TextButton.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.Split_Searcher_TextButton.IsSplitterFixed = true; - this.Split_Searcher_TextButton.Location = new System.Drawing.Point(0, 0); - this.Split_Searcher_TextButton.Name = "Split_Searcher_TextButton"; + Split_Searcher_TextButton.Cursor = System.Windows.Forms.Cursors.VSplit; + Split_Searcher_TextButton.Dock = System.Windows.Forms.DockStyle.Fill; + Split_Searcher_TextButton.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + Split_Searcher_TextButton.IsSplitterFixed = true; + Split_Searcher_TextButton.Location = new System.Drawing.Point(0, 0); + Split_Searcher_TextButton.Name = "Split_Searcher_TextButton"; // // Split_Searcher_TextButton.Panel1 // - this.Split_Searcher_TextButton.Panel1.Controls.Add(this.TextBox_Search); + Split_Searcher_TextButton.Panel1.Controls.Add(TextBox_Search); // // Split_Searcher_TextButton.Panel2 // - this.Split_Searcher_TextButton.Panel2.Controls.Add(this.Button_Search); - this.Split_Searcher_TextButton.Size = new System.Drawing.Size(316, 25); - this.Split_Searcher_TextButton.SplitterDistance = 269; - this.Split_Searcher_TextButton.TabIndex = 1; + Split_Searcher_TextButton.Panel2.Controls.Add(Button_Search); + Split_Searcher_TextButton.Size = new System.Drawing.Size(316, 25); + Split_Searcher_TextButton.SplitterDistance = 269; + Split_Searcher_TextButton.TabIndex = 1; // // TextBox_Search // - this.TextBox_Search.Dock = System.Windows.Forms.DockStyle.Fill; - this.TextBox_Search.Location = new System.Drawing.Point(0, 0); - this.TextBox_Search.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.TextBox_Search.Name = "TextBox_Search"; - this.TextBox_Search.Size = new System.Drawing.Size(269, 23); - this.TextBox_Search.TabIndex = 3; - this.TextBox_Search.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TextBox_Search_OnKeyUp); + TextBox_Search.Dock = System.Windows.Forms.DockStyle.Fill; + TextBox_Search.Location = new System.Drawing.Point(0, 0); + TextBox_Search.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + TextBox_Search.Name = "TextBox_Search"; + TextBox_Search.Size = new System.Drawing.Size(269, 23); + TextBox_Search.TabIndex = 3; + TextBox_Search.KeyUp += TextBox_Search_OnKeyUp; // // Button_Search // - this.Button_Search.Dock = System.Windows.Forms.DockStyle.Fill; - this.Button_Search.Location = new System.Drawing.Point(0, 0); - this.Button_Search.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.Button_Search.Name = "Button_Search"; - this.Button_Search.Size = new System.Drawing.Size(43, 25); - this.Button_Search.TabIndex = 0; - this.Button_Search.Text = ">>"; - this.Button_Search.UseVisualStyleBackColor = true; - this.Button_Search.Click += new System.EventHandler(this.Button_Search_OnClick); + Button_Search.Dock = System.Windows.Forms.DockStyle.Fill; + Button_Search.Location = new System.Drawing.Point(0, 0); + Button_Search.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + Button_Search.Name = "Button_Search"; + Button_Search.Size = new System.Drawing.Size(43, 25); + Button_Search.TabIndex = 0; + Button_Search.Text = ">>"; + Button_Search.UseVisualStyleBackColor = true; + Button_Search.Click += Button_Search_OnClick; // // TreeView_Searcher // - this.TreeView_Searcher.CheckBoxes = true; - this.TreeView_Searcher.Dock = System.Windows.Forms.DockStyle.Fill; - this.TreeView_Searcher.HideSelection = false; - this.TreeView_Searcher.ImageIndex = 3; - this.TreeView_Searcher.ImageList = this.imageList1; - this.TreeView_Searcher.Location = new System.Drawing.Point(0, 0); - this.TreeView_Searcher.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.TreeView_Searcher.Name = "TreeView_Searcher"; - this.TreeView_Searcher.SelectedImageIndex = 0; - this.TreeView_Searcher.Size = new System.Drawing.Size(316, 455); - this.TreeView_Searcher.TabIndex = 0; - this.TreeView_Searcher.DoubleClick += new System.EventHandler(this.TreeView_Searcher_OnDoubleClick); - this.TreeView_Searcher.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TreeView_Searcher_OnKeyUp); + TreeView_Searcher.CheckBoxes = true; + TreeView_Searcher.Dock = System.Windows.Forms.DockStyle.Fill; + TreeView_Searcher.HideSelection = false; + TreeView_Searcher.ImageIndex = 3; + TreeView_Searcher.ImageList = imageList1; + TreeView_Searcher.Location = new System.Drawing.Point(0, 0); + TreeView_Searcher.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + TreeView_Searcher.Name = "TreeView_Searcher"; + TreeView_Searcher.SelectedImageIndex = 0; + TreeView_Searcher.Size = new System.Drawing.Size(316, 455); + TreeView_Searcher.TabIndex = 0; + TreeView_Searcher.DoubleClick += TreeView_Searcher_OnDoubleClick; + TreeView_Searcher.KeyUp += TreeView_Searcher_OnKeyUp; // // DockSceneTree // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(330, 519); - this.Controls.Add(this.Tab_Explorer); - this.HideOnClose = true; - this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.MinimumSize = new System.Drawing.Size(301, 39); - this.Name = "DockSceneTree"; - this.TabText = "Scene Outliner"; - this.Text = "DockSceneTree"; - this.EntryMenuStrip.ResumeLayout(false); - this.Tab_Explorer.ResumeLayout(false); - this.TabPage_Explorer.ResumeLayout(false); - this.TabPage_Searcher.ResumeLayout(false); - this.Split_Searcher_Root.Panel1.ResumeLayout(false); - this.Split_Searcher_Root.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.Split_Searcher_Root)).EndInit(); - this.Split_Searcher_Root.ResumeLayout(false); - this.Split_Searcher_TextButton.Panel1.ResumeLayout(false); - this.Split_Searcher_TextButton.Panel1.PerformLayout(); - this.Split_Searcher_TextButton.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.Split_Searcher_TextButton)).EndInit(); - this.Split_Searcher_TextButton.ResumeLayout(false); - this.ResumeLayout(false); - + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + ClientSize = new System.Drawing.Size(330, 519); + Controls.Add(Tab_Explorer); + HideOnClose = true; + Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + MinimumSize = new System.Drawing.Size(301, 39); + Name = "DockSceneTree"; + TabText = "Scene Outliner"; + Text = "DockSceneTree"; + EntryMenuStrip.ResumeLayout(false); + Tab_Explorer.ResumeLayout(false); + TabPage_Explorer.ResumeLayout(false); + tooltipPanel.ResumeLayout(false); + tooltipPanel.PerformLayout(); + TabPage_Searcher.ResumeLayout(false); + Split_Searcher_Root.Panel1.ResumeLayout(false); + Split_Searcher_Root.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)Split_Searcher_Root).EndInit(); + Split_Searcher_Root.ResumeLayout(false); + Split_Searcher_TextButton.Panel1.ResumeLayout(false); + Split_Searcher_TextButton.Panel1.PerformLayout(); + Split_Searcher_TextButton.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)Split_Searcher_TextButton).EndInit(); + Split_Searcher_TextButton.ResumeLayout(false); + ResumeLayout(false); } #endregion @@ -384,5 +384,6 @@ private void InitializeComponent() private System.Windows.Forms.Label tooltipText; public System.Windows.Forms.ToolStripMenuItem TranslokatorNewInstanceButton; public System.Windows.Forms.ToolStripMenuItem ActorEntryNewTRObjectButton; + public System.Windows.Forms.ToolStripMenuItem TRRebuildObjectButton; } } \ No newline at end of file diff --git a/Mafia2Libs/Forms/Docking/DockSceneTree.cs b/Mafia2Libs/Forms/Docking/DockSceneTree.cs index 690b6064..aa1002a0 100644 --- a/Mafia2Libs/Forms/Docking/DockSceneTree.cs +++ b/Mafia2Libs/Forms/Docking/DockSceneTree.cs @@ -302,6 +302,12 @@ private void ApplyImageIndex(TreeNode node) node.SelectedImageIndex = node.ImageIndex = 8; else if (node.Tag.GetType() == typeof(ObjectGroup)) node.SelectedImageIndex = node.ImageIndex = 8; + else if (node.Tag.GetType() == typeof(Grid)) + node.SelectedImageIndex = node.ImageIndex = 11; + else if (node.Tag.GetType() == typeof(Instance)) + node.SelectedImageIndex = node.ImageIndex = 12; + else if (node.Tag.GetType() == typeof(Object)) + node.SelectedImageIndex = node.ImageIndex = 13; else node.SelectedImageIndex = node.ImageIndex = 7; } @@ -318,6 +324,7 @@ private void OpenEntryContext(object sender, System.ComponentModel.CancelEventAr FrameActions.DropDownItems[3].Visible = false; EntryMenuStrip.Items[5].Visible = false; EntryMenuStrip.Items[6].Visible = false; + EntryMenuStrip.Items[7].Visible = false; if (TreeView_Explorer.SelectedNode != null && TreeView_Explorer.SelectedNode.Tag != null) { @@ -362,6 +369,7 @@ private void OpenEntryContext(object sender, System.ComponentModel.CancelEventAr if (TreeView_Explorer.SelectedNode.Tag is Object) { EntryMenuStrip.Items[5].Visible = true; + EntryMenuStrip.Items[7].Visible = true; } if (TreeView_Explorer.SelectedNode.Tag is ActorEntry && hasTranslokatorData) diff --git a/Mafia2Libs/Forms/Docking/DockSceneTree.resx b/Mafia2Libs/Forms/Docking/DockSceneTree.resx index bb8262c1..4ae5ad76 100644 --- a/Mafia2Libs/Forms/Docking/DockSceneTree.resx +++ b/Mafia2Libs/Forms/Docking/DockSceneTree.resx @@ -1,4 +1,64 @@ - + + + @@ -67,114 +127,133 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu - SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAA6hgAAAJNU0Z0AUkBTAIBAQsB - AAHoAQEB6AEBARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAATADAAEBAQABIAYAATBm - AANBAXIQAANHAYPoAANiAe4EAAMNAREDBgEIBAADWgHylwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNcAecDAgEDFAADRgF+AwAB/wNdAdEDFgH+AwAB/wNdAdED - AAH/AzkBXxQAAx4BKwMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf9HAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMrAUELAAH/A10B3wQAAwkBDANQAZoEAgNFAXwDNgFYAwQBBQNQAZwEARQAAyABLQMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf9HAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNWAbAIAANfAeUDYAHzEAADMQFOAxMB - GiAAAyABLQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DIQH7A0IBdQNCAXUDQgF1AwAB/wMAAf9H - AAH/A1kBwQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - DAEPCAADGAEhA04BlA8AAf8DAAH/IAADIAEtAwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - DAEPAwAB/wMbASYDAAH/AwAB/0cAAf8DTgGVAwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - AAH/AwAB/wMAAf8DAAH/AwAB/wMuAUgMAANYAbgDXQHsCAADKAE8AxABFSAAAyABLQMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AzcBWgMAAf8DQwF3AwAB/wMAAf9HAAH/A0wBjgNIAfYDAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DRgF+DAADWwHTAwAB/wgAA0AB - cQMmATkEAAM1AVYDAAH/A0YBgBAAAyABLQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf9HAAH/A1YBtQNNAZIDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DVgG2EAADYQHmCAADFgH+AwAB/wQAAwkBCwNcAfgEAANTAaYDAAH/A0sB - jQQAAyABLQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf9H - AAH/A2AB4AMZASMDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - YgHuEAADVgGzCAADHAEnDAADWAG6CAADWQG+AwgBCgQAAyABLQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf9HAAH/A0AB/QNHAYIDRgGAA0YBgANGAYADRgGAA0YB - gANGAYADRgGAA0YBgANGAYADRgGAA0YBgBgAA1sB2AMWAf4DJAE1A1MBqgNLAY0EAAMqAT8DTAGOFAAD - IAEtAwAB/wMAAf8DAAH/AwAB/wNOAZYDEAEVAxABFQMTARoDAAH/AwAB/wMAAf8DAAH/AwAB/0cAAf8D - AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/GAADUAGfA2AB - 2wMoATsDKwH8AwAB/wNcAecDAAH/A18B2hQAAyABLQMAAf8DAAH/AwAB/wMAAf8DXQHPA0ABbwNAAW8D - QgF0AwAB/wMAAf8DAAH/AwAB/wMAAf9HAAH/AwAB/wMAAf8DAAH/AwAB/wNVAbREAAMcAScIAAMzAVAD - EwEaFAADIAEtAwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /0cAAf8DAAH/AwAB/wMAAf8DAAH/AysBQUQAA2AB2wNfAdUgAAMGAQcDMQFNAzEBTQMxAU0DMQFNAzEB - TQMxAU0DMQFNAzEBTQMxAU0DMQFNAzEBTQMxAU0DMAFKoAADUQH3AwAB//8A/wD/ADMAAyABLgNRAaQD - YQHmA1oB8gNYAb0DNAFUAwIBAygAAwQBBQM6AWIDMAFKJwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/xwAAy4BRwMAAf8DAAH/A14B4iQAAxkBIwNTAacDSAH2AwAB - /wMAAf8DAAH/AwAB/wMAAf8DWwHKAy0BRAQBIAADOQFeAwAB/wMAAf8DEgEYcwAB/wsAAf8kAANaAcQD - AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DLQFEIAADLgFHAwAB/wNBAfkDDgESIwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/AwAB - /wMAAf8DAgEDGAAEAgNOAZcDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A1sB - ygMCAQMgAAMTARoDCQEMcAADUgGgA0gB9ggAAzMBUAMAAf8YAAMeASsDAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DNAFUHAADCQELAyEBLwMhAS8EAiAAA1kBwCgAAxUB - HAMjATIUAAMZASMDAAH/EAADOgFgA1oB9RQAAzoBYAMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - AAH/AwAB/wMAAf8DAAH/AwAB/wNZAb4cAAMmATgDAAH/AwAB/wMMAQ8gAANcAecDSgGLGAADWAG4BAAD - DAEPAwAB/wMMAQ8UAAMWAf4DEAEVFAADYAHzAx4BKhAAA0QBeQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNaAfIcAAMbASUDAAH/AwAB/wNVAa8DAgEDIwAB/wMeASsQ - AANPAZsDYAHjAwUBBgMAAf8DFQEcGwAB/xgAAysBQQNbAdAQAANBAXMDAAH/AyEB+wNaAfUDAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DYQHmHAAEAQM2AVgDAAH/AwAB/wNdAeoDHAEnHAAD - CAEKAwAB/wQBCAADMQFOAwAB/wQBAwAB/wMgAS0fAAH/GAADCgENA1oB8hAAAzQBUwMAAf8DMAFKAz4B - agMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNRAaQkAAMaASQDXQHsAwAB/wNgAdsD - AwEEHAADLQFFAxYB/gQAAxMBGQMAAf8DXgHwAwAB/wMrAUEjAAH/GAADRAF7A1ABmhAAAxIBFwNiAe4D - TQGTAwQBBQNVAa0DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A0gB9gMgAS0UAANGAX4DSgGKAyUB - NggAAz8BbQMAAf8DAAH/AyEBLyAAA1QBqwNbAdMDAAH/AxABFQQAAzgBWyQAA1cBwgNTAacQAAQBAwAB - /xgAAzMBUgMrAfwDKwFBAwMBBAM9AWkDWgH1AwAB/wMAAf8DAAH/AwAB/wMAAf8DUwGnGAADWwHNAwAB - /wNXAbwDAwEEBAEDVgGzAwAB/wMAAf8DGwElJAADXgHwAysBQjQAA2IB7gNcAecDIQEvAwkBCwNEAXsD - AAH/AykBPRwAA0kBhgNAAf0DTQGTAzABSgMhAfsDAAH/AwAB/wMAAf8DAAH/A1oBxAMaASQYAAM9AWgD - AAH/AwAB/wNIAfYDYAHzAwAB/wMAAf8DWAG6aAADLQFGA1sB2ANTAfQDUAGaKAADNAFTA14B7QMAAf8D - AAH/AwAB/wMAAf8DAAH/A04BlyQAA0IBdQNgAeMDKwH8AwAB/wNiAe4DVgGzAwwBEKQAAxIBFwM0AVMD - QQFzA0QBegM6AWADHgErBAL/AFgAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - AAH/AwAB/wMAAf8DAAH/AwAB/5gAAxcBHwNZAbsDWwHKAyQBNB8AAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/5QAAwMBBANWAbMDSQGHAzwBZgNVAbQD - AwEEGwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - AAH/CwAB/wNAAXAUAANHAYIDXwHaAwwBDxcAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/xQAAxMBGQNKAYoEAgQAA0kBhgMuAUgbAAH/AwAB/wMAAf8D - AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8LAAH/A1YBtgMAAf8D - WAG4AykBPgNgAfMDAAH/A1ABnwMAAf8DFgH+AxYB/gMwAUsPAAH/AwAB/wMAAf8DAAH/AwAB/wNcAcsD - MAFKAyEBMANEAXoDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8EAAMzAVEDVgGyA1MBpgNMAZEDUAGcAzYB - WAQBBAADLQFGA1oBxwNLAYwDUgGlA1cBuQM7AWMLAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8LAAH/CAADQAFxAwAB/wMZASMLAAH/BAADDAEPAwAB - /w8AAf8DAAH/AwAB/wMAAf8DMgFPAw8BEwNZAcMDXgHdA0wBjgQCA1sB5AMAAf8DAAH/AwAB/wMAAf8E - AANdAc8DQgF0BAEEAANOAZgDSQGFA1YBswNUAasDSgGJA00BkwMGAQgEAAMoATsDSAH2AwwBEAcAAf8D - AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wsAAf8P - AAH/DwAB/wsAAf8PAAH/AwAB/wMAAf8DVgG1AxgBIQMAAf8DAAH/AwAB/wMAAf8DXwHlAwUBBgMAAf8D - AAH/AwAB/wMAAf8EAANYAboDKwFBCAADVwHCA0YBgAMoATsDIwEyA0YBfgNJAYgDDAEPBAADEgEYA1sB - 0AMCAQMHAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB - /wMAAf8LAAH/DwAB/w8AAf8LAAH/DwAB/wMAAf8DAAH/AxgBIANbAd4DAAH/AwAB/wMAAf8DAAH/AwAB - /wMdASkDWwHTAwAB/wMAAf8DAAH/BAADLQFGA1UBrQMFAQYDMQFNA1kBuwMkATQDVgGwA1kBwQMoATwD - RAF7AzsBZQMIAQoDRgGBAzQBVAsAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D - AAH/AwAB/wMAAf8DAAH/AwAB/wsAAf8PAAH/DwAB/wsAAf8PAAH/AwAB/wMAAf8HAAH/AwAB/wMAAf8D - AAH/AwAB/wMAAf8DPwFtA1MBqgMAAf8DAAH/AwAB/wgAAzgBXQNZAcEDOwFkA0oBigNZAb4DAAH/AwAB - /wNZAcEDIAEtAyoBQANdAc4DTwGbBAEEAAQCAwAB/wNLAYwEAANeAe0DAAH/AyUBNgQAAxYB/gMAAf8D - CQEMAxgBIAMAAf8DFgH+AwIBAwM5AV8LAAH/DwAB/w8AAf8LAAH/DwAB/wMAAf8DAAH/AyQBNQNdAcwD - AAH/AwAB/wMAAf8DAAH/AwAB/wMNAREDYQHmAwAB/wMAAf8DAAH/BAAEAQNGAYADRgF/A0QBeANLAYwD - UwGpAwAB/wMAAf8DVgGwAyMBMwNGAX0DSgGKA1QBqwMJAQsEAANhAesHAAH/A0gB9gNcAcgDXAHIA1wB - yANcAcgDXAHIA1wByANcAcgDXAHIA1wByANcAcgDXAHIA1wByAsAAf8PAAH/DwAB/wsAAf8PAAH/AwAB - /wMAAf8DWwHYAwIBAwMrAfwDAAH/AwAB/wMAAf8DVwG5Aw8BEwMAAf8DWQHvA1MB9AMAAf8EAAM2AVcD - UgGoBAIDKQE9A1kBuwMhAS8DUwGpA1kBvgMpAT0DRAF7AzEBTgQAAz8BbQM7AWMEAAMyAU8DUwH0A0kB - hwMjATMDXgHwA2IB4QM1AVUEAisAAf8PAAH/DwAB/wsAAf8PAAH/AwAB/wMAAf8DAAH/A00BkgQAA0YB - fgNSAaUDJQE2AwkBDANAAf0DAAH/AzsBZANCAXUDAAH/BAADVwHCAyUBNggAA1gBugM/AW0DQgF1AzkB - XgNDAXcDQQFzAwsBDgQAAxIBFwNdAdwDBQEGAwgBCgNdAdEDWQHAA0oB+gMAAf8DYAHgAyABLQNNAZMD - UQH3A0YBfwMJAQscAANdAdwDAAH/A04BlAcAAf8DCQEMA1kBwQMAAf8DAAH/A1oB8gMbASYDAAH/DwAB - /wMAAf8DAAH/AwAB/wMAAf8DKwH8A04BlANFAXwDWgHEAwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/BAAD - XAHIA0sBjwMmATgDJwE6A1gBtwNEAXsDRAF4A0YBgANCAXQDVgGwAygBOwMhATADPwFtA10B7AMKAQ0M - AAMkATUDVQGxA10B3wNNAZIDFgH+AwAB/wNdAdEDPQFnA14B7QNSAagDEwEaGAADTgGUAwAB/wMAAf8D - FgH+AzoBYAgAAxwBJwNaAfIDAAH/DAADBQEGAwUBBgMFAQYDEAEVAwAB/wMAAf8DAAH/AwAB/wMAAf8D - AAH/A1sB5AMFAQYDBQEGAwUBBgQBBAADIgExA1YBswNZAcMDUAGcA0YBgQMmATgIAAMbASUDWAG6A0wB - kQNZAcEDWAG6AyYBOBwAAxUBHANKAYsDIQH7A08BmwNVAbQDAAH/AwAB/wNWAbUDYQHmA0QBehgABAEY - AAQCGAAEAgNAAf0DAAH/AwAB/wMAAf8DAAH/AwAB/wNTAakkAAMSARgDUQGhBAEEAANQAZoDJgE5OAAD - CAEKAzgBWwMWAf4DXQHMAwkBCwNUAasDEwEalAADAgEDA1EBogNOAZgDQwF2A1MBqUwAAx4BKgNbAeSc - AAQCA1YBsgNeAdcDEwEZGAABQgFNAT4HAAE+AwABKAMAAUADAAEwAwABAQEAAQEFAAGAAQEWAAP/AQAC - /wH7Ad8C/wIAAv8B+gFfAv8DAAEBAfABDwGAAQEDAAEBAZABDwGAAQEDAAEBAZ4BfwGAAQEEAAHOAX8B - gAEBBAAB5gF/AYABAQQAAeYBRwGAAQEEAAH2AUgBgAEBBAAB9gHsAYABAQMAAQMB8AFPAYABAQMAAQMB - 8AEPAYABAQIAAQMB/wH+Ac8BgAEBAgABAwH/Af4BfwGAAQECAAL/Af4BfwL/AgAG/wIADP8B+AEPAfwB - fwHAAQEB/AE/AeABAwH8AT8C/wH9Ab8B4AEDAfwBPwHAAQEB/AEfAYABAQH+AX8C/wH5AZ8BgAEBAfwB - PwHfAfkB8wHPAYABAQH8AT8BzwHRAfMB5wGAAQEB/AEfAecBgwH3AecBgAEBAfwBDwHjAQcB9wHnAYAB - AQH/AQcB8gEPAfcB5wGAAQEB8QGHAfgBXwHzAc8BwAEDAfABBwH8Af8B+AEPAeABAwHwAQ8C/wH8AT8B - 8AEPAfgBDwT/AfgBDwr/AYABAAT/AfwBPwGAAQAE/wH4AR8BgAEAAc8BjwGAAQAB+AGfAYABAAHAAQMB - gAEAAYABgQGAAQAB2AHTAYABAAGIAQgBgAEAAd0B2wGAAQABmAEIAYABAAHdAdsBgAEAAYABAQGAAQAB - 3QHbAYgBAAHAAQEBEQEAAd0B2wGAAQABgAEBAUABAAHdAdsBgAEAAYABCQEAAf8B3QHbAYIBAAGYAQgB - AAEfAcQBAwGAAQABgAEAAeABAwHwAWMBgAEAAoEB/AEAAf0B+wHwAQ8B+AGfAf8BgAT/AfgBPwH/AfkE - /wH8AT8L + SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAcB0AAAJNU0Z0AUkBTAIBAQ4C + AAECAQABAgEQAQABEAEABP8BIQEACP8BQgFNATYHAAE2AwABKAMAAUADAAFAAwABAQEAASAGAAFAEwAB + /wENAf8BAAH/AQ0B/wEAAf8BDQH/AUkBfAFMAcMkAAH/AR4BAAL/AR4BAAL/AR4BAAH/KAADHwHRAgAB + BgH/AwAB/wMAAf8CAAHrAf+FAAH/AQ0B/wEAAf8BDQH/AQAB/wENAf8BAAH/AQ0B/yAAAf8BHgEAAv8B + HgEAAv8BHgEAAv8BHgEAAf8kAAIiAS0BNAMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/4EAAf8BDQH/AQAB + /wENAf8BAAH/AQ0B/wEAAf8BDQH/AQAB/wENAf8YAAMyAU8B/wEeAQAC/wEeAQAC/wEeAQAC/wEeAQAB + /ycAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf+EAAMDAQQBAAH/AQ0B/wEAAf8BDQH/AQAB/wENAf8B + GwHWASUB8hQAAf8BHgEAAv8BHgEAAv8BHgEAAf8BTwJJAYoqAAHtAf8DAAH/AwAB/wMAAf8DjQH/AwcB + /wMAAf+MAAEvAbABNgHkAQAB/wENAf8BAAH/AQ0B/wMGAQcMAAH/AR4BAAL/AR4BAAL/AR4BAAH/MAAC + AgH8Af0DAAH/AwAB/wMEBf8DhwH/AgABBgH/lQAB/wENAf8BAAH/AQ0B/wgAAw8BEwH/AR4BAAH/AZAB + SgFAAdI6AAGZAf8DAAH/AwAB/wMEAf8DAAH/Ah4BywHSmAABTQFcAU4BoAEAAf8BDQH/BAAB/wEeAQAB + /zgAAwUBBgIAAfwB/wQAAgIB+QH8AgABGgH/AgAC/wMhATGkAAFpAUkBYwHMOAADBAEFAgABFgH/AgAC + /7oAAv80AAMEAQUCAAEXAf8DAAH/vgAC/zAAAwQBBQIAARcB/wIAAv+8AAMCAQMCAAL/JAADIgHMAyIB + zAQAAi4BSAFSAwAB/8AAAk4BagGxAgAC/yMAAf8DAAH/AwAB/wMAAf/KAAL/AgAC/wJMAW0BthgAAyIB + ywMAAf8DAAH/AwAB/wMAAf8DIgHMxgAC/wIAAv8CAAL/GAADJAHIAwAB/wMAAf8D7wH/AwAB/wMiAczG + AAL/AgAC/wIAAv8fAAH/AwAB/wNjAf8DAAH/ygAC/wIAAv8CAAL/IAADJAHIAyQByP8ABQADQQFyEAAD + RwGD6AADYgHuBAADDQERAwYBCAQAA1oB8pcAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DXAHnAwIBAxQAA0YBfgMAAf8DXQHRAxkB/gMAAf8DXQHRAwAB/wM5AV8U + AAMeASsDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/EAAD + PAX/AwAB/wMAAf8DAAH/A8MF/wMAAf8DAAH/AwAB/wMAAf8LAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMrAUELAAH/A10B3wQAAwkBDANQAZoEAgNFAXwD + NgFYAwQBBQNQAZwEARQAAyABLQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8QAAM8Kf8LAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wNWAbAIAANfAeUDYAHzEAADMQFOAxMBGiAAAyABLQMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DIQH7A0IBdQNCAXUDQgF1AwAB/wMAAf8QAAM8Jf8DAAH/CwAB/wNZAcEDAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwwBDwgAAxgBIQNOAZQP + AAH/AwAB/yAAAyABLQMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwwBDwMAAf8DGwEmAwAB + /wMAAf8QAAN9Jf8DAAH/CwAB/wNOAZUDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/Ay4BSAwAA1gBuANdAewIAAMoATwDEAEVIAADIAEtAwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DNwFaAwAB/wNDAXcDAAH/AwAB/xAAKP8DAAH/CwAB/wNMAY4DSAH2AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A0YBfgwAA1sB0wMAAf8I + AANAAXEDJgE5BAADNQFWAwAB/wNGAYAQAAMgAS0DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/EAADYyX/AwAB/wsAAf8DVgG1A00BkgMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNWAbYQAANhAeYIAAMZAf4DAAH/BAADCQELA1wB + +AQAA1MBpgMAAf8DSwGNBAADIAEtAwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/xAAAzwp/wsAAf8DYAHgAxkBIwMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wNiAe4QAANWAbMIAAMcAScMAANYAboIAANZAb4DCAEKBAADIAEtAwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/xAAAzwp/wsAAf8D + QAH9A0cBggNGAYADRgGAA0YBgANGAYADRgGAA0YBgANGAYADRgGAA0YBgANGAYADRgGAGAADWwHYAxkB + /gMkATUDUwGqA0sBjQQAAyoBPwNMAY4UAAMgAS0DAAH/AwAB/wMAAf8DAAH/A04BlgMQARUDEAEVAxMB + GgMAAf8DAAH/AwAB/wMAAf8DAAH/EAADPCX/AwAB/wsAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/GAADUAGfA2AB2wMoATsDKwH8AwAB/wNcAecDAAH/A18B + 2hQAAyABLQMAAf8DAAH/AwAB/wMAAf8DXQHPA0ABbwNAAW8DQgF0AwAB/wMAAf8DAAH/AwAB/wMAAf8Q + ACj/AwAB/wsAAf8DAAH/AwAB/wMAAf8DAAH/A1UBtEQAAxwBJwgAAzMBUAMTARoUAAMgAS0DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/EAADMwH/AzMB/wMzCf8D + MwH/AzMB/wMzAf8DMwX/AwAB/wsAAf8DAAH/AwAB/wMAAf8DAAH/AysBQUQAA2AB2wNfAdUgAAMGAQcD + MQFNAzEBTQMxAU0DMQFNAzEBTQMxAU0DMQFNAzEBTQMxAU0DMQFNAzEBTQMxAU0DMAFKoAADUQH3AwAB + //8A/wD/ADMAAyABLgNRAaQDYQHmA1oB8gNYAb0DNAFUAwIBAygAAwQBBQM6AWIDMAFKJwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/xwAAy4BRwMAAf8DAAH/A14B + 4iQAAxkBIwNTAacDSAH2AwAB/wMAAf8DAAH/AwAB/wMAAf8DWwHKAy0BRAQBIAADOQFeAwAB/wMAAf8D + EgEYcwAB/wsAAf8kAANaAcQDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DLQFEIAAD + LgFHAwAB/wNBAfkDDgESIwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/x8AAf8DAAH/AwAB/wMAAf8DAgEDGAAEAgNOAZcDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/A1sBygMCAQMgAAMTARoDCQEMcAADUgGgA0gB9ggAAzMBUAMAAf8YAAMeASsD + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DNAFUHAADCQELAyEB + LwMhAS8EAiAAA1kBwCgAAxUBHAMjATIUAAMZASMDAAH/EAADOgFgA1oB9RQAAzoBYAMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNZAb4cAAMmATgDAAH/AwAB/wMMAQ8g + AANcAecDSgGLGAADWAG4BAADDAEPAwAB/wMMAQ8UAAMZAf4DEAEVFAADYAHzAx4BKhAAA0QBeQMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNaAfIcAAMbASUDAAH/AwAB + /wNVAa8DAgEDIwAB/wMeASsQAANPAZsDYAHjAwUBBgMAAf8DFQEcGwAB/xgAAysBQQNbAdAQAANBAXMD + AAH/AyEB+wNaAfUDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DYQHmHAAEAQM2AVgD + AAH/AwAB/wNdAeoDHAEnHAADCAEKAwAB/wQBCAADMQFOAwAB/wQBAwAB/wMgAS0fAAH/GAADCgENA1oB + 8hAAAzQBUwMAAf8DMAFKAz4BagMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNRAaQk + AAMaASQDXQHsAwAB/wNgAdsDAwEEHAADLQFFAxkB/gQAAxMBGQMAAf8DXgHwAwAB/wMrAUEjAAH/GAAD + RAF7A1ABmhAAAxIBFwNiAe4DTQGTAwQBBQNVAa0DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A0gB + 9gMgAS0UAANGAX4DSgGKAyUBNggAAz8BbQMAAf8DAAH/AyEBLyAAA1QBqwNbAdMDAAH/AxABFQQAAzgB + WyQAA1cBwgNTAacQAAQBAwAB/xgAAzMBUgMrAfwDKwFBAwMBBAM9AWkDWgH1AwAB/wMAAf8DAAH/AwAB + /wMAAf8DUwGnGAADWwHNAwAB/wNXAbwDAwEEBAEDVgGzAwAB/wMAAf8DGwElJAADXgHwAysBQjQAA2IB + 7gNcAecDIQEvAwkBCwNEAXsDAAH/AykBPRwAA0kBhgNAAf0DTQGTAzABSgMhAfsDAAH/AwAB/wMAAf8D + AAH/A1oBxAMaASQYAAM9AWgDAAH/AwAB/wNIAfYDYAHzAwAB/wMAAf8DWAG6aAADLQFGA1sB2ANTAfQD + UAGaKAADNAFTA14B7QMAAf8DAAH/AwAB/wMAAf8DAAH/A04BlyQAA0IBdQNgAeMDKwH8AwAB/wNiAe4D + VgGzAwwBEKQAAxIBFwM0AVMDQQFzA0QBegM6AWADHgErBAL/AFgAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/5gAAxcBHwNZAbsDWwHKAyQBNB8AAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/5QAAwMB + BANWAbMDSQGHAzwBZgNVAbQDAwEEGwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/CwAB/wNAAXAUAANHAYIDXwHaAwwBDxcAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/xQAAxMBGQNKAYoEAgQAA0kB + hgMuAUgbAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8LAAH/A1YBtgMAAf8DWAG4AykBPgNgAfMDAAH/A1ABnwMAAf8DGQH+AxkB/gMwAUsPAAH/AwAB + /wMAAf8DAAH/AwAB/wNcAcsDMAFKAyEBMANEAXoDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8EAAMzAVED + VgGyA1MBpgNMAZEDUAGcAzYBWAQBBAADLQFGA1oBxwNLAYwDUgGlA1cBuQM7AWMLAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8LAAH/CAADQAFxAwAB + /wMZASMLAAH/BAADDAEPAwAB/w8AAf8DAAH/AwAB/wMAAf8DMgFPAw8BEwNZAcMDXgHdA0wBjgQCA1sB + 5AMAAf8DAAH/AwAB/wMAAf8EAANdAc8DQgF0BAEEAANOAZgDSQGFA1YBswNUAasDSgGJA00BkwMGAQgE + AAMoATsDSAH2AwwBEAcAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wsAAf8PAAH/DwAB/wsAAf8PAAH/AwAB/wMAAf8DVgG1AxgBIQMAAf8DAAH/AwAB + /wMAAf8DXwHlAwUBBgMAAf8DAAH/AwAB/wMAAf8EAANYAboDKwFBCAADVwHCA0YBgAMoATsDIwEyA0YB + fgNJAYgDDAEPBAADEgEYA1sB0AMCAQMHAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8LAAH/DwAB/w8AAf8LAAH/DwAB/wMAAf8DAAH/AxgBIANbAd4D + AAH/AwAB/wMAAf8DAAH/AwAB/wMdASkDWwHTAwAB/wMAAf8DAAH/BAADLQFGA1UBrQMFAQYDMQFNA1kB + uwMkATQDVgGwA1kBwQMoATwDRAF7AzsBZQMIAQoDRgGBAzQBVAsAAf8DAAH/AwAB/wMAAf8DAAH/AwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wsAAf8PAAH/DwAB/wsAAf8PAAH/AwAB + /wMAAf8HAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DPwFtA1MBqgMAAf8DAAH/AwAB/wgAAzgBXQNZAcED + OwFkA0oBigNZAb4DAAH/AwAB/wNZAcEDIAEtAyoBQANdAc4DTwGbBAEEAAQCAwAB/wNLAYwEAANeAe0D + AAH/AyUBNgQAAxkB/gMAAf8DCQEMAxgBIAMAAf8DGQH+AwIBAwM5AV8LAAH/DwAB/w8AAf8LAAH/DwAB + /wMAAf8DAAH/AyQBNQNdAcwDAAH/AwAB/wMAAf8DAAH/AwAB/wMNAREDYQHmAwAB/wMAAf8DAAH/BAAE + AQNGAYADRgF/A0QBeANLAYwDUwGpAwAB/wMAAf8DVgGwAyMBMwNGAX0DSgGKA1QBqwMJAQsEAANhAesH + AAH/A0gB9gNcAcgDXAHIA1wByANcAcgDXAHIA1wByANcAcgDXAHIA1wByANcAcgDXAHIA1wByAsAAf8P + AAH/DwAB/wsAAf8PAAH/AwAB/wMAAf8DWwHYAwIBAwMrAfwDAAH/AwAB/wMAAf8DVwG5Aw8BEwMAAf8D + WQHvA1MB9AMAAf8EAAM2AVcDUgGoBAIDKQE9A1kBuwMhAS8DUwGpA1kBvgMpAT0DRAF7AzEBTgQAAz8B + bQM7AWMEAAMyAU8DUwH0A0kBhwMjATMDXgHwA2IB4QM1AVUEAisAAf8PAAH/DwAB/wsAAf8PAAH/AwAB + /wMAAf8DAAH/A00BkgQAA0YBfgNSAaUDJQE2AwkBDANAAf0DAAH/AzsBZANCAXUDAAH/BAADVwHCAyUB + NggAA1gBugM/AW0DQgF1AzkBXgNDAXcDQQFzAwsBDgQAAxIBFwNdAdwDBQEGAwgBCgNdAdEDWQHAA00B + +gMAAf8DYAHgAyABLQNNAZMDUQH3A0YBfwMJAQscAANdAdwDAAH/A04BlAcAAf8DCQEMA1kBwQMAAf8D + AAH/A1oB8gMbASYDAAH/DwAB/wMAAf8DAAH/AwAB/wMAAf8DKwH8A04BlANFAXwDWgHEAwAB/wMAAf8D + AAH/AwAB/wMAAf8DAAH/BAADXAHIA0sBjwMmATgDJwE6A1gBtwNEAXsDRAF4A0YBgANCAXQDVgGwAygB + OwMhATADPwFtA10B7AMKAQ0MAAMkATUDVQGxA10B3wNNAZIDGQH+AwAB/wNdAdEDPQFnA14B7QNSAagD + EwEaGAADTgGUAwAB/wMAAf8DGQH+AzoBYAgAAxwBJwNaAfIDAAH/DAADBQEGAwUBBgMFAQYDEAEVAwAB + /wMAAf8DAAH/AwAB/wMAAf8DAAH/A1sB5AMFAQYDBQEGAwUBBgQBBAADIgExA1YBswNZAcMDUAGcA0YB + gQMmATgIAAMbASUDWAG6A0wBkQNZAcEDWAG6AyYBOBwAAxUBHANKAYsDIQH7A08BmwNVAbQDAAH/AwAB + /wNWAbUDYQHmA0QBehgABAEYAAQCGAAEAgNAAf0DAAH/AwAB/wMAAf8DAAH/AwAB/wNTAakkAAMSARgD + UQGhBAEEAANQAZoDJgE5OAADCAEKAzgBWwMZAf4DXQHMAwkBCwNUAasDEwEalAADAgEDA1EBogNOAZgD + QwF2A1MBqUwAAx4BKgNbAeScAAQCA1YBsgNeAdcDEwEZGAABQgFNAT4HAAE+AwABKAMAAUADAAFAAwAB + AQEAAQEGAAECFgAD/wEAAQ8B+AH/AcEEAAEPAfAB/wGABAABBwHgAf8BgAQAAYMB4QH/AYAEAAHhAccB + /wGABAAB+QGPAf8BwAQAAfwBvwH/ASEEAAH/AX8B/gE/BAAB/wF/AfwBfwQAAf8BfwH4Af8EAAH+AX8B + yQH/BAAB/gF/AYcB/wQAAf4BPwEDAf8EAAH+AT8BAwH/BAAB/gE/AYcB/wQAAf4BPwHPAf8EAAL/AfsB + 3wb/AfoBXwT/AQABAQHwAQ8BgAEBAeABAwEAAQEBkAEPAYABAQHgAQMBAAEBAZ4BfwGAAQEB4AEDAgAB + zgF/AYABAQHgAQMCAAHmAX8BgAEBAeABAwIAAeYBRwGAAQEB4AEDAgAB9gFIAYABAQHgAQMCAAH2AewB + gAEBAeABAwEAAQMB8AFPAYABAQHgAQMBAAEDAfABDwGAAQEB4AIDAf8B/gHPAYABAQHgAgMB/wH+AX8B + gAEBBP8B/gF/GP8B+AEPAfwBfwHAAQEB/AE/AeABAwH8AT8C/wH9Ab8B4AEDAfwBPwHAAQEB/AEfAYAB + AQH+AX8C/wH5AZ8BgAEBAfwBPwHfAfkB8wHPAYABAQH8AT8BzwHRAfMB5wGAAQEB/AEfAecBgwH3AecB + gAEBAfwBDwHjAQcB9wHnAYABAQH/AQcB8gEPAfcB5wGAAQEB8QGHAfgBXwHzAc8BwAEDAfABBwH8Af8B + +AEPAeABAwHwAQ8C/wH8AT8B8AEPAfgBDwT/AfgBDwr/AYABAAT/AfwBPwGAAQAE/wH4AR8BgAEAAc8B + jwGAAQAB+AGfAYABAAHAAQMBgAEAAYABgQGAAQAB2AHTAYABAAGIAQgBgAEAAd0B2wGAAQABmAEIAYAB + AAHdAdsBgAEAAYABAQGAAQAB3QHbAYgBAAHAAQEBEQEAAd0B2wGAAQABgAEBAUABAAHdAdsBgAEAAYAB + CQEAAf8B3QHbAYIBAAGYAQgBAAEfAcQBAwGAAQABgAEAAeABAwHwAWMBgAEAAoEB/AEAAf0B+wHwAQ8B + +AGfAf8BgAT/AfgBPwH/AfkE/wH8AT8L \ No newline at end of file diff --git a/Mafia2Libs/Forms/MapEditor.cs b/Mafia2Libs/Forms/MapEditor.cs index e6518ac7..1b8a73f2 100644 --- a/Mafia2Libs/Forms/MapEditor.cs +++ b/Mafia2Libs/Forms/MapEditor.cs @@ -153,6 +153,7 @@ private void InitDockingControls() dPropertyGrid.OnObjectUpdated += ApplyEntryChanges; dSceneTree.TranslokatorNewInstanceButton.Click += new EventHandler(TranslokatorNewInstanceButton_Click); dSceneTree.ActorEntryNewTRObjectButton.Click += new EventHandler(ActorEntryNewTRObjectButton_Click); + dSceneTree.TRRebuildObjectButton.Click += new EventHandler(TRRebuildObjectButton_Click); } private void RenderPanel_MouseWheel(object sender, MouseEventArgs e) @@ -1869,6 +1870,7 @@ private void OnPropertyValueChanged(object s, PropertyValueChangedEventArgs e) { Graphics.InstanceGizmo.UpdateInstanceBuffer(instance, Graphics.GetId3D11Device()); } + dPropertyGrid.SetObject(instance);//this is done so edit transforms tab updates as it didnt happen before } if (pGrid.SelectedObject is Grid trGrid) { @@ -2850,6 +2852,36 @@ private void RebuildTranslokatorGrids() } } } + + private void TRRebuildObjectButton_Click(object sender, EventArgs e) + { + TreeNode ObjectNode = dSceneTree.SelectedNode; + Object obj = ObjectNode.Tag as Object; + if (ObjectNode == null || obj == null || ObjectNode.Nodes.Count == 0) + { + return; + } + FrameObjectBase groupRef = SceneData.FrameResource.GetObjectByHash(obj.Name.Hash); + + foreach (TreeNode instanceNode in ObjectNode.Nodes)//deleting all instances under selected object and rebuilding them + { + Instance instance = instanceNode.Tag as Instance; + if (groupRef != null && groupRef.HasMeshObject()) + { + Graphics.DeleteInstance(instance.RefID);//in case the object didnt have mesh before, so there are no duplicates + Graphics.DeleteInstance(groupRef,instance.RefID);//maybe add optionable bool to delete in rendermodel so it doesnt reload every instance here + for (int i = 0; i < groupRef.Children.Count; i++) + { + InstanceTranslokatorPart(Graphics.Assets, groupRef.Children[i], Matrix4x4.Identity, instance,true); + } + } + else + { + Graphics.DeleteInstance(instance.RefID); + Graphics.InstanceGizmo.InstanceTranslokator(instance,Graphics.GetId3D11Device()); + } + } + } } } diff --git a/Mafia2Libs/Rendering/Graphics/Shaders/BaseShader.cs b/Mafia2Libs/Rendering/Graphics/Shaders/BaseShader.cs index bc07ccca..6990c7fd 100644 --- a/Mafia2Libs/Rendering/Graphics/Shaders/BaseShader.cs +++ b/Mafia2Libs/Rendering/Graphics/Shaders/BaseShader.cs @@ -310,7 +310,7 @@ public virtual void Render(ID3D11DeviceContext context, PrimitiveTopology type, context.GSSetShader(OurGeometryShader); } - context.DrawIndexed(size, (int)offset, 0); //Don't wanna see other meshes when testing instances + context.DrawIndexed(size, (int)offset, 0); Profiler.NumDrawCallsThisFrame++; }