Merge pull request #9 from CptWesley/program-parameters#3

Program parameters

Author: CptWesley

src/Brush.cs

@@ -24,10 +24,10 @@ public static Brush CreateFromCode(string[] code)
         // Creates the needed clipping planes based on code.
         private static ClippingPlane[] CreateClippingPlanes(string[] code)
         {
-            string pattern = @"(\(\s?-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s?\))\s?"  // First vertex
-                + @"(\(\s?-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s?\))\s?"             // Second vertex
-                + @"(\(\s?-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s?\))\s"              // Third vertex
-                + @"(\w+(\/\S*)*)"                                                          // Texture
+            string pattern = @"(\(\s?-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s?\))\s?"  // First vertex [1]
+                + @"(\(\s?-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s?\))\s?"             // Second vertex [5]
+                + @"(\(\s?-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s-?\d+(\.\d+)?\s?\))\s"              // Third vertex [9]
+                + @"(\w+(\/\S*)*)"                                                          // Texture [13]
                 + @".*";                                                                    // Leftovers
             Regex regex = new Regex(pattern, RegexOptions.IgnoreCase);
 

src/Program.cs

@@ -1,25 +1,42 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Text.RegularExpressions;
 
 namespace RadiantMapToWavefrontObj
 {
     internal class Program
     {
+        private static double _scale = 0.01;
+        private static bool _autoclose = false;
+
         static void Main(string[] args)
         {
             Version version = Assembly.GetExecutingAssembly().GetName().Version;
             Console.WriteLine("RadiantMapToWavefrontObj version " + version.Major + '.' + version.Minor + '.' + version.Build);
 
-            // Check if the file exists.
-            if (args.Length > 0 && File.Exists(args[0]))
-                ConvertFile(args[0]);
-            else
+            bool success = false;
+
+            // Check for each argument if it is a .map we should convert.
+            foreach (string arg in args)
+            {
+                if (File.Exists(arg) && Path.GetExtension(arg) == ".map")
+                {
+                    ConvertFile(arg);
+                    success = true;
+                }
+                else
+                    HandleArgument(arg);
+            }
+
+            if (!success)
                 Console.WriteLine("Invalid file.");
 
             // Wait for console input before closing.
             Console.WriteLine("\nPress any key to close this window...");
-            Console.ReadKey();
+
+            if (!_autoclose)
+                Console.ReadKey();
         }
 
         // Convert .map file to .obj file.
@@ -32,10 +49,37 @@ private static void ConvertFile(string path)
             RadiantMap map = RadiantMap.Parse(path);
             WavefrontObj obj = WavefrontObj.CreateFromRadiantMap(map);
 
-            obj.SaveFile(Path.GetFileNameWithoutExtension(path) + ".obj", 0.01);
+            obj.SaveFile(Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path)) + ".obj", _scale);
 
             DateTime endTime = DateTime.Now;
             Console.WriteLine("Finished in: " + (endTime-startTime).Milliseconds + "ms.");
         }
+
+        // Handle a settings argument.
+        private static void HandleArgument(string arg)
+        {
+            string pattern = @"-(\w+)=(\w+)";
+            Regex regex = new Regex(pattern, RegexOptions.IgnoreCase);
+            Match m = regex.Match(arg);
+            if (m.Success)
+            {
+                string type = m.Groups[1].ToString();
+                string mode = m.Groups[2].ToString();
+
+                if (type == "autoclose")
+                {
+                    if (mode == "false" || mode == "0")
+                        _autoclose = false;
+                    else if (mode == "true" || mode == "1")
+                        _autoclose = true;
+                }
+                else if (type == "scale")
+                {
+                    double scale;
+                    if (Double.TryParse(mode, out scale))
+                        _scale = scale;
+                }
+            }
+        }
     }
 }