improve encapsulation

diff --git a/FormMaterial.cs b/FormMaterial.cs
index 4bc77cf..946e569 100644 (file)
--- a/FormMaterial.cs
+++ b/FormMaterial.cs
@@ -25,9 +25,9 @@ namespace Tso2MqoGui
             {\r
                 ListViewItem item = lvMaterials.Items.Add(mat_info.Name);\r
                 item.Tag = mat_info;\r
-                item.SubItems.Add(mat_info.diffuse == null ? "" : mat_info.diffuse);\r
-                item.SubItems.Add(mat_info.shadow == null ? "" : mat_info.shadow);\r
-                item.SubItems.Add(mat_info.shader == null ? "" : mat_info.shader);\r
+                item.SubItems.Add(mat_info.DiffuseTexture ?? "");\r
+                item.SubItems.Add(mat_info.ShadowTexture ?? "");\r
+                item.SubItems.Add(mat_info.ShaderFile ?? "");\r
             }\r
         }\r
 \r

diff --git a/TSOGenerator.cs b/TSOGenerator.cs
index 48d06c1..d7e378c 100644 (file)
--- a/TSOGenerator.cs
+++ b/TSOGenerator.cs
@@ -83,15 +83,15 @@ namespace Tso2MqoGui
 \r
             foreach (MaterialInfo i in materials.Values)\r
             {\r
-                string name = Path.GetFileNameWithoutExtension(i.diffuse);\r
+                string name = Path.GetFileNameWithoutExtension(i.DiffuseTexture);\r
 \r
                 if (!textures.ContainsKey(name))\r
-                    textures.Add(name, new TextureInfo(name, i.diffuse));\r
+                    textures.Add(name, new TextureInfo(name, i.DiffuseTexture));\r
 \r
-                name = Path.GetFileNameWithoutExtension(i.shadow);\r
+                name = Path.GetFileNameWithoutExtension(i.ShadowTexture);\r
 \r
                 if (!textures.ContainsKey(name))\r
-                    textures.Add(name, new TextureInfo(name, i.shadow));\r
+                    textures.Add(name, new TextureInfo(name, i.ShadowTexture));\r
             }\r
 \r
             return true;\r
@@ -797,10 +797,10 @@ namespace Tso2MqoGui
 \r
     public class MaterialInfo\r
     {\r
-        public string name;\r
-        public string shader;\r
-        public string diffuse;\r
-        public string shadow;\r
+        string name;\r
+        string shader;\r
+        string diffuse;\r
+        string shadow;\r
         //public Dictionary<string, string>   parameters;\r
 \r
         public MaterialInfo(string path, MqoMaterial mat, ImportMaterialInfo import_mat_info)\r