refactored

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

diff --git a/Form1.cs b/Form1.cs
index 4fd6ee0..e8bb332 100644 (file)
--- a/Form1.cs
+++ b/Form1.cs
@@ -238,19 +238,20 @@ namespace Tso2MqoGui
 \r
         private void OpenMQOFile(string f)\r
         {\r
-            TSOGenerator        gen     = new TSOGenerator();\r
-            TSOGenerateConfig   config  = new TSOGenerateConfig();\r
-            config.materialconfig       = cbShowMaterials.Checked;\r
+            TSOGenerator gen = new TSOGenerator();\r
+            TSOGenerateConfig config = new TSOGenerateConfig();\r
+            config.materialconfig = cbShowMaterials.Checked;\r
 \r
-            if(rbAutoBone.Checked)\r
+            if (rbAutoBone.Checked)\r
             {\r
                 gen.GenerateAutoBone(f, tbTso.Text, tbTsoEx.Text, config);\r
-            } else\r
-            if(rb1Bone.Checked)\r
+            }\r
+            else\r
+            if (rb1Bone.Checked)\r
             {\r
-                foreach(ListViewItem i in lvObject.Items)\r
+                foreach (ListViewItem i in lvObject.Items)\r
                 {\r
-                    if(i.SubItems[1].Text == "")\r
+                    if (i.SubItems[1].Text == "")\r
                     {\r
                         MessageBox.Show("すべてのオブジェクトにボーンを設定してください");\r
                         return;\r
@@ -260,7 +261,8 @@ namespace Tso2MqoGui
                 }\r
 \r
                 gen.GenerateOneBone(f, tbTso.Text, tbTsoEx.Text, config);\r
-            } else\r
+            }\r
+            else\r
             {\r
             }\r
         }\r
@@ -438,20 +440,22 @@ namespace Tso2MqoGui
 \r
         private void bOk_Click(object sender, EventArgs e)\r
         {\r
-            Color   c   = tabPage2.BackColor;\r
+            Color c = tabPage2.BackColor;\r
 \r
             try\r
             {\r
-                tabPage2.BackColor  = Color.Tomato;\r
+                tabPage2.BackColor = Color.Tomato;\r
                 tabPage2.Update();\r
-                string  file= tbMqoIn.Text;\r
+                string file = tbMqoIn.Text;\r
                 OpenMQOFile(file);\r
-            } catch(Exception ex)\r
+            }\r
+            catch (Exception ex)\r
             {\r
                 Util.ProcessError(ex);\r
-            } finally\r
+            }\r
+            finally\r
             {\r
-                tabPage2.BackColor  = c;\r
+                tabPage2.BackColor = c;\r
             }\r
         }\r
 #endregion\r

diff --git a/MqoWriter.cs b/MqoWriter.cs
index 766630f..49d1d7f 100644 (file)
--- a/MqoWriter.cs
+++ b/MqoWriter.cs
@@ -56,11 +56,20 @@ namespace Tso2MqoGui
             tw  = null;\r
         }\r
 \r
+        string GetTexturePath(TSOTex tex)\r
+        {\r
+            string filename = Path.GetFileName(tex.File.Trim('"'));\r
+            if (filename == "")\r
+                filename = "none";\r
+            return Path.Combine(OutPath, filename);\r
+        }\r
+\r
         public void CreateTextureFile(TSOTex tex)\r
         {\r
-            string  file= Path.Combine(OutPath, Path.GetFileName(tex.file.Trim('"')));\r
+            string file = GetTexturePath(tex);\r
             byte[]  data= tex.data;\r
 \r
+\r
             using(FileStream fs= File.OpenWrite(file))\r
             {\r
                 BinaryWriter    bw  = new BinaryWriter(fs);\r
@@ -130,24 +139,24 @@ namespace Tso2MqoGui
             List<float>         uv  = new List<float>(2048*3 * 2);\r
             List<int>           mtl = new List<int>(2048);\r
 \r
-            foreach(TSOTex i in file.textures)\r
-                CreateTextureFile(i);\r
+            foreach(TSOTex tex in file.textures)\r
+                CreateTextureFile(tex);\r
 \r
             tw.WriteLine("Material {0} {{", file.materials.Length);\r
 \r
-            foreach(TSOMaterial i in file.materials)\r
+            foreach(TSOMaterial mat in file.materials)\r
             {\r
-                if(i.ColorTex != null)\r
+                if(mat.ColorTex != null)\r
                 {\r
-                    TSOTex  tex = file.texturemap[i.ColorTex];\r
+                    TSOTex  tex = file.texturemap[mat.ColorTex];\r
                     tw.WriteLine(\r
                         "      \"{0}\" col(1.000 1.000 1.000 1.000) dif(0.800) amb(0.600) emi(0.000) spc(0.000) power(5.00) tex(\"{1}\")",\r
-                        i.name, Path.Combine(OutPath, tex.File.Trim('"')));\r
+                        mat.name, GetTexturePath(tex));\r
                 } else\r
                 {\r
                     tw.WriteLine(\r
                         "      \"{0}\" col(1.000 1.000 1.000 1.000) dif(0.800) amb(0.600) emi(0.000) spc(0.000) power(5.00))",\r
-                        i.name);\r
+                        mat.name);\r
                 }\r
             }\r
 \r

