mirror of
https://github.com/KillzXGaming/Switch-Toolbox
synced 2025-02-16 22:08:26 +00:00
Some fixes.
Fixed bone editor not showing properly. Fixed viewport not updating properly. Removed bad tile mode for GX2 and fix altering them.
This commit is contained in:
parent
732811119e
commit
be829619a2
15 changed files with 26 additions and 6 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -92,6 +92,7 @@
|
|||
this.chkTransformCuRotateTrnaslateZero = new Switch_Toolbox.Library.Forms.STCheckBox();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.userDataEditor1 = new UserDataEditor();
|
||||
this.stTabControl1.SuspendLayout();
|
||||
this.tabPage1.SuspendLayout();
|
||||
this.stFlowLayoutPanel1.SuspendLayout();
|
||||
this.stDropDownPanel1.SuspendLayout();
|
||||
|
@ -123,6 +124,8 @@
|
|||
//
|
||||
// stTabControl1
|
||||
//
|
||||
this.stTabControl1.Controls.Add(this.tabPage1);
|
||||
this.stTabControl1.Controls.Add(this.tabPage2);
|
||||
this.stTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.stTabControl1.Location = new System.Drawing.Point(0, 0);
|
||||
this.stTabControl1.myBackColor = System.Drawing.Color.Empty;
|
||||
|
@ -1012,6 +1015,7 @@
|
|||
this.Controls.Add(this.stTabControl1);
|
||||
this.Name = "BfresBoneEditor";
|
||||
this.Size = new System.Drawing.Size(647, 831);
|
||||
this.stTabControl1.ResumeLayout(false);
|
||||
this.tabPage1.ResumeLayout(false);
|
||||
this.stFlowLayoutPanel1.ResumeLayout(false);
|
||||
this.stDropDownPanel1.ResumeLayout(false);
|
||||
|
@ -1120,4 +1124,4 @@
|
|||
private Switch_Toolbox.Library.Forms.STCheckBox chkTransformCuIdenity;
|
||||
private Switch_Toolbox.Library.Forms.STCheckBox chkTransformIdentity;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -55,7 +55,6 @@ namespace FirstPlugin
|
|||
tileModeCB.Items.Add(GX2.GX2TileMode.MODE_3B_TILED_THIN1);
|
||||
tileModeCB.Items.Add(GX2.GX2TileMode.MODE_3B_TILED_THICK);
|
||||
tileModeCB.Items.Add(GX2.GX2TileMode.MODE_LINEAR_SPECIAL);
|
||||
tileModeCB.Items.Add(GX2.GX2TileMode.MODE_DEFAULT_FIX2197);
|
||||
|
||||
ImgDimComb.Items.Add(GX2.GX2SurfaceDimension.DIM_1D);
|
||||
ImgDimComb.Items.Add(GX2.GX2SurfaceDimension.DIM_1D_ARRAY);
|
||||
|
@ -150,7 +149,7 @@ namespace FirstPlugin
|
|||
private void tileModeCB_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (tileModeCB.SelectedIndex > -1 && SelectedTexSettings != null)
|
||||
SelectedTexSettings.tileMode = (uint)tileModeCB.SelectedItem;
|
||||
SelectedTexSettings.tileMode = (uint)(GX2.GX2TileMode)tileModeCB.SelectedItem;
|
||||
}
|
||||
|
||||
bool DialogShown = false;
|
||||
|
@ -274,9 +273,9 @@ namespace FirstPlugin
|
|||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(769, 142);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(42, 13);
|
||||
this.label5.Size = new System.Drawing.Size(82, 13);
|
||||
this.label5.TabIndex = 43;
|
||||
this.label5.Text = "Swizzle";
|
||||
this.label5.Text = "Swizzle Pattern:";
|
||||
//
|
||||
// tileModeCB
|
||||
//
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -30,6 +30,10 @@ namespace Switch_Toolbox.Library
|
|||
{
|
||||
return (((IViewportContainer)viewport).GetViewport());
|
||||
}
|
||||
if (Runtime.MainForm.ActiveMdiChild is IViewportContainer)
|
||||
{
|
||||
return ((IViewportContainer)Runtime.MainForm.ActiveMdiChild).GetViewport();
|
||||
}
|
||||
if (viewport != null && viewport is Viewport)
|
||||
{
|
||||
return ((Viewport)viewport);
|
||||
|
@ -118,6 +122,20 @@ namespace Switch_Toolbox.Library
|
|||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var ctrl in Runtime.MainForm.ActiveMdiChild.Controls)
|
||||
{
|
||||
if (type == null)
|
||||
{
|
||||
return (UserControl)ctrl;
|
||||
}
|
||||
if (ctrl.GetType() == type)
|
||||
{
|
||||
return (UserControl)ctrl;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
public void LoadViewport(Viewport viewport)
|
||||
|
|
|
@ -268,7 +268,6 @@ namespace Switch_Toolbox.Library
|
|||
{
|
||||
MODE_DEFAULT = 0x0,
|
||||
MODE_LINEAR_SPECIAL = 0x10,
|
||||
MODE_DEFAULT_FIX2197 = 0x20,
|
||||
MODE_LINEAR_ALIGNED = 0x1,
|
||||
MODE_1D_TILED_THIN1 = 0x2,
|
||||
MODE_1D_TILED_THICK = 0x3,
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Add table
Reference in a new issue