mirror of
https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker
synced 2026-05-14 12:54:46 +08:00
Ability to edit YTYP files and MLO Entity Defintions + Revisions to grass brush (#33)
* - Add ability to edit/add ytyp files to project. - Add ability to edit/add ytyp archetype files to ytyp. - Add ability to add/remove entities from mlo archetype defs. - Add ability to save ytyp files. - Add dialog popup before optimizing grass batches. - Fix grass batches not being selected when chaning selection in project explorer. - Merged with upstream/master. - Squashed last 4 commits for PR cleanliness. * Fixed windows forms reference error. * - Added error checking to deleting mlo entities. - Fixed various bugs with deleting mlo entities. - Fixed edit archetype panel Asset Type box. - Removed redundant/unnecessary. - Removed backwards references between MCEntityDef and YmapEntityDef. All ymap entity to mcentity references are grabbed using indecies in the MloInstanceData class. - Fixed "YmapMenu" not showing when selecting entities/mlo entities in project form. Current bugs: - Loading a ytyp file -- mlo entities are not editiable, and are created in the world. - entitysets are not editable (properly). - Removing an mloinstancedef from a ymap does not delete the mlo instance's gizmo from the world, and it's still selectable. (Although all references are lost, and I believe collected by the GC?) * - Moved archetype initialization methods YmapFile.InitYmapEntityArchetypes(GameFileCache gfc) and MloInstanceData.InitYmapEntityArchetypes(GameFileCache gfc) - Added ability to load mlo instance defs through ymap files. - Fixed add method for mlo archetypes. * - Removed SetOrientationInv. - Removed unreachable code + updated comment. - Renamed CreateEntity to CreateYmapEntity, and renamed params for consistency. * Split calls to CreateYmapEntity() and MloArchetype.AddEntity(). * Fixed redundant rotation inversions. * - Added ability to select rooms. - Changed tree view grouping for mlo entities. - Fixed projectexplorer selection bugs. - Added ability to toggle mlo entity sets. - Fixed some change events when editing archetypes.
This commit is contained in:
committed by
dexyfex
Unverified
parent
4da1e3d8c7
commit
462e464c2f
Generated
+29
-8
@@ -155,6 +155,8 @@
|
||||
this.ToolbarSaveButton = new System.Windows.Forms.ToolStripButton();
|
||||
this.ToolbarSaveAllButton = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.YtypMloToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.YtypMloNewEntityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.MainMenu.SuspendLayout();
|
||||
this.MainToolbar.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
@@ -282,54 +284,54 @@
|
||||
// FileOpenProjectMenu
|
||||
//
|
||||
this.FileOpenProjectMenu.Name = "FileOpenProjectMenu";
|
||||
this.FileOpenProjectMenu.Size = new System.Drawing.Size(149, 22);
|
||||
this.FileOpenProjectMenu.Size = new System.Drawing.Size(152, 22);
|
||||
this.FileOpenProjectMenu.Text = "Project...";
|
||||
this.FileOpenProjectMenu.Click += new System.EventHandler(this.FileOpenProjectMenu_Click);
|
||||
//
|
||||
// toolStripSeparator9
|
||||
//
|
||||
this.toolStripSeparator9.Name = "toolStripSeparator9";
|
||||
this.toolStripSeparator9.Size = new System.Drawing.Size(146, 6);
|
||||
this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6);
|
||||
//
|
||||
// FileOpenYmapMenu
|
||||
//
|
||||
this.FileOpenYmapMenu.Name = "FileOpenYmapMenu";
|
||||
this.FileOpenYmapMenu.Size = new System.Drawing.Size(149, 22);
|
||||
this.FileOpenYmapMenu.Size = new System.Drawing.Size(152, 22);
|
||||
this.FileOpenYmapMenu.Text = "Ymap File...";
|
||||
this.FileOpenYmapMenu.Click += new System.EventHandler(this.FileOpenYmapMenu_Click);
|
||||
//
|
||||
// FileOpenYtypMenu
|
||||
//
|
||||
this.FileOpenYtypMenu.Name = "FileOpenYtypMenu";
|
||||
this.FileOpenYtypMenu.Size = new System.Drawing.Size(149, 22);
|
||||
this.FileOpenYtypMenu.Size = new System.Drawing.Size(152, 22);
|
||||
this.FileOpenYtypMenu.Text = "Ytyp File...";
|
||||
this.FileOpenYtypMenu.Click += new System.EventHandler(this.FileOpenYtypMenu_Click);
|
||||
//
|
||||
// FileOpenYndMenu
|
||||
//
|
||||
this.FileOpenYndMenu.Name = "FileOpenYndMenu";
|
||||
this.FileOpenYndMenu.Size = new System.Drawing.Size(149, 22);
|
||||
this.FileOpenYndMenu.Size = new System.Drawing.Size(152, 22);
|
||||
this.FileOpenYndMenu.Text = "Ynd File...";
|
||||
this.FileOpenYndMenu.Click += new System.EventHandler(this.FileOpenYndMenu_Click);
|
||||
//
|
||||
// FileOpenYnvMenu
|
||||
//
|
||||
this.FileOpenYnvMenu.Name = "FileOpenYnvMenu";
|
||||
this.FileOpenYnvMenu.Size = new System.Drawing.Size(149, 22);
|
||||
this.FileOpenYnvMenu.Size = new System.Drawing.Size(152, 22);
|
||||
this.FileOpenYnvMenu.Text = "Ynv File...";
|
||||
this.FileOpenYnvMenu.Click += new System.EventHandler(this.FileOpenYnvMenu_Click);
|
||||
//
|
||||
// FileOpenTrainsMenu
|
||||
//
|
||||
this.FileOpenTrainsMenu.Name = "FileOpenTrainsMenu";
|
||||
this.FileOpenTrainsMenu.Size = new System.Drawing.Size(149, 22);
|
||||
this.FileOpenTrainsMenu.Size = new System.Drawing.Size(152, 22);
|
||||
this.FileOpenTrainsMenu.Text = "Trains File...";
|
||||
this.FileOpenTrainsMenu.Click += new System.EventHandler(this.FileOpenTrainsMenu_Click);
|
||||
//
|
||||
// FileOpenScenarioMenu
|
||||
//
|
||||
this.FileOpenScenarioMenu.Name = "FileOpenScenarioMenu";
|
||||
this.FileOpenScenarioMenu.Size = new System.Drawing.Size(149, 22);
|
||||
this.FileOpenScenarioMenu.Size = new System.Drawing.Size(152, 22);
|
||||
this.FileOpenScenarioMenu.Text = "Scenario File...";
|
||||
this.FileOpenScenarioMenu.Click += new System.EventHandler(this.FileOpenScenarioMenu_Click);
|
||||
//
|
||||
@@ -594,6 +596,7 @@
|
||||
this.YtypNameMenu,
|
||||
this.toolStripSeparator13,
|
||||
this.YtypNewArchetypeMenu,
|
||||
this.YtypMloToolStripMenuItem,
|
||||
this.toolStripSeparator15,
|
||||
this.YtypAddToProjectMenu,
|
||||
this.YtypRemoveFromProjectMenu});
|
||||
@@ -1174,6 +1177,22 @@
|
||||
this.toolStripSeparator5.Name = "toolStripSeparator5";
|
||||
this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// YtypMloToolStripMenuItem
|
||||
//
|
||||
this.YtypMloToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.YtypMloNewEntityToolStripMenuItem});
|
||||
this.YtypMloToolStripMenuItem.Enabled = false;
|
||||
this.YtypMloToolStripMenuItem.Name = "YtypMloToolStripMenuItem";
|
||||
this.YtypMloToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
|
||||
this.YtypMloToolStripMenuItem.Text = "Mlo";
|
||||
//
|
||||
// YtypMloNewEntityToolStripMenuItem
|
||||
//
|
||||
this.YtypMloNewEntityToolStripMenuItem.Name = "YtypMloNewEntityToolStripMenuItem";
|
||||
this.YtypMloNewEntityToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.YtypMloNewEntityToolStripMenuItem.Text = "New Entity";
|
||||
this.YtypMloNewEntityToolStripMenuItem.Click += new System.EventHandler(this.YtypMloNewEntityToolStripMenuItem_Click);
|
||||
//
|
||||
// ProjectForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@@ -1325,5 +1344,7 @@
|
||||
private System.Windows.Forms.ToolStripMenuItem ScenarioAddToProjectMenu;
|
||||
private System.Windows.Forms.ToolStripMenuItem ScenarioRemoveFromProjectMenu;
|
||||
private System.Windows.Forms.ToolStripMenuItem YmapNewGrassBatchMenu;
|
||||
private System.Windows.Forms.ToolStripMenuItem YtypMloToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem YtypMloNewEntityToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user