diff --git a/TSOFile.cs b/TSOFile.cs
index 44d2367..a6d48d8 100644 (file)
--- a/TSOFile.cs
+++ b/TSOFile.cs
@@ -101,7 +101,7 @@ namespace Tso2MqoGui
                 textures[i]                 = new TSOTex();\r
                 textures[i].id              = i;\r
                 textures[i].name            = ReadString();\r
-                textures[i].file            = ReadString();\r
+                textures[i].File            = ReadString();\r
                 textures[i].width           = r.ReadInt32();\r
                 textures[i].height          = r.ReadInt32();\r
                 textures[i].depth           = r.ReadInt32();\r
@@ -233,7 +233,7 @@ namespace Tso2MqoGui
     {\r
         internal int            id;\r
         internal string         name;\r
-        internal string         file;\r
+        string         file;\r
         internal int            width;\r
         internal int            height;\r
         internal int            depth;\r

diff --git a/TSOGenerator.cs b/TSOGenerator.cs
index 7bb1317..60ba18b 100644 (file)
--- a/TSOGenerator.cs
+++ b/TSOGenerator.cs
@@ -20,9 +20,6 @@ namespace Tso2MqoGui
         private List<Vertex>                vlst;\r
         private Dictionary<string, TSONode> nodes;\r
         private List<TSOMesh>               meshes;\r
-        private string                      mqoin;\r
-        private string                      tsoref;\r
-        private string                      tsoex;\r
         private ImportInfo                  ii;\r
         private BinaryWriter                bw;\r
         private Dictionary<string, MaterialInfo>    materials;\r
@@ -51,13 +48,13 @@ namespace Tso2MqoGui
             pc.Clustering();\r
         }\r
 \r
-        private bool Common_DoSetupDir()\r
+        private bool Common_DoSetupDir(string mqoin)\r
         {\r
             Environment.CurrentDirectory= dir= Path.GetDirectoryName(mqoin);\r
             return true;\r
         }\r
 \r
-        private bool Common_DoLoadMQO()\r
+        private bool Common_DoLoadMQO(string mqoin)\r
         {\r
             // MQO読み込み\r
             mqo = new MqoFile();\r
@@ -66,7 +63,7 @@ namespace Tso2MqoGui
             return true;\r
         }\r
 \r
-        private bool AutoBone_DoLoadRefTSO()\r
+        private bool AutoBone_DoLoadRefTSO(string tsoref)\r
         {\r
             // 参照TSOロード\r
             tsor    = LoadTSO(tsoref);\r
@@ -93,14 +90,14 @@ namespace Tso2MqoGui
             return true;\r
         }\r
 \r
-        private bool OneBone_DoLoadRefTSO()\r
+        private bool OneBone_DoLoadRefTSO(string tsoref)\r
         {\r
             // 参照TSOロード\r
             tsor    = LoadTSO(tsoref);\r
             return true;\r
         }\r
 \r
-        private bool Common_DoLoadXml()\r
+        private bool Common_DoLoadXml(string mqoin)\r
         {\r
             // XML読み込み\r
             ii  = ImportInfo.Load(Path.ChangeExtension(mqoin, ".xml"));\r
@@ -558,16 +555,16 @@ namespace Tso2MqoGui
             return true;\r
         }\r
 \r
