patch 3

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tdcgexplorer/trunk/tso2mqo@1999 72ae2088-5f33-de11-a17b-0000e250a282

diff --git a/Form1.Designer.cs b/Form1.Designer.cs
index bf7a926..4587c09 100644 (file)
--- a/Form1.Designer.cs
+++ b/Form1.Designer.cs
@@ -117,7 +117,7 @@
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;\r
             this.label2.Location = new System.Drawing.Point(6, 94);\r
             this.label2.Name = "label2";\r
-            this.label2.Size = new System.Drawing.Size(476, 178);\r
+            this.label2.Size = new System.Drawing.Size(476, 177);\r
             this.label2.TabIndex = 8;\r
             this.label2.Text = "Drop TSO File Here!";\r
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
@@ -147,10 +147,10 @@
             this.tabPage1.Controls.Add(this.label2);\r
             this.tabPage1.Controls.Add(this.button1);\r
             this.tabPage1.Controls.Add(this.tbPath);\r
-            this.tabPage1.Location = new System.Drawing.Point(4, 21);\r
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);\r
             this.tabPage1.Name = "tabPage1";\r
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tabPage1.Size = new System.Drawing.Size(488, 275);\r
+            this.tabPage1.Size = new System.Drawing.Size(488, 274);\r
             this.tabPage1.TabIndex = 0;\r
             this.tabPage1.Text = "Tso->Mqo";\r
             // \r
@@ -213,10 +213,10 @@
             this.tabPage2.Controls.Add(this.bRefMqoIn);\r
             this.tabPage2.Controls.Add(this.tbMqoIn);\r
             this.tabPage2.Controls.Add(this.label3);\r
-            this.tabPage2.Location = new System.Drawing.Point(4, 21);\r
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);\r
             this.tabPage2.Name = "tabPage2";\r
             this.tabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tabPage2.Size = new System.Drawing.Size(488, 275);\r
+            this.tabPage2.Size = new System.Drawing.Size(488, 274);\r
             this.tabPage2.TabIndex = 1;\r
             this.tabPage2.Text = "Mqo->Tso";\r
             // \r
@@ -484,9 +484,9 @@
             this.tabPage3.Controls.Add(this.bMergeAdd);\r
             this.tabPage3.Controls.Add(this.label8);\r
             this.tabPage3.Controls.Add(this.tvMerge);\r
-            this.tabPage3.Location = new System.Drawing.Point(4, 21);\r
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.tabPage3.Name = "tabPage3";\r
-            this.tabPage3.Size = new System.Drawing.Size(488, 275);\r
+            this.tabPage3.Size = new System.Drawing.Size(488, 274);\r
             this.tabPage3.TabIndex = 2;\r
             this.tabPage3.Text = "Merge";\r
             // \r

