diff --git a/AssetStudio/AssetStudioForm.Designer.cs b/AssetStudio/AssetStudioForm.Designer.cs index 3f779fa..dbffaab 100644 --- a/AssetStudio/AssetStudioForm.Designer.cs +++ b/AssetStudio/AssetStudioForm.Designer.cs @@ -49,7 +49,7 @@ this.exportallobjectsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportallobjectssplitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportselectedobjectsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.exportAllObjectssplitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.exportSelectedObjectsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportSelectedObjectsWithAnimationClipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -113,6 +113,7 @@ this.exportobjectswithselectedAnimationClipMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.jumpToSceneHierarchyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showOriginalFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -281,10 +282,11 @@ // modelToolStripMenuItem // this.modelToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItem3, this.exportallobjectsMenuItem, this.exportallobjectssplitToolStripMenuItem, this.exportselectedobjectsMenuItem, - this.toolStripSeparator1, + this.toolStripMenuItem2, this.exportAllObjectssplitToolStripMenuItem1, this.exportSelectedObjectsToolStripMenuItem, this.exportSelectedObjectsWithAnimationClipToolStripMenuItem}); @@ -313,10 +315,12 @@ this.exportselectedobjectsMenuItem.Text = "Export selected objects"; this.exportselectedobjectsMenuItem.Click += new System.EventHandler(this.ExportObjects_Click); // - // toolStripSeparator1 + // toolStripMenuItem2 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(320, 6); + this.toolStripMenuItem2.Enabled = false; + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(332, 22); + this.toolStripMenuItem2.Text = "----------------------Binary----------------------"; // // exportAllObjectssplitToolStripMenuItem1 // @@ -947,6 +951,13 @@ this.showOriginalFileToolStripMenuItem.Visible = false; this.showOriginalFileToolStripMenuItem.Click += new System.EventHandler(this.showOriginalFileToolStripMenuItem_Click); // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Enabled = false; + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(332, 22); + this.toolStripMenuItem3.Text = "-----------------------Ascii-----------------------"; + // // AssetStudioForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1070,13 +1081,14 @@ private System.Windows.Forms.ToolStripMenuItem exportSelectedAssetsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem filterTypeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem allToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem exportSelectedObjectsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportSelectedObjectsWithAnimationClipToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem exportAnimatorWithSelectedAnimationClipToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportAllObjectssplitToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem jumpToSceneHierarchyToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; } } diff --git a/AssetStudio/ExportOptions.Designer.cs b/AssetStudio/ExportOptions.Designer.cs index 9d85289..ca75539 100644 --- a/AssetStudio/ExportOptions.Designer.cs +++ b/AssetStudio/ExportOptions.Designer.cs @@ -36,9 +36,6 @@ this.exportUVs = new System.Windows.Forms.CheckBox(); this.exportTangents = new System.Windows.Forms.CheckBox(); this.exportNormals = new System.Windows.Forms.CheckBox(); - this.advancedBox = new System.Windows.Forms.GroupBox(); - this.axisLabel = new System.Windows.Forms.Label(); - this.upAxis = new System.Windows.Forms.ComboBox(); this.scaleFactor = new System.Windows.Forms.NumericUpDown(); this.scaleLabel = new System.Windows.Forms.Label(); this.fbxOKbutton = new System.Windows.Forms.Button(); @@ -51,6 +48,7 @@ this.tobmp = new System.Windows.Forms.RadioButton(); this.converttexture = new System.Windows.Forms.CheckBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.FixRotation = new System.Windows.Forms.CheckBox(); this.compatibility = new System.Windows.Forms.CheckBox(); this.flatInbetween = new System.Windows.Forms.CheckBox(); this.boneSize = new System.Windows.Forms.NumericUpDown(); @@ -61,10 +59,8 @@ this.allBones = new System.Windows.Forms.CheckBox(); this.allFrames = new System.Windows.Forms.CheckBox(); this.EulerFilter = new System.Windows.Forms.CheckBox(); - this.FixRotation = new System.Windows.Forms.CheckBox(); this.FbxBox.SuspendLayout(); this.geometryBox.SuspendLayout(); - this.advancedBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.scaleFactor)).BeginInit(); this.groupBox1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -76,13 +72,14 @@ // FbxBox // this.FbxBox.AutoSize = true; + this.FbxBox.Controls.Add(this.scaleFactor); this.FbxBox.Controls.Add(this.convertDummies); + this.FbxBox.Controls.Add(this.scaleLabel); this.FbxBox.Controls.Add(this.exportDeformers); this.FbxBox.Controls.Add(this.geometryBox); - this.FbxBox.Controls.Add(this.advancedBox); this.FbxBox.Location = new System.Drawing.Point(12, 12); this.FbxBox.Name = "FbxBox"; - this.FbxBox.Size = new System.Drawing.Size(247, 317); + this.FbxBox.Size = new System.Drawing.Size(247, 235); this.FbxBox.TabIndex = 0; this.FbxBox.TabStop = false; this.FbxBox.Text = "Fbx Ascii"; @@ -128,7 +125,7 @@ this.exportColors.AutoSize = true; this.exportColors.Checked = true; this.exportColors.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportColors.Location = new System.Drawing.Point(7, 85); + this.exportColors.Location = new System.Drawing.Point(6, 86); this.exportColors.Name = "exportColors"; this.exportColors.Size = new System.Drawing.Size(102, 16); this.exportColors.TabIndex = 3; @@ -141,7 +138,7 @@ this.exportUVs.AutoSize = true; this.exportUVs.Checked = true; this.exportUVs.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportUVs.Location = new System.Drawing.Point(7, 63); + this.exportUVs.Location = new System.Drawing.Point(6, 64); this.exportUVs.Name = "exportUVs"; this.exportUVs.Size = new System.Drawing.Size(108, 16); this.exportUVs.TabIndex = 2; @@ -152,7 +149,7 @@ // exportTangents // this.exportTangents.AutoSize = true; - this.exportTangents.Location = new System.Drawing.Point(7, 41); + this.exportTangents.Location = new System.Drawing.Point(6, 42); this.exportTangents.Name = "exportTangents"; this.exportTangents.Size = new System.Drawing.Size(72, 16); this.exportTangents.TabIndex = 1; @@ -165,7 +162,7 @@ this.exportNormals.AutoSize = true; this.exportNormals.Checked = true; this.exportNormals.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportNormals.Location = new System.Drawing.Point(7, 18); + this.exportNormals.Location = new System.Drawing.Point(6, 20); this.exportNormals.Name = "exportNormals"; this.exportNormals.Size = new System.Drawing.Size(66, 16); this.exportNormals.TabIndex = 0; @@ -173,40 +170,6 @@ this.exportNormals.UseVisualStyleBackColor = true; this.exportNormals.CheckedChanged += new System.EventHandler(this.exportOpnions_CheckedChanged); // - // advancedBox - // - this.advancedBox.AutoSize = true; - this.advancedBox.Controls.Add(this.axisLabel); - this.advancedBox.Controls.Add(this.upAxis); - this.advancedBox.Controls.Add(this.scaleFactor); - this.advancedBox.Controls.Add(this.scaleLabel); - this.advancedBox.Location = new System.Drawing.Point(6, 192); - this.advancedBox.Name = "advancedBox"; - this.advancedBox.Size = new System.Drawing.Size(235, 78); - this.advancedBox.TabIndex = 5; - this.advancedBox.TabStop = false; - this.advancedBox.Text = "Advanced Options"; - // - // axisLabel - // - this.axisLabel.AutoSize = true; - this.axisLabel.Location = new System.Drawing.Point(6, 40); - this.axisLabel.Name = "axisLabel"; - this.axisLabel.Size = new System.Drawing.Size(53, 12); - this.axisLabel.TabIndex = 3; - this.axisLabel.Text = "Up Axis:"; - // - // upAxis - // - this.upAxis.FormattingEnabled = true; - this.upAxis.Items.AddRange(new object[] { - "Y-up"}); - this.upAxis.Location = new System.Drawing.Point(66, 38); - this.upAxis.MaxDropDownItems = 2; - this.upAxis.Name = "upAxis"; - this.upAxis.Size = new System.Drawing.Size(70, 20); - this.upAxis.TabIndex = 2; - // // scaleFactor // this.scaleFactor.DecimalPlaces = 2; @@ -215,7 +178,7 @@ 0, 0, 131072}); - this.scaleFactor.Location = new System.Drawing.Point(96, 14); + this.scaleFactor.Location = new System.Drawing.Point(95, 194); this.scaleFactor.Name = "scaleFactor"; this.scaleFactor.Size = new System.Drawing.Size(46, 21); this.scaleFactor.TabIndex = 1; @@ -228,7 +191,7 @@ // scaleLabel // this.scaleLabel.AutoSize = true; - this.scaleLabel.Location = new System.Drawing.Point(6, 15); + this.scaleLabel.Location = new System.Drawing.Point(6, 196); this.scaleLabel.Name = "scaleLabel"; this.scaleLabel.Size = new System.Drawing.Size(83, 12); this.scaleLabel.TabIndex = 0; @@ -236,7 +199,7 @@ // // fbxOKbutton // - this.fbxOKbutton.Location = new System.Drawing.Point(325, 354); + this.fbxOKbutton.Location = new System.Drawing.Point(323, 346); this.fbxOKbutton.Name = "fbxOKbutton"; this.fbxOKbutton.Size = new System.Drawing.Size(75, 21); this.fbxOKbutton.TabIndex = 6; @@ -247,7 +210,7 @@ // fbxCancel // this.fbxCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.fbxCancel.Location = new System.Drawing.Point(406, 354); + this.fbxCancel.Location = new System.Drawing.Point(404, 346); this.fbxCancel.Name = "fbxCancel"; this.fbxCancel.Size = new System.Drawing.Size(75, 21); this.fbxCancel.TabIndex = 7; @@ -257,12 +220,13 @@ // // groupBox1 // + this.groupBox1.AutoSize = true; this.groupBox1.Controls.Add(this.convertAudio); this.groupBox1.Controls.Add(this.panel1); this.groupBox1.Controls.Add(this.converttexture); - this.groupBox1.Location = new System.Drawing.Point(267, 12); + this.groupBox1.Location = new System.Drawing.Point(12, 253); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(214, 106); + this.groupBox1.Size = new System.Drawing.Size(247, 114); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "Convert"; @@ -335,6 +299,7 @@ // // groupBox2 // + this.groupBox2.AutoSize = true; this.groupBox2.Controls.Add(this.FixRotation); this.groupBox2.Controls.Add(this.compatibility); this.groupBox2.Controls.Add(this.flatInbetween); @@ -346,21 +311,33 @@ this.groupBox2.Controls.Add(this.allBones); this.groupBox2.Controls.Add(this.allFrames); this.groupBox2.Controls.Add(this.EulerFilter); - this.groupBox2.Location = new System.Drawing.Point(267, 124); + this.groupBox2.Location = new System.Drawing.Point(265, 9); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(214, 224); + this.groupBox2.Size = new System.Drawing.Size(214, 235); this.groupBox2.TabIndex = 11; this.groupBox2.TabStop = false; this.groupBox2.Text = "Fbx Binary"; // + // FixRotation + // + this.FixRotation.AutoSize = true; + this.FixRotation.Checked = true; + this.FixRotation.CheckState = System.Windows.Forms.CheckState.Checked; + this.FixRotation.Location = new System.Drawing.Point(6, 20); + this.FixRotation.Name = "FixRotation"; + this.FixRotation.Size = new System.Drawing.Size(90, 16); + this.FixRotation.TabIndex = 14; + this.FixRotation.Text = "FixRotation"; + this.FixRotation.UseVisualStyleBackColor = true; + // // compatibility // this.compatibility.AutoSize = true; this.compatibility.Location = new System.Drawing.Point(6, 199); this.compatibility.Name = "compatibility"; - this.compatibility.Size = new System.Drawing.Size(102, 16); + this.compatibility.Size = new System.Drawing.Size(138, 16); this.compatibility.TabIndex = 13; - this.compatibility.Text = "compatibility"; + this.compatibility.Text = "Compatibility (6.1)"; this.compatibility.UseVisualStyleBackColor = true; // // flatInbetween @@ -370,7 +347,7 @@ this.flatInbetween.Name = "flatInbetween"; this.flatInbetween.Size = new System.Drawing.Size(102, 16); this.flatInbetween.TabIndex = 12; - this.flatInbetween.Text = "flatInbetween"; + this.flatInbetween.Text = "FlatInbetween"; this.flatInbetween.UseVisualStyleBackColor = true; // // boneSize @@ -392,7 +369,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(53, 12); this.label2.TabIndex = 10; - this.label2.Text = "boneSize"; + this.label2.Text = "BoneSize"; // // skins // @@ -403,7 +380,7 @@ this.skins.Name = "skins"; this.skins.Size = new System.Drawing.Size(54, 16); this.skins.TabIndex = 8; - this.skins.Text = "skins"; + this.skins.Text = "Skins"; this.skins.UseVisualStyleBackColor = true; // // label1 @@ -413,7 +390,7 @@ this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(95, 12); this.label1.TabIndex = 7; - this.label1.Text = "filterPrecision"; + this.label1.Text = "FilterPrecision"; // // filterPrecision // @@ -442,7 +419,7 @@ this.allBones.Name = "allBones"; this.allBones.Size = new System.Drawing.Size(72, 16); this.allBones.TabIndex = 5; - this.allBones.Text = "allBones"; + this.allBones.Text = "AllBones"; this.allBones.UseVisualStyleBackColor = true; // // allFrames @@ -452,7 +429,7 @@ this.allFrames.Name = "allFrames"; this.allFrames.Size = new System.Drawing.Size(78, 16); this.allFrames.TabIndex = 4; - this.allFrames.Text = "allFrames"; + this.allFrames.Text = "AllFrames"; this.allFrames.UseVisualStyleBackColor = true; // // EulerFilter @@ -465,25 +442,13 @@ this.EulerFilter.Text = "EulerFilter"; this.EulerFilter.UseVisualStyleBackColor = true; // - // FixRotation - // - this.FixRotation.AutoSize = true; - this.FixRotation.Checked = true; - this.FixRotation.CheckState = System.Windows.Forms.CheckState.Checked; - this.FixRotation.Location = new System.Drawing.Point(6, 20); - this.FixRotation.Name = "FixRotation"; - this.FixRotation.Size = new System.Drawing.Size(90, 16); - this.FixRotation.TabIndex = 14; - this.FixRotation.Text = "FixRotation"; - this.FixRotation.UseVisualStyleBackColor = true; - // // ExportOptions // this.AcceptButton = this.fbxOKbutton; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.fbxCancel; - this.ClientSize = new System.Drawing.Size(495, 384); + this.ClientSize = new System.Drawing.Size(493, 379); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.fbxCancel); @@ -501,8 +466,6 @@ this.FbxBox.PerformLayout(); this.geometryBox.ResumeLayout(false); this.geometryBox.PerformLayout(); - this.advancedBox.ResumeLayout(false); - this.advancedBox.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.scaleFactor)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); @@ -520,7 +483,6 @@ #endregion private System.Windows.Forms.GroupBox FbxBox; - private System.Windows.Forms.GroupBox advancedBox; private System.Windows.Forms.NumericUpDown scaleFactor; private System.Windows.Forms.Label scaleLabel; private System.Windows.Forms.CheckBox exportDeformers; @@ -529,8 +491,6 @@ private System.Windows.Forms.CheckBox exportUVs; private System.Windows.Forms.CheckBox exportTangents; private System.Windows.Forms.CheckBox exportNormals; - private System.Windows.Forms.Label axisLabel; - private System.Windows.Forms.ComboBox upAxis; private System.Windows.Forms.Button fbxOKbutton; private System.Windows.Forms.Button fbxCancel; private System.Windows.Forms.CheckBox convertDummies; diff --git a/AssetStudio/ExportOptions.cs b/AssetStudio/ExportOptions.cs index 4de5b3f..c771db6 100644 --- a/AssetStudio/ExportOptions.cs +++ b/AssetStudio/ExportOptions.cs @@ -23,7 +23,6 @@ namespace AssetStudio convertDummies.Checked = (bool)Properties.Settings.Default["convertDummies"]; convertDummies.Enabled = (bool)Properties.Settings.Default["exportDeformers"]; scaleFactor.Value = (decimal)Properties.Settings.Default["scaleFactor"]; - upAxis.SelectedIndex = (int)Properties.Settings.Default["upAxis"]; converttexture.Checked = (bool)Properties.Settings.Default["convertTexture"]; convertAudio.Checked = (bool)Properties.Settings.Default["convertAudio"]; var str = (string)Properties.Settings.Default["convertType"]; @@ -60,7 +59,6 @@ namespace AssetStudio Properties.Settings.Default["exportColors"] = exportColors.Checked; Properties.Settings.Default["exportDeformers"] = exportDeformers.Checked; Properties.Settings.Default["scaleFactor"] = scaleFactor.Value; - Properties.Settings.Default["upAxis"] = upAxis.SelectedIndex; Properties.Settings.Default["convertTexture"] = converttexture.Checked; Properties.Settings.Default["convertAudio"] = convertAudio.Checked; foreach (Control c in panel1.Controls) diff --git a/AssetStudio/Properties/Settings.Designer.cs b/AssetStudio/Properties/Settings.Designer.cs index 21560af..aea385b 100644 --- a/AssetStudio/Properties/Settings.Designer.cs +++ b/AssetStudio/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace AssetStudio.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -143,18 +143,6 @@ namespace AssetStudio.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public int upAxis { - get { - return ((int)(this["upAxis"])); - } - set { - this["upAxis"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] diff --git a/AssetStudio/Properties/Settings.settings b/AssetStudio/Properties/Settings.settings index 117f248..f9db9e7 100644 --- a/AssetStudio/Properties/Settings.settings +++ b/AssetStudio/Properties/Settings.settings @@ -32,9 +32,6 @@ 2.54 - - 0 - True diff --git a/AssetStudio/app.config b/AssetStudio/app.config index f2afb20..b58e899 100644 --- a/AssetStudio/app.config +++ b/AssetStudio/app.config @@ -37,9 +37,6 @@ 2.54 - - 0 - True