Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-16 01:37:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some minor fixes and setting

Browse source
This commit is contained in:
KillzXGaming 2019-05-05 17:30:11 -04:00
parent a9e7e03455
commit 2847aa4fda
8 changed files with 100 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

7
Switch_Toolbox_Library/FileFormats/Assimp/Assimp.cs
View file

@ -15,6 +15,7 @@ namespace Switch_Toolbox.Library
public class AssimpData
{
public bool UseTransformMatrix = true;
public bool RotateSkeleton90Y = false;
public Scene scene;
@ -41,6 +42,7 @@ namespace Switch_Toolbox.Library
if (settings.ShowDialog() == DialogResult.OK)
{
UseTransformMatrix = settings.UseNodeTransform;
RotateSkeleton90Y = settings.RotateSkeleton90Y;
AssimpContext Importer = new AssimpContext();
@ -257,6 +259,9 @@ namespace Switch_Toolbox.Library
}
private void BuildSkeletonNodes(Node node, List<string> boneNames, STSkeleton skeleton, ref Matrix4x4 rootTransform)
{
if (RotateSkeleton90Y)
BoneRotation = 90;
Matrix4x4 trafo = node.Transform;
Matrix4x4 world = trafo * rootTransform;
Matrix4 worldTK = AssimpHelper.TKMatrix(world);
@ -287,7 +292,7 @@ namespace Switch_Toolbox.Library
}
}
public const int BoneRotation = 0;
public int BoneRotation = 0;
private List<Node> tempBoneNodes = new List<Node>();
private void CreateByNode(Node node, STSkeleton skeleton, string ParentArmatureName,

46
Switch_Toolbox_Library/Forms/Editors/Assimp Settings.Designer.cs generated
View file

@ -41,12 +41,14 @@
this.useNodeTransform = new Switch_Toolbox.Library.Forms.STCheckBox();
this.stButton1 = new Switch_Toolbox.Library.Forms.STButton();
this.stButton2 = new Switch_Toolbox.Library.Forms.STButton();
this.rotateBonesY90 = new Switch_Toolbox.Library.Forms.STCheckBox();
this.contentContainer.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.SuspendLayout();
//
// contentContainer
//
this.contentContainer.Controls.Add(this.rotateBonesY90);
this.contentContainer.Controls.Add(this.stButton2);
this.contentContainer.Controls.Add(this.stButton1);
this.contentContainer.Controls.Add(this.useNodeTransform);
@ -60,7 +62,7 @@
this.contentContainer.Controls.Add(this.generateTansBitansChk);
this.contentContainer.Controls.Add(this.smoothNormalsChk);
this.contentContainer.Controls.Add(this.generateNormalsChk);
this.contentContainer.Size = new System.Drawing.Size(290, 293);
this.contentContainer.Size = new System.Drawing.Size(290, 336);
this.contentContainer.Controls.SetChildIndex(this.generateNormalsChk, 0);
this.contentContainer.Controls.SetChildIndex(this.smoothNormalsChk, 0);
this.contentContainer.Controls.SetChildIndex(this.generateTansBitansChk, 0);
@ -74,6 +76,7 @@
this.contentContainer.Controls.SetChildIndex(this.useNodeTransform, 0);
this.contentContainer.Controls.SetChildIndex(this.stButton1, 0);
this.contentContainer.Controls.SetChildIndex(this.stButton2, 0);
this.contentContainer.Controls.SetChildIndex(this.rotateBonesY90, 0);
//
// generateNormalsChk
//
@ -81,7 +84,7 @@
this.generateNormalsChk.Checked = true;
this.generateNormalsChk.CheckState = System.Windows.Forms.CheckState.Checked;
this.generateNormalsChk.ForeColor = System.Drawing.Color.White;
this.generateNormalsChk.Location = new System.Drawing.Point(9, 59);
this.generateNormalsChk.Location = new System.Drawing.Point(9, 88);
this.generateNormalsChk.Name = "generateNormalsChk";
this.generateNormalsChk.Size = new System.Drawing.Size(196, 17);
this.generateNormalsChk.TabIndex = 0;
@ -92,7 +95,7 @@
//
this.smoothNormalsChk.AutoSize = true;
this.smoothNormalsChk.ForeColor = System.Drawing.Color.White;
this.smoothNormalsChk.Location = new System.Drawing.Point(9, 82);
this.smoothNormalsChk.Location = new System.Drawing.Point(9, 111);
this.smoothNormalsChk.Name = "smoothNormalsChk";
this.smoothNormalsChk.Size = new System.Drawing.Size(103, 17);
this.smoothNormalsChk.TabIndex = 1;
@ -105,7 +108,7 @@
this.generateTansBitansChk.Checked = true;
this.generateTansBitansChk.CheckState = System.Windows.Forms.CheckState.Checked;
this.generateTansBitansChk.ForeColor = System.Drawing.Color.White;
this.generateTansBitansChk.Location = new System.Drawing.Point(9, 105);
this.generateTansBitansChk.Location = new System.Drawing.Point(9, 134);
this.generateTansBitansChk.Name = "generateTansBitansChk";
this.generateTansBitansChk.Size = new System.Drawing.Size(173, 17);
this.generateTansBitansChk.TabIndex = 2;
@ -118,7 +121,7 @@
this.flipUVsChk.Checked = true;
this.flipUVsChk.CheckState = System.Windows.Forms.CheckState.Checked;
this.flipUVsChk.ForeColor = System.Drawing.Color.White;
this.flipUVsChk.Location = new System.Drawing.Point(9, 128);
this.flipUVsChk.Location = new System.Drawing.Point(9, 157);
this.flipUVsChk.Name = "flipUVsChk";
this.flipUVsChk.Size = new System.Drawing.Size(65, 17);
this.flipUVsChk.TabIndex = 3;
@ -131,7 +134,7 @@
this.limtBoneWeightChk.Checked = true;
this.limtBoneWeightChk.CheckState = System.Windows.Forms.CheckState.Checked;
this.limtBoneWeightChk.ForeColor = System.Drawing.Color.White;
this.limtBoneWeightChk.Location = new System.Drawing.Point(9, 151);
this.limtBoneWeightChk.Location = new System.Drawing.Point(9, 180);
this.limtBoneWeightChk.Name = "limtBoneWeightChk";
this.limtBoneWeightChk.Size = new System.Drawing.Size(113, 17);
this.limtBoneWeightChk.TabIndex = 5;
@ -145,7 +148,7 @@
this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.numericUpDown1.Enabled = false;
this.numericUpDown1.ForeColor = System.Drawing.Color.White;
this.numericUpDown1.Location = new System.Drawing.Point(132, 150);
this.numericUpDown1.Location = new System.Drawing.Point(132, 179);
this.numericUpDown1.Maximum = new decimal(new int[] {
4,
0,
@ -164,7 +167,7 @@
//
this.preTransformVerticesChk.AutoSize = true;
this.preTransformVerticesChk.ForeColor = System.Drawing.Color.White;
this.preTransformVerticesChk.Location = new System.Drawing.Point(9, 174);
this.preTransformVerticesChk.Location = new System.Drawing.Point(9, 203);
this.preTransformVerticesChk.Name = "preTransformVerticesChk";
this.preTransformVerticesChk.Size = new System.Drawing.Size(130, 17);
this.preTransformVerticesChk.TabIndex = 7;
@ -177,7 +180,7 @@
this.triangulateChk.Checked = true;
this.triangulateChk.CheckState = System.Windows.Forms.CheckState.Checked;
this.triangulateChk.ForeColor = System.Drawing.Color.White;
this.triangulateChk.Location = new System.Drawing.Point(9, 197);
this.triangulateChk.Location = new System.Drawing.Point(9, 226);
this.triangulateChk.Name = "triangulateChk";
this.triangulateChk.Size = new System.Drawing.Size(79, 17);
this.triangulateChk.TabIndex = 8;
@ -190,7 +193,7 @@
this.joinDupedVertsSk.Checked = true;
this.joinDupedVertsSk.CheckState = System.Windows.Forms.CheckState.Checked;
this.joinDupedVertsSk.ForeColor = System.Drawing.Color.White;
this.joinDupedVertsSk.Location = new System.Drawing.Point(9, 220);
this.joinDupedVertsSk.Location = new System.Drawing.Point(9, 249);
this.joinDupedVertsSk.Name = "joinDupedVertsSk";
this.joinDupedVertsSk.Size = new System.Drawing.Size(121, 17);
this.joinDupedVertsSk.TabIndex = 9;
@ -201,7 +204,7 @@
//
this.leftHandedChk.AutoSize = true;
this.leftHandedChk.ForeColor = System.Drawing.Color.White;
this.leftHandedChk.Location = new System.Drawing.Point(9, 243);
this.leftHandedChk.Location = new System.Drawing.Point(9, 272);
this.leftHandedChk.Name = "leftHandedChk";
this.leftHandedChk.Size = new System.Drawing.Size(109, 17);
this.leftHandedChk.TabIndex = 10;
@ -214,7 +217,7 @@
this.useNodeTransform.Checked = true;
this.useNodeTransform.CheckState = System.Windows.Forms.CheckState.Checked;
this.useNodeTransform.ForeColor = System.Drawing.Color.White;
this.useNodeTransform.Location = new System.Drawing.Point(9, 31);
this.useNodeTransform.Location = new System.Drawing.Point(9, 60);
this.useNodeTransform.Name = "useNodeTransform";
this.useNodeTransform.Size = new System.Drawing.Size(124, 17);
this.useNodeTransform.TabIndex = 11;
@ -225,7 +228,7 @@
//
this.stButton1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.stButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.stButton1.Location = new System.Drawing.Point(207, 267);
this.stButton1.Location = new System.Drawing.Point(211, 304);
this.stButton1.Name = "stButton1";
this.stButton1.Size = new System.Drawing.Size(75, 23);
this.stButton1.TabIndex = 12;
@ -236,19 +239,31 @@
//
this.stButton2.DialogResult = System.Windows.Forms.DialogResult.OK;
this.stButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.stButton2.Location = new System.Drawing.Point(126, 267);
this.stButton2.Location = new System.Drawing.Point(130, 304);
this.stButton2.Name = "stButton2";
this.stButton2.Size = new System.Drawing.Size(75, 23);
this.stButton2.TabIndex = 13;
this.stButton2.Text = "Ok";
this.stButton2.UseVisualStyleBackColor = false;
//
// rotateBonesY90
//
this.rotateBonesY90.AutoSize = true;
this.rotateBonesY90.ForeColor = System.Drawing.Color.White;
this.rotateBonesY90.Location = new System.Drawing.Point(9, 31);
this.rotateBonesY90.Name = "rotateBonesY90";
this.rotateBonesY90.Size = new System.Drawing.Size(116, 17);
this.rotateBonesY90.TabIndex = 14;
this.rotateBonesY90.Text = "Rotate Bones 90 Y";
this.rotateBonesY90.UseVisualStyleBackColor = true;
this.rotateBonesY90.CheckedChanged += new System.EventHandler(this.rotateBonesY90_CheckedChanged);
//
// Assimp_Settings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.ClientSize = new System.Drawing.Size(297, 298);
this.ClientSize = new System.Drawing.Size(297, 341);
this.Name = "Assimp_Settings";
this.Text = "Import Settings";
this.contentContainer.ResumeLayout(false);
@ -273,5 +288,6 @@
private STCheckBox useNodeTransform;
private STButton stButton2;
private STButton stButton1;
private STCheckBox rotateBonesY90;
}
}

8
Switch_Toolbox_Library/Forms/Editors/Assimp Settings.cs
View file

@ -15,6 +15,7 @@ namespace Switch_Toolbox.Library.Forms
{
public uint SkinLimitMax = 4;
public bool UseNodeTransform = true;
public bool RotateSkeleton90Y = false;
public Assimp_Settings()
{
@ -23,6 +24,8 @@ namespace Switch_Toolbox.Library.Forms
public PostProcessSteps GetFlags()
{
RotateSkeleton90Y = rotateBonesY90.Checked;
UseNodeTransform = useNodeTransform.Checked;
SkinLimitMax = (uint)numericUpDown1.Value;
@ -54,5 +57,10 @@ namespace Switch_Toolbox.Library.Forms
private void limtBoneWeightChk_CheckedChanged(object sender, EventArgs e) {
numericUpDown1.Enabled = limtBoneWeightChk.Checked;
}
private void rotateBonesY90_CheckedChanged(object sender, EventArgs e)
{
RotateSkeleton90Y = rotateBonesY90.Checked;
}
}
}

44
Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.Designer.cs generated
View file

@ -55,6 +55,7 @@
this.editInExternalProgramToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.enableZoomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.propertyGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.displayVerticalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.displayAlphaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -73,7 +74,8 @@
this.brightnessContrastToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.stContextMenuStrip2 = new Switch_Toolbox.Library.Forms.STContextMenuStrip(this.components);
this.copyImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.enableZoomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bottomLabel = new Switch_Toolbox.Library.Forms.STLabel();
this.stPanel5 = new Switch_Toolbox.Library.Forms.STPanel();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.SuspendLayout();
@ -82,6 +84,7 @@
this.stPanel3.SuspendLayout();
this.stContextMenuStrip1.SuspendLayout();
this.stContextMenuStrip2.SuspendLayout();
this.stPanel5.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@ -131,6 +134,7 @@
this.stPanel4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.stPanel4.Controls.Add(this.stPanel5);
this.stPanel4.Controls.Add(this.pictureBoxCustom1);
this.stPanel4.Location = new System.Drawing.Point(3, 74);
this.stPanel4.Name = "stPanel4";
@ -139,11 +143,14 @@
//
// pictureBoxCustom1
//
this.pictureBoxCustom1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBoxCustom1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pictureBoxCustom1.Location = new System.Drawing.Point(0, 0);
this.pictureBoxCustom1.Name = "pictureBoxCustom1";
this.pictureBoxCustom1.Size = new System.Drawing.Size(514, 425);
this.pictureBoxCustom1.Size = new System.Drawing.Size(514, 406);
this.pictureBoxCustom1.TabIndex = 0;
this.pictureBoxCustom1.ZoomChanged += new System.EventHandler(this.pictureBoxCustom1_ZoomChanged);
//
// stPanel3
//
@ -364,6 +371,13 @@
this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.viewToolStripMenuItem.Text = "View";
//
// enableZoomToolStripMenuItem
//
this.enableZoomToolStripMenuItem.Name = "enableZoomToolStripMenuItem";
this.enableZoomToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
this.enableZoomToolStripMenuItem.Text = "Enable Zoom";
this.enableZoomToolStripMenuItem.Click += new System.EventHandler(this.enableZoomToolStripMenuItem_Click);
//
// propertyGridToolStripMenuItem
//
this.propertyGridToolStripMenuItem.Checked = true;
@ -506,12 +520,22 @@
this.copyImageToolStripMenuItem.Text = "Copy Image";
this.copyImageToolStripMenuItem.Click += new System.EventHandler(this.copyImageToolStripMenuItem_Click);
//
// enableZoomToolStripMenuItem
// bottomLabel
//
this.enableZoomToolStripMenuItem.Name = "enableZoomToolStripMenuItem";
this.enableZoomToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
this.enableZoomToolStripMenuItem.Text = "Enable Zoom";
this.enableZoomToolStripMenuItem.Click += new System.EventHandler(this.enableZoomToolStripMenuItem_Click);
this.bottomLabel.AutoSize = true;
this.bottomLabel.Location = new System.Drawing.Point(-1, 4);
this.bottomLabel.Name = "bottomLabel";
this.bottomLabel.Size = new System.Drawing.Size(0, 13);
this.bottomLabel.TabIndex = 18;
//
// stPanel5
//
this.stPanel5.Controls.Add(this.bottomLabel);
this.stPanel5.Dock = System.Windows.Forms.DockStyle.Bottom;
this.stPanel5.Location = new System.Drawing.Point(0, 405);
this.stPanel5.Name = "stPanel5";
this.stPanel5.Size = new System.Drawing.Size(514, 20);
this.stPanel5.TabIndex = 1;
//
// ImageEditorBase
//
@ -531,6 +555,8 @@
this.stContextMenuStrip1.ResumeLayout(false);
this.stContextMenuStrip1.PerformLayout();
this.stContextMenuStrip2.ResumeLayout(false);
this.stPanel5.ResumeLayout(false);
this.stPanel5.PerformLayout();
this.ResumeLayout(false);
}
@ -581,5 +607,7 @@
private System.Windows.Forms.ToolTip toolTip1;
private Cyotek.Windows.Forms.ImageBox pictureBoxCustom1;
private System.Windows.Forms.ToolStripMenuItem enableZoomToolStripMenuItem;
private STPanel stPanel5;
private STLabel bottomLabel;
}
}

19
Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
View file

@ -300,6 +300,9 @@ namespace Switch_Toolbox.Library.Forms
set
{
isFinished = value;
if (value)
SetBottomBar();
}
}
@ -1146,11 +1149,27 @@ namespace Switch_Toolbox.Library.Forms
pictureBoxCustom1.AllowClickZoom = false;
pictureBoxCustom1.SizeMode = Cyotek.Windows.Forms.ImageBoxSizeMode.Fit;
}
SetBottomBar();
}
private void SaveSettings()
{
Config.Save();
}
private void pictureBoxCustom1_ZoomChanged(object sender, EventArgs e) {
SetBottomBar();
}
private void SetBottomBar()
{
if (pictureBoxCustom1.Image != null)
{
if (Runtime.ImageEditor.EnableImageZoom)
bottomLabel.Text = $"Zoom: {pictureBoxCustom1.Zoom}% Image {pictureBoxCustom1.Image.Width} x {pictureBoxCustom1.Image.Height}";
else
bottomLabel.Text = $"Zoom: 100% Image {pictureBoxCustom1.Image.Width} x {pictureBoxCustom1.Image.Height}";
}
}
}
}