diff --git a/Form1.cs b/Form1.cs
index af28bdd..ec64a8b 100644 (file)
--- a/Form1.cs
+++ b/Form1.cs
@@ -238,19 +238,15 @@ namespace Tso2MqoGui
         private void OpenMQOFile(string f)\r
         {\r
             TsoGenerator    gen = new TsoGenerator();\r
+            TSOGenerateConfig   config  = new TSOGenerateConfig();\r
+            config.materialconfig       = cbShowMaterials.Checked;\r
 \r
             if(rbAutoBone.Checked)\r
             {\r
-                TSOGenerateConfig   config  = new TSOGenerateConfig();\r
-                config.materialconfig       = cbShowMaterials.Checked;\r
-\r
                 gen.GenerateAutoBone(f, tbTso.Text, tbTsoEx.Text, config);\r
             } else\r
             if(rb1Bone.Checked)\r
             {\r
-                TSOGenerateConfig   config  = new TSOGenerateConfig();\r
-                config.materialconfig       = cbShowMaterials.Checked;\r
-\r
                 foreach(ListViewItem i in lvObject.Items)\r
                 {\r
                     if(i.SubItems[1].Text == "")\r
@@ -666,4 +662,4 @@ namespace Tso2MqoGui
             MessageBox.Show(e.ToString());\r
         }\r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/FormMaterial.cs b/FormMaterial.cs
index d32e2d4..7fdeb2b 100644 (file)
--- a/FormMaterial.cs
+++ b/FormMaterial.cs
@@ -81,7 +81,7 @@ namespace Tso2MqoGui
                 switch(e.ChangedItem.Label)\r
                 {\r
                 case "テクスチャ：カラー":          item.SubItems[1].Text= e.ChangedItem.Value.ToString(); break;\r
-                case "ã\83\86ã\82¯ã\82¹ã\83\81ã\83£ï¼\9aã\82·ã\82§ã\83¼ã\83\87ィング":  item.SubItems[2].Text= e.ChangedItem.Value.ToString(); break;\r
+                case "ã\83\86ã\82¯ã\82¹ã\83\81ã\83£ï¼\9aã\82·ã\82§ã\83¼ã\83\86ィング":  item.SubItems[2].Text= e.ChangedItem.Value.ToString(); break;\r
                 case "シェーダー設定ファイル":      item.SubItems[3].Text= e.ChangedItem.Value.ToString(); break;\r
                 }\r
             }\r

diff --git a/ImportInfo.cs b/ImportInfo.cs
index 3a30e87..3fb9646 100644 (file)
--- a/ImportInfo.cs
+++ b/ImportInfo.cs
@@ -33,7 +33,6 @@ namespace Tso2MqoGui
             foreach(ImportEffectInfo   i in effects)   i.PostLoad(this);\r
             foreach(ImportTextureInfo  i in textures)  i.PostLoad(this);\r
             foreach(ImportMaterialInfo i in materials) i.PostLoad(this);\r
-\r
         }\r
 \r
         public ImportEffectInfo GetEffect(string name)\r

diff --git a/TSOFile.cs b/TSOFile.cs
index b1af8a1..787ef5c 100644 (file)
--- a/TSOFile.cs
+++ b/TSOFile.cs
@@ -318,7 +318,6 @@ namespace Tso2MqoGui
 \r
     public class TSOMaterialCode : Dictionary<string, TSOParameter>\r
     {\r
-\r
         public TSOMaterialCode(string code)\r
             : this(code.Split('\r', '\n'))\r
         {\r
@@ -334,7 +333,7 @@ namespace Tso2MqoGui
             TSOParameter    p   = this[index];\r
             p.Value             = value;\r
            }\r
-       \r
+\r
         public TSOMaterialCode(string[] code)\r
         {\r
             foreach(string i in code)\r

diff --git a/Tso2MqoGui.csproj b/Tso2MqoGui.csproj
index 9696a75..c12d7c1 100644 (file)
--- a/Tso2MqoGui.csproj
+++ b/Tso2MqoGui.csproj
@@ -36,24 +36,6 @@
     <WarningLevel>4</WarningLevel>\r
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <OutputPath>bin\x64\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <DebugType>full</DebugType>\r
-    <PlatformTarget>x64</PlatformTarget>\r
-    <ErrorReport>prompt</ErrorReport>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">\r
-    <OutputPath>bin\x64\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <Optimize>true</Optimize>\r
-    <DebugType>pdbonly</DebugType>\r
-    <PlatformTarget>x64</PlatformTarget>\r
-    <ErrorReport>prompt</ErrorReport>\r
-  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r
     <Reference Include="System.Data" />\r

diff --git a/Tso2MqoGui.sln b/Tso2MqoGui.sln
index d2040cb..39c20d3 100644 (file)
--- a/Tso2MqoGui.sln
+++ b/Tso2MqoGui.sln
@@ -6,19 +6,13 @@ EndProject
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
-               Debug|x64 = Debug|x64\r
                Release|Any CPU = Release|Any CPU\r
-               Release|x64 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {C0DE49DD-78AB-4517-8234-7331DEF93472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {C0DE49DD-78AB-4517-8234-7331DEF93472}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {C0DE49DD-78AB-4517-8234-7331DEF93472}.Debug|x64.ActiveCfg = Debug|x64\r
-               {C0DE49DD-78AB-4517-8234-7331DEF93472}.Debug|x64.Build.0 = Debug|x64\r
                {C0DE49DD-78AB-4517-8234-7331DEF93472}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {C0DE49DD-78AB-4517-8234-7331DEF93472}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {C0DE49DD-78AB-4517-8234-7331DEF93472}.Release|x64.ActiveCfg = Release|x64\r
-               {C0DE49DD-78AB-4517-8234-7331DEF93472}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r