From: Charles <Charles@92bb83a3-7c8f-8a45-bc97-515c4e399668>
Date: Mon, 12 Apr 2010 01:09:04 +0000 (+0000)
Subject: created a new project MapProcessorLib to for importing map files
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=commitdiff_plain;h=c5daf1d9adca0c3a826dfa2ac7b6d4f8a64c84a3

created a new project MapProcessorLib to for importing map files
determined that `cfmap' will be the extension we'll use for map files
added map reader with a module for general-purpose parsing

git-svn-id: https://bd85.net/svn/cs3505_group@62 92bb83a3-7c8f-8a45-bc97-515c4e399668
---

diff --git a/CarFire/CarFire/CarFire.sln b/CarFire/CarFire/CarFire.sln
index 6ed4e2b..2583a8e 100644
--- a/CarFire/CarFire/CarFire.sln
+++ b/CarFire/CarFire/CarFire.sln
@@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarFire", "CarFire\CarFire.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharacterTestBed", "CharacterTestBed\CharacterTestBed.csproj", "{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapProcessorLib", "MapProcessorLib\MapProcessorLib.csproj", "{EA5996C5-17A9-4827-AAB8-884B476B62EE}"
+EndProject
 Global
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True
@@ -12,21 +14,53 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
+		Debug|Xbox 360 = Debug|Xbox 360
+		Debug|Zune = Debug|Zune
 		Release|x86 = Release|x86
+		Release|Xbox 360 = Release|Xbox 360
+		Release|Zune = Release|Zune
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|x86.ActiveCfg = Debug|x86
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|x86.Build.0 = Debug|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Debug|Zune.ActiveCfg = Debug|x86
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|x86.ActiveCfg = Release|x86
 		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|x86.Build.0 = Release|x86
-		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|x86.ActiveCfg = Debug|x86
-		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|x86.ActiveCfg = Release|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|Xbox 360.ActiveCfg = Release|x86
+		{FDDA5BCD-3616-400D-A40B-CFD57C54D0F2}.Release|Zune.ActiveCfg = Release|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|x86.ActiveCfg = Debug|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|x86.Build.0 = Debug|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Debug|Zune.ActiveCfg = Debug|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|x86.ActiveCfg = Release|x86
 		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|x86.Build.0 = Release|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|Xbox 360.ActiveCfg = Release|x86
+		{757B5B2E-27C5-43E3-BF29-5025E9DDDBF1}.Release|Zune.ActiveCfg = Release|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|x86.ActiveCfg = Debug|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Debug|Zune.ActiveCfg = Debug|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|x86.ActiveCfg = Release|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|Xbox 360.ActiveCfg = Release|x86
+		{C115BBCA-D6FD-42AF-B2A1-3E895808BC14}.Release|Zune.ActiveCfg = Release|x86
 		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Debug|x86.ActiveCfg = Debug|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Debug|Xbox 360.ActiveCfg = Debug|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Debug|Zune.ActiveCfg = Debug|x86
 		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Release|x86.ActiveCfg = Release|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Release|Xbox 360.ActiveCfg = Release|x86
+		{4F0BE90F-1E46-4959-80A5-E92B578F6A48}.Release|Zune.ActiveCfg = Release|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|x86.ActiveCfg = Debug|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|x86.Build.0 = Debug|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Zune.ActiveCfg = Debug|Zune
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Debug|Zune.Build.0 = Debug|Zune
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|x86.ActiveCfg = Release|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|x86.Build.0 = Release|x86
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Xbox 360.Build.0 = Release|Xbox 360
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Zune.ActiveCfg = Release|Zune
+		{EA5996C5-17A9-4827-AAB8-884B476B62EE}.Release|Zune.Build.0 = Release|Zune
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CarFire/CarFire/CarFire.suo b/CarFire/CarFire/CarFire.suo
index dd09ba1..19bb6f3 100644
Binary files a/CarFire/CarFire/CarFire.suo and b/CarFire/CarFire/CarFire.suo differ
diff --git a/CarFire/CarFire/CarFire/CarFire.csproj b/CarFire/CarFire/CarFire/CarFire.csproj
index 9d05f39..30d2d0d 100644
--- a/CarFire/CarFire/CarFire/CarFire.csproj
+++ b/CarFire/CarFire/CarFire/CarFire.csproj
@@ -88,7 +88,10 @@
     <Compile Include="Game.cs" />
     <Compile Include="IDeterministicGame.cs" />
     <Compile Include="IScreenManager.cs" />
+    <Compile Include="Map.cs" />
+    <Compile Include="MapReader.cs" />
     <Compile Include="NetworkManager.cs" />
+    <Compile Include="Parse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="XnaGame.cs" />
diff --git a/CarFire/CarFire/CarFire/Content/Content.contentproj b/CarFire/CarFire/CarFire/Content/Content.contentproj
index 6128e00..077c9a1 100644
--- a/CarFire/CarFire/CarFire/Content/Content.contentproj
+++ b/CarFire/CarFire/CarFire/Content/Content.contentproj
@@ -104,6 +104,17 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MapProcessorLib\MapProcessorLib.csproj">
+      <Project>{EA5996C5-17A9-4827-AAB8-884B476B62EE}</Project>
+      <Name>MapProcessorLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Maps\sandbox.cfmap">
+      <Name>sandbox</Name>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v3.0\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 1650634..38d86b8 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -9,7 +9,7 @@ using Microsoft.Xna.Framework.Input;
 
 namespace CarFire
 {
-    class Game : IDeterministicGame
+    public class Game : IDeterministicGame
     {
         #region IDeterministicGame Members
 
diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
new file mode 100644
index 0000000..ed8c39f
--- /dev/null
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Runtime.Serialization;
+using System.Diagnostics;
+
+namespace CarFire
+{
+    /// <summary>
+    /// A map object represents the map or virtual world where players and other
+    /// game entities exist.  The map consists of a grid where each grid space can
+    /// contain static scenery and/or game entities which can move and interact
+    /// with other game entities.
+    /// </summary>
+    public class Map
+    {
+        #region Types
+
+        public class Data
+        {
+            public string Author;
+            public string Name;
+            public int MinNumPlayers;
+            public int MaxNumPlayers;
+            public Point Dimensions;
+            public string Tileset;        // TODO: this should be a tilemap object
+            public Type Type;
+            public char[,] Grid;
+        }
+        
+        public enum Type
+        {
+            None,
+            Campaign,
+            Battle
+        }
+
+        #endregion
+
+
+        public Map(Data data)
+        {
+            Console.WriteLine("Read map " + data.Name + " of type " + data.Type + " written by " + data.Author);
+        }
+    }
+}
diff --git a/CarFire/CarFire/CarFire/MapReader.cs b/CarFire/CarFire/CarFire/MapReader.cs
new file mode 100644
index 0000000..35089ba
--- /dev/null
+++ b/CarFire/CarFire/CarFire/MapReader.cs
@@ -0,0 +1,287 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text.RegularExpressions;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace CarFire
+{
+    /// <summary>
+    /// This class will be instantiated by the XNA Framework Content
+    /// Pipeline to read cfmap files from binary .xnb format.
+    /// </summary>
+    public class MapReader : ContentTypeReader<Map>
+    {
+        public class ParserException : System.ApplicationException
+        {
+            public ParserException()
+            {
+            }
+
+            public ParserException(string message) :
+                base(message)
+            {
+            }
+
+            public ParserException(string message, System.Exception inner) :
+                base(message, inner)
+            {
+            }
+
+            protected ParserException(SerializationInfo info, StreamingContext context) :
+                base(info, context)
+            {
+            }
+        }
+
+        ContentReader mInput;
+        int mLineNumber = 0;
+        int mExpectedNumberOfLines;
+
+        Map.Data mData;
+
+
+        protected override Map Read(ContentReader input, Map existingInstance)
+        {
+            mInput = input;
+            mExpectedNumberOfLines =  mInput.ReadInt32();
+
+            ReadData();
+
+            return new Map(mData);
+        }
+
+
+        #region Private Reading Methods
+        
+        string ReadLine()
+        {
+            return mInput.ReadString();
+        }
+
+        void ReadData()
+        {
+            mData = new Map.Data();
+
+            while (mLineNumber < mExpectedNumberOfLines)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                while (line != null)
+                {
+                    if (!IsLineSignificant(line)) break;
+
+                    string section = Parse.IniSectionHeader(line);
+                    if (section != null)
+                    {
+                        if (section == "metadata")
+                        {
+                            line = ReadMetadataSection();
+                        }
+                        else if (section == "maptable")
+                        {
+                            line = ReadMapTableSection();
+                        }
+                        else if (section.Length == 1)
+                        {
+                            line = ReadEntitySection(section[0]);
+                        }
+                        else
+                        {
+                            ThrowException("Unknown section", section);
+                        }
+                    }
+                    else
+                    {
+                        ThrowException("Unexpected text", line);
+                    }
+                }
+            }
+        }
+
+        string ReadMetadataSection()
+        {
+            while (mLineNumber < mExpectedNumberOfLines)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                if (!IsLineSignificant(line)) continue;
+
+                string[] pair = Parse.KeyValuePair(line);
+                if (pair != null)
+                {
+                    if (pair[0] == "type")
+                    {
+                        object type = Parse.Constant<Map.Type>(pair[1]);
+                        if (type != null)
+                        {
+                            mData.Type = (Map.Type)type;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid type", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "dimensions")
+                    {
+                        Point? dimensions = Parse.Coordinates(pair[1]);
+                        if (dimensions != null)
+                        {
+                            mData.Dimensions = dimensions.Value;
+                            if (mData.Dimensions.X <= 0 || mData.Dimensions.Y <= 0)
+                            {
+                                ThrowException("Invalid dimensions", pair[1]);
+                            }
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "tileset")
+                    {
+                        string tileset = Parse.String(pair[1]);
+                        if (tileset != null)
+                        {
+                            mData.Tileset = tileset;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid tileset", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "numplayers")
+                    {
+                        int[] numPlayers = Parse.Range(pair[1]);
+                        if (numPlayers != null)
+                        {
+                            mData.MinNumPlayers = numPlayers[0];
+                            mData.MaxNumPlayers = numPlayers[1];
+                            if (mData.MinNumPlayers <= 0 || mData.MaxNumPlayers <= 0 ||
+                                mData.MinNumPlayers > mData.MaxNumPlayers)
+                            {
+                                ThrowException("Invalid range", pair[1]);
+                            }
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "author")
+                    {
+                        string author = Parse.String(pair[1]);
+                        if (author != null)
+                        {
+                            mData.Author = author;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else if (pair[0] == "levelname")
+                    {
+                        string level = Parse.String(pair[1]);
+                        if (level != null)
+                        {
+                            mData.Name = level;
+                        }
+                        else
+                        {
+                            ThrowException("Invalid value", pair[1]);
+                        }
+                    }
+                    else
+                    {
+                        Console.WriteLine("Unimplemented key: " + pair[0]);
+                    }
+                }
+                else
+                {
+                    return line;
+                }
+            }
+
+            return null;
+        }
+
+        string ReadMapTableSection()
+        {
+            if (mData.Dimensions.X == 0 || mData.Dimensions.Y == 0)
+            {
+                ThrowException("Unexpected section", "You must define the map dimensions before this section.");
+            }
+
+            mData.Grid = new char[mData.Dimensions.X, mData.Dimensions.Y];
+
+            int y;
+            for (y = 0; y < mData.Dimensions.Y && mLineNumber < mExpectedNumberOfLines; y++)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                if (line.Length < mData.Dimensions.X)
+                {
+                    ThrowException("Not enough characters", "Expecting " + mData.Dimensions.X + " characters.");
+                }
+
+                for (int x = 0; x < mData.Dimensions.X; x++)
+                {
+                    mData.Grid[x, y] = line[x];
+                }
+            }
+
+            if (y < mData.Dimensions.Y)
+            {
+                ThrowException("Unexpected ", "");
+            }
+
+            return null;
+        }
+
+        string ReadEntitySection(char entity)
+        {
+            while (mLineNumber < mExpectedNumberOfLines)
+            {
+                string line = ReadLine();
+                mLineNumber++;
+
+                string[] pair = Parse.KeyValuePair(line);
+                if (pair != null)
+                {
+                    // TODO
+                }
+                else
+                {
+                    return line;
+                }
+            }
+
+            return null;
+        }
+
+        #endregion
+
+
+        #region Private Methods
+
+        bool IsLineSignificant(string line)
+        {
+            if (line.Length == 0 || Regex.IsMatch(line, @"^;|^\s*$")) return false;
+            return true;
+        }
+
+        void ThrowException(string problem, string text)
+        {
+            throw new ParserException(problem + " on line " + mLineNumber + ": " + text);
+        }
+
+        #endregion
+    }
+}
diff --git a/CarFire/CarFire/CarFire/Parse.cs b/CarFire/CarFire/CarFire/Parse.cs
new file mode 100644
index 0000000..e1a482e
--- /dev/null
+++ b/CarFire/CarFire/CarFire/Parse.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Microsoft.Xna.Framework;
+
+namespace CarFire
+{
+    /// <summary>
+    /// Class with handy static methods taking strings and returning objects
+    /// parsed from those strings.
+    /// </summary>
+    public class Parse
+    {
+        /// <summary>
+        /// Parses a section header of an INI file.
+        /// </summary>
+        /// <param name="line">Text.</param>
+        /// <returns>The section header, or null if parsing failed.</returns>
+        public static string IniSectionHeader(string line)
+        {
+            Match match = Regex.Match(line, @"^\s*\[(\w+)\]\s*$");
+            if (match.Success) return match.Groups[1].Value;
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a key-value pair.
+        /// </summary>
+        /// <param name="line">Text.</param>
+        /// <returns>An array of two strings containg the key and value,
+        /// in that order, or null if parsing failed.</returns>
+        public static string[] KeyValuePair(string line)
+        {
+            Match match = Regex.Match(line, @"^\s*(\w+)\s*=\s*(.+)\s*$");
+            if (match.Success)
+            {
+                string[] pair = { match.Groups[1].Value, match.Groups[2].Value };
+                return pair;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a pair of coordinates.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>The coordinates, or null if parsing failed.</returns>
+        public static Point? Coordinates(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*\[(\S+?)\s*,\s*(\S+?)\]\s*$");
+            if (match.Success)
+            {
+                int? x = Integer(match.Groups[1].Value);
+                int? y = Integer(match.Groups[2].Value);
+                if (x != null && y != null)
+                {
+                    return new Point(x.Value, y.Value);
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a range of integers.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>An array of two integers containing the min and max,
+        /// in that order, or null if parsing failed.</returns>
+        public static int[] Range(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*<(\S+?)\s*,\s*(\S+?)>\s*$");
+            if (match.Success)
+            {
+                int? min = Integer(match.Groups[1].Value);
+                int? max = Integer(match.Groups[2].Value);
+                if (min != null && max != null)
+                {
+                    int[] range = { min.Value, max.Value };
+                    return range;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a string.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>The string, or null if parsing failed.</returns>
+        public static string String(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*(""?)(.*)\1\s*$");
+            if (match.Success) return match.Groups[2].Value;
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a constant from an enum.
+        /// </summary>
+        /// <typeparam name="T">An enumeration.</typeparam>
+        /// <param name="atom">Text.</param>
+        /// <returns>The constant, or null if parsing failed.</returns>
+        public static T Constant<T>(string atom)
+        {
+            string constant = String(atom);
+            if (constant != null)
+            {
+                foreach (string enumConstant in System.Enum.GetNames(typeof(T)))
+                {
+                    if (constant == enumConstant)
+                    {
+                        return (T)System.Enum.Parse(typeof(T), constant);
+                    }
+                }
+            }
+            return default(T);
+        }
+
+        /// <summary>
+        /// Parses an integer.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>The integer, or null if parsing failed.</returns>
+        public static int? Integer(string atom)
+        {
+            try
+            {
+                int integer = Convert.ToInt32(atom.Trim());
+                return integer;
+            }
+#pragma warning disable 0168
+            catch (System.Exception ex)
+#pragma warning restore 0168
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Parses a boolean value.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>True or false, or null if parsing failed.</returns>
+        public static bool? Boolean(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*(true|false)\s*$", RegexOptions.IgnoreCase);
+            if (match.Success)
+            {
+                if (match.Groups[1].Value[0] == 't' || match.Groups[1].Value[0] == 'T') return true;
+                else return false;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a function.
+        /// </summary>
+        /// <param name="atom">Text.</param>
+        /// <returns>An array two strings containing the function name and
+        /// parameter-list, in that order, or null if parsing failed.</returns>
+        public static string[] Function(string atom)
+        {
+            Match match = Regex.Match(atom, @"^\s*(\w+)\((.*)\)\s*$");
+            if (match.Success)
+            {
+                string[] pair = { match.Groups[1].Value, match.Groups[2].Value };
+                return pair;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a comma-separated list of atoms.
+        /// </summary>
+        /// <param name="text">Text.</param>
+        /// <returns>An array of strings containing the atoms, or null
+        /// if parsing failed.</returns>
+        public static string[] ParameterList(string text)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Parses a whitespace-separated list of atoms.
+        /// </summary>
+        /// <param name="text">Text.</param>
+        /// <returns>An array of atoms, or null if parsing failed.</returns>
+        public static string[] List(string text)
+        {
+            List<string> list = new List<string>();
+
+            MatchCollection matches = Regex.Matches(text, @"\s*("".*?"")|(\w+\(.*?\))|(\[.*?\])|(<.*?>)|(\S+)(?:\s+|$)");
+            // FIXME: This may barf all over itself if there are nested parentheses, doublequotes, brackets, etc.
+            foreach (Match match in matches)
+            {
+                Console.WriteLine("matched: " + match.Value);
+                list.Add(match.Value);
+            }
+
+            return list.ToArray();
+        }
+    }
+}
diff --git a/CarFire/CarFire/CarFire/ScreenManager.cs b/CarFire/CarFire/CarFire/ScreenManager.cs
index 0c58e77..4998eac 100644
--- a/CarFire/CarFire/CarFire/ScreenManager.cs
+++ b/CarFire/CarFire/CarFire/ScreenManager.cs
@@ -12,7 +12,7 @@ using Microsoft.Xna.Framework.Content;
 
 namespace CarFire
 {
-    class ScreenManager : IScreenManager
+    public class ScreenManager : IScreenManager
     {
         #region local variables
         float scale;
diff --git a/CarFire/CarFire/MapProcessorLib/MapImporter.cs b/CarFire/CarFire/MapProcessorLib/MapImporter.cs
new file mode 100644
index 0000000..e208785
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapImporter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Content.Pipeline;
+using Microsoft.Xna.Framework.Content.Pipeline.Graphics;
+
+using TImport = MapProcessorLib.MapSourceCode;
+
+namespace MapProcessorLib
+{
+    /// <summary>
+    /// This class will be instantiated by the XNA Framework Content Pipeline
+    /// to import a file from disk into the specified type, TImport.
+    /// 
+    /// This should be part of a Content Pipeline Extension Library project.
+    /// </summary>
+    [ContentImporter(".cfmap", DisplayName = "CarFire Map Importer", DefaultProcessor = "PassThroughProcessor")]
+    public class MapImporter : ContentImporter<TImport>
+    {
+        public override TImport Import(string filename, ContentImporterContext context)
+        {
+            string[] lines = System.IO.File.ReadAllLines(filename);
+            return new MapSourceCode(lines);
+        }
+    }
+}
diff --git a/CarFire/CarFire/MapProcessorLib/MapProcessorLib.csproj b/CarFire/CarFire/MapProcessorLib/MapProcessorLib.csproj
new file mode 100644
index 0000000..83ba3d2
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapProcessorLib.csproj
@@ -0,0 +1,122 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <ProjectGuid>{EA5996C5-17A9-4827-AAB8-884B476B62EE}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapProcessorLib</RootNamespace>
+    <AssemblyName>MapProcessorLib</AssemblyName>
+    <XnaFrameworkVersion>v3.0</XnaFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Windows</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Windows</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Xbox 360' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Xbox 360\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Xbox 360</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Xbox 360' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Xbox 360\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Xbox 360</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Zune' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Zune\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Zune</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Zune' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Zune\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaPlatform>Zune</XnaPlatform>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Xna.Framework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86">
+      <Private>False</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Game, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Content.Pipeline, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86">
+      <Private>False</Private>
+      <SpecificVersion>true</SpecificVersion>
+    </Reference>
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MapWriter.cs" />
+    <Compile Include="MapImporter.cs" />
+    <Compile Include="MapSourceCode.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.ContentPipelineExtensions.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+     Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/CarFire/CarFire/MapProcessorLib/MapSourceCode.cs b/CarFire/CarFire/MapProcessorLib/MapSourceCode.cs
new file mode 100644
index 0000000..2ec33af
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapSourceCode.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework.Content.Pipeline;
+
+namespace MapProcessorLib
+{
+    /// <summary>
+    /// Container for the map file before it is rewritten as an XNB file.
+    /// </summary>
+    public class MapSourceCode
+    {
+        string[] mLines;
+        public string[] Lines { get { return mLines; } }
+
+        public MapSourceCode(string[] lines)
+        {
+            mLines = lines;
+        }
+    }
+}
diff --git a/CarFire/CarFire/MapProcessorLib/MapWriter.cs b/CarFire/CarFire/MapProcessorLib/MapWriter.cs
new file mode 100644
index 0000000..3cdcfad
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/MapWriter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Content.Pipeline;
+using Microsoft.Xna.Framework.Content.Pipeline.Graphics;
+using Microsoft.Xna.Framework.Content.Pipeline.Processors;
+using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler;
+
+using TWrite = MapProcessorLib.MapSourceCode;
+
+namespace MapProcessorLib
+{
+    /// <summary>
+    /// This class will be instantiated by the XNA Framework Content Pipeline
+    /// to write the specified data type into binary .xnb format.
+    ///
+    /// This should be part of a Content Pipeline Extension Library project.
+    /// </summary>
+    [ContentTypeWriter]
+    public class MapWriter : ContentTypeWriter<TWrite>
+    {
+        protected override void Write(ContentWriter output, TWrite value)
+        {
+            output.Write(value.Lines.Length);
+            foreach (string line in value.Lines)
+            {
+                output.Write(line);
+            }
+        }
+
+        public override string GetRuntimeReader(TargetPlatform targetPlatform)
+        {
+            return "CarFire.MapReader, CarFire";
+        }
+    }
+}
diff --git a/CarFire/CarFire/MapProcessorLib/Properties/AssemblyInfo.cs b/CarFire/CarFire/MapProcessorLib/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..591c56a
--- /dev/null
+++ b/CarFire/CarFire/MapProcessorLib/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MapProcessorLib")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MapProcessorLib")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f2f52768-d8d6-47ee-8ee8-ef34e3f2d195")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]