diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index c3d16c03..d70aa56d 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 205cc04b..3dd3eb60 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 4af1fe32..e76fb543 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.Designer.cs b/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.Designer.cs index ff70fe32..57627941 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.Designer.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.Designer.cs @@ -32,7 +32,7 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.stFlowLayoutPanel1 = new Switch_Toolbox.Library.Forms.STFlowLayoutPanel(); this.stDropDownPanel1 = new Switch_Toolbox.Library.Forms.STDropDownPanel(); - this.boneInfoPanel1 = new BoneInfoPanel(); + this.boneInfoPanel1 = new FirstPlugin.BoneInfoPanel(); this.stDropDownPanel2 = new Switch_Toolbox.Library.Forms.STDropDownPanel(); this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel(); this.stLabel5 = new Switch_Toolbox.Library.Forms.STLabel(); @@ -91,7 +91,7 @@ this.chkTransformCuRotateZero = new Switch_Toolbox.Library.Forms.STCheckBox(); this.chkTransformCuRotateTrnaslateZero = new Switch_Toolbox.Library.Forms.STCheckBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.userDataEditor1 = new UserDataEditor(); + this.userDataEditor1 = new FirstPlugin.UserDataEditor(); this.stTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.stFlowLayoutPanel1.SuspendLayout(); @@ -177,8 +177,8 @@ this.stDropDownPanel1.PanelName = "Bone Info"; this.stDropDownPanel1.PanelValueName = ""; this.stDropDownPanel1.SetIcon = null; - this.stDropDownPanel1.SetIconAlphaColor = System.Drawing.Color.Empty; - this.stDropDownPanel1.SetIconColor = System.Drawing.Color.Empty; + this.stDropDownPanel1.SetIconAlphaColor = System.Drawing.Color.Transparent; + this.stDropDownPanel1.SetIconColor = System.Drawing.Color.Transparent; this.stDropDownPanel1.Size = new System.Drawing.Size(633, 113); this.stDropDownPanel1.TabIndex = 0; // @@ -202,8 +202,8 @@ this.stDropDownPanel2.PanelName = "Transform"; this.stDropDownPanel2.PanelValueName = ""; this.stDropDownPanel2.SetIcon = null; - this.stDropDownPanel2.SetIconAlphaColor = System.Drawing.Color.Empty; - this.stDropDownPanel2.SetIconColor = System.Drawing.Color.Empty; + this.stDropDownPanel2.SetIconAlphaColor = System.Drawing.Color.Transparent; + this.stDropDownPanel2.SetIconColor = System.Drawing.Color.Transparent; this.stDropDownPanel2.Size = new System.Drawing.Size(633, 151); this.stDropDownPanel2.TabIndex = 1; // @@ -447,6 +447,7 @@ this.RotYUD.Name = "RotYUD"; this.RotYUD.Size = new System.Drawing.Size(104, 20); this.RotYUD.TabIndex = 24; + this.RotYUD.ValueChanged += new System.EventHandler(this.RotYUD_ValueChanged); // // RotXUD // @@ -578,6 +579,7 @@ this.posXUD.Name = "posXUD"; this.posXUD.Size = new System.Drawing.Size(105, 20); this.posXUD.TabIndex = 16; + this.posXUD.ValueChanged += new System.EventHandler(this.posXUD_ValueChanged); // // label2 // @@ -630,8 +632,8 @@ this.stDropDownPanel3.PanelName = "Billboard"; this.stDropDownPanel3.PanelValueName = ""; this.stDropDownPanel3.SetIcon = null; - this.stDropDownPanel3.SetIconAlphaColor = System.Drawing.Color.Empty; - this.stDropDownPanel3.SetIconColor = System.Drawing.Color.Empty; + this.stDropDownPanel3.SetIconAlphaColor = System.Drawing.Color.Transparent; + this.stDropDownPanel3.SetIconColor = System.Drawing.Color.Transparent; this.stDropDownPanel3.Size = new System.Drawing.Size(633, 95); this.stDropDownPanel3.TabIndex = 2; // @@ -706,8 +708,8 @@ this.stDropDownPanel4.PanelName = "Matricies"; this.stDropDownPanel4.PanelValueName = ""; this.stDropDownPanel4.SetIcon = null; - this.stDropDownPanel4.SetIconAlphaColor = System.Drawing.Color.Empty; - this.stDropDownPanel4.SetIconColor = System.Drawing.Color.Empty; + this.stDropDownPanel4.SetIconAlphaColor = System.Drawing.Color.Transparent; + this.stDropDownPanel4.SetIconColor = System.Drawing.Color.Transparent; this.stDropDownPanel4.Size = new System.Drawing.Size(633, 95); this.stDropDownPanel4.TabIndex = 3; // @@ -798,7 +800,7 @@ this.stDropDownPanel5.PanelName = "Transform Modes"; this.stDropDownPanel5.PanelValueName = ""; this.stDropDownPanel5.SetIcon = null; - this.stDropDownPanel5.SetIconAlphaColor = System.Drawing.Color.Empty; + this.stDropDownPanel5.SetIconAlphaColor = System.Drawing.Color.Transparent; this.stDropDownPanel5.SetIconColor = System.Drawing.Color.Transparent; this.stDropDownPanel5.Size = new System.Drawing.Size(633, 136); this.stDropDownPanel5.TabIndex = 4; diff --git a/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.cs b/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.cs index 1b556bfe..148edca1 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Skeleton/BfresBoneEditor.cs @@ -122,8 +122,8 @@ namespace FirstPlugin private void SetBoneTransform(BfresBone bn) { bn.position[0] = (float)posXUD.Value; - bn.position[1] = (float)posZUD.Value; - bn.position[2] = (float)posYUD.Value; + bn.position[1] = (float)posYUD.Value; + bn.position[2] = (float)posZUD.Value; bn.rotation[0] = (float)RotXUD.Value; bn.rotation[1] = (float)RotYUD.Value; diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 55fec23d..f59f31b1 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index 0f8e1293..74c040b6 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