-        private bool AutoBone_DoOutput()\r
+        private bool AutoBone_DoOutput(string tsoex)\r
         {\r
             //----- 出力処理 -----------------------------------------------\r
             ii.materials.Clear();\r
             ii.textures.Clear();\r
 \r
-            using(FileStream fs= File.OpenWrite(tsoex))\r
+            using (FileStream fs = File.OpenWrite(tsoex))\r
             {\r
                 fs.SetLength(0);\r
-                bw      = new BinaryWriter(fs);\r
+                bw = new BinaryWriter(fs);\r
 \r
                 Common_DoWriteHeader();\r
                 Common_DoWriteNodeNames();\r
@@ -582,16 +579,16 @@ namespace Tso2MqoGui
             return true;\r
         }\r
 \r
-        private bool OneBone_DoOutput()\r
+        private bool OneBone_DoOutput(string tsoex)\r
         {\r
             //----- 出力処理 -----------------------------------------------\r
             ii.materials.Clear();\r
             ii.textures.Clear();\r
 \r
-            using(FileStream fs= File.OpenWrite(tsoex))\r
+            using (FileStream fs = File.OpenWrite(tsoex))\r
             {\r
                 fs.SetLength(0);\r
-                bw      = new BinaryWriter(fs);\r
+                bw = new BinaryWriter(fs);\r
 \r
                 Common_DoWriteHeader();\r
                 Common_DoWriteNodeNames();\r
@@ -606,7 +603,7 @@ namespace Tso2MqoGui
             return true;\r
         }\r
 \r
-        private bool Common_DoSaveXml()\r
+        private bool Common_DoSaveXml(string mqoin)\r
         {\r
             // 結果を保存しておく\r
             ImportInfo.Save(Path.ChangeExtension(mqoin, ".xml"), ii);\r
@@ -621,9 +618,6 @@ namespace Tso2MqoGui
             vlst        = null;\r
             nodes       = null;\r
             meshes      = null;\r
-            mqoin       = null;\r
-            tsoref      = null;\r
-            tsoex       = null;\r
             config      = null;\r
             mqo         = null;\r
             ii          = null;\r
@@ -635,43 +629,39 @@ namespace Tso2MqoGui
             return true;\r
         }\r
 \r
-        public unsafe void GenerateOneBone(string mqoin, string tsoref, string tsoex, TSOGenerateConfig config)\r
+        public void GenerateOneBone(string mqoin, string tsoref, string tsoex, TSOGenerateConfig config)\r
         {\r
-            this.mqoin  = mqoin;\r
-            this.tsoref = tsoref;\r
-            this.tsoex  = tsoex;\r
             this.config = config;\r
 \r
             try\r
             {\r
-                if(!Common_DoSetupDir())        return;\r
-                if(!Common_DoLoadMQO())         return;\r
-                if(!OneBone_DoLoadRefTSO())     return;\r
-                if(!Common_DoLoadXml())         return;\r
-                if(!OneBone_DoOutput())         return;\r
-                if(!Common_DoSaveXml())         return;\r
-            } finally\r
+                if (!Common_DoSetupDir(mqoin)) return;\r
+                if (!Common_DoLoadMQO(mqoin)) return;\r
+                if (!OneBone_DoLoadRefTSO(tsoref)) return;\r
+                if (!Common_DoLoadXml(mqoin)) return;\r
+                if (!OneBone_DoOutput(tsoex)) return;\r
+                if (!Common_DoSaveXml(mqoin)) return;\r
+            }\r
+            finally\r
             {\r
                 Common_DoCleanup();\r
             }\r
         }\r
         \r
-        public unsafe void GenerateAutoBone(string mqoin, string tsoref, string tsoex, TSOGenerateConfig config)\r
+        public void GenerateAutoBone(string mqoin, string tsoref, string tsoex, TSOGenerateConfig config)\r
         {\r
-            this.mqoin  = mqoin;\r
-            this.tsoref = tsoref;\r
-            this.tsoex  = tsoex;\r
             this.config = config;\r
 \r
             try\r
             {\r
-                if(!Common_DoSetupDir())        return;\r
-                if(!Common_DoLoadMQO())         return;\r
-                if(!AutoBone_DoLoadRefTSO())    return;\r
-                if(!Common_DoLoadXml())         return;\r
-                if(!AutoBone_DoOutput())        return;\r
-                if(!Common_DoSaveXml())         return;\r
-            } finally\r
+                if (!Common_DoSetupDir(mqoin)) return;\r
+                if (!Common_DoLoadMQO(mqoin)) return;\r
+                if (!AutoBone_DoLoadRefTSO(tsoref)) return;\r
+                if (!Common_DoLoadXml(mqoin)) return;\r
+                if (!AutoBone_DoOutput(tsoex)) return;\r
+                if (!Common_DoSaveXml(mqoin)) return;\r
+            }\r
+            finally\r
             {\r
                 Common_DoCleanup();\r
             }\r
@@ -757,7 +747,7 @@ namespace Tso2MqoGui
                 tex.depth       = header.depth  / 8;\r
                 tex.width       = header.width;\r
                 tex.height      = header.height;\r
-                tex.file        = file;\r
+                tex.File        = file;\r
                 tex.data        = br.ReadBytes(tex.width * tex.height * tex.depth);\r
 \r
                 return tex;\r
@@ -783,7 +773,7 @@ namespace Tso2MqoGui
                 tex.depth       = bih.biBitCount  / 8;\r
                 tex.width       = bih.biWidth;\r
                 tex.height      = bih.biHeight;\r
-                tex.file        = file;\r
+                tex.File        = file;\r
                 tex.data        = br.ReadBytes(tex.width * tex.height * tex.depth);\r
 \r
                 return tex;\r

diff --git a/TSOWriter.cs b/TSOWriter.cs
index 33acba4..30fbef5 100644 (file)
--- a/TSOWriter.cs
+++ b/TSOWriter.cs
@@ -67,7 +67,7 @@ namespace Tso2MqoGui
         public static void Write(BinaryWriter bw, TSOTex item)\r
         {\r
             Write(bw, item.name);\r
-            Write(bw, item.file);\r
+            Write(bw, item.File);\r
             bw.Write(item.Width);\r
             bw.Write(item.Height);\r
             bw.Write(item.Depth);\r