Merge pull request #11 from CptWesley/texture-filter#10

Texture filter

Author: CptWesley

src/Brush.cs

@@ -42,7 +42,7 @@ private static ClippingPlane[] CreateClippingPlanes(string[] code)
                     Vertex v2 = Vertex.CreateFromCode(m.Groups[5].ToString());
                     Vertex v3 = Vertex.CreateFromCode(m.Groups[9].ToString());
 
-                    planes.Add(new ClippingPlane(v1, v2, v3));
+                    planes.Add(new ClippingPlane(v1, v2, v3, m.Groups[13].ToString()));
                 }
             }
 

src/ClippingPlane.cs

@@ -1,34 +1,24 @@
-using System.Collections.Generic;
-
+
 namespace RadiantMapToWavefrontObj
 {
-    public class ClippingPlane
+    public class ClippingPlane : Plane
     {
-        public readonly double D;
-        public readonly Vector Normal;
-
-        public double A => Normal.X;
-        public double B => Normal.Y;
-        public double C => Normal.Z;
+        public string Texture { get; private set; }
 
         // Constructor for a clipping plane.
-        public ClippingPlane(Vertex v1, Vertex v2, Vertex v3)
+        public ClippingPlane(Vertex v1, Vertex v2, Vertex v3, string texture) : base(v1, v2, v3)
         {
-            Vector vector1 = new Vector(v2.X - v1.X, v2.Y - v1.Y, v2.Z - v1.Z).Unit();
-            Vector vector2 = new Vector(v3.X - v1.X, v3.Y - v1.Y, v3.Z - v1.Z).Unit();
-
-            Normal = Vector.CrossProduct(vector1, vector2).Unit();
-            D = -(A * v2.X + B * v2.Y + C * v2.Z);
+            Texture = texture;
         }
 
-        // Returns the object as a string.
-        public override string ToString()
+        // Set the texture of a clipping plane.
+        public void SetTexture(string texture)
         {
-            return "<" + A + ", " + B + ", " + C + ", " + D + ">";
+            Texture = texture;
         }
 
         // Checks if three clipping planes intersect and if so, returns an intersection point.
-        public static bool FindIntersection(ClippingPlane a, ClippingPlane b, ClippingPlane c, out Vertex intersection)
+        public static bool FindIntersection(Plane a, Plane b, Plane c, out Vertex intersection)
         {
             // Calculates the possible intersection point using the Cramer's rule.
             double det = Determinant(a.A, a.B, a.C, b.A, b.B, b.C, c.A, c.B, c.C);
@@ -38,28 +28,16 @@ public static bool FindIntersection(ClippingPlane a, ClippingPlane b, ClippingPl
                 return false;
             }
 
-            double x = Determinant(a.D, a.B, a.C, b.D, b.B, b.C, c.D, c.B, c.C)/det;
-            double y = Determinant(a.A, a.D, a.C, b.A, b.D, b.C, c.A, c.D, c.C)/det;
-            double z = Determinant(a.A, a.B, a.D, b.A, b.B, b.D, c.A, c.B, c.D)/det;
+            double x = Determinant(a.D, a.B, a.C, b.D, b.B, b.C, c.D, c.B, c.C) / det;
+            double y = Determinant(a.A, a.D, a.C, b.A, b.D, b.C, c.A, c.D, c.C) / det;
+            double z = Determinant(a.A, a.B, a.D, b.A, b.B, b.D, c.A, c.B, c.D) / det;
 
             intersection = new Vertex(x, y, z);
             intersection.SetNormal((a.Normal + b.Normal + c.Normal).Unit());
 
             return true;
         }
 
-        // Creates an array of all vertices that lie on this plane.
-        public Vertex[] FindVerticesInPlane(Vertex[] vertices)
-        {
-            List<Vertex> res = new List<Vertex>();
-            foreach (Vertex v in vertices)
-            {
-                if (v.OnPlane(this))
-                    res.Add(v);
-            }
-            return res.ToArray();
-        }
-
         // Calculates the determinant of a 2x2 matrix. (Can be done less verbose...)
         private static double Determinant(double a11, double a12, double a21, double a22)
         {

src/Face.cs

@@ -5,6 +5,7 @@ namespace RadiantMapToWavefrontObj
     public class Face
     {
         private Vertex[] _vertices;
+        public string Texture { get; private set; }
 
         // Empty contructor that creates an empty face.
         public Face()
@@ -27,6 +28,12 @@ public Face(Vertex a, Vertex b, Vertex c)
             _vertices[2] = c;
         }
 
+        // Set the texture of a clipping plane.
+        public void SetTexture(string texture)
+        {
+            Texture = texture;
+        }
+
         // Returns the vertices of the face.
         public Vertex[] GetVertices()
         {
@@ -104,6 +111,12 @@ public Edge[] GetEdges()
             return edges;
         }
 
+        // Checks if a face contains a certain vertex.
+        public bool Contains(Vertex vertex)
+        {
+            return _vertices.Contains(vertex);
+        }
+
         // Returns a stringified version of the object.
         public override string ToString()
         {

src/ObjObject.cs

@@ -5,8 +5,8 @@ namespace RadiantMapToWavefrontObj
 {
     public class ObjObject
     {
-        public readonly Vertex[] Vertices;
-        public readonly Face[] Faces;
+        public Vertex[] Vertices { get; private set; }
+        public Face[] Faces { get; private set; }
         private string _name;
 
         // Constructor for an .obj object.
@@ -15,6 +15,7 @@ public ObjObject(string name, Vertex[] vertices, Face[] faces)
             _name = name;
             Vertices = vertices;
             Faces = faces;
+            Cleanup();
         }
 
         // Returns the name of the object.
@@ -72,6 +73,52 @@ public string ToCode(double scale, int faceOffset)
             return res;
         }
 
+        // Removes all faces containing a texture listed in the filter.
+        public void FilterTextures(string[] filter)
+        {
+            if (Faces == null)
+                return;
+
+            List<Face> newFaces = new List<Face>();
+
+            foreach (Face face in Faces)
+            {
+                if (!filter.Contains(face.Texture))
+                    newFaces.Add(face);
+            }
+
+            Faces = newFaces.ToArray();
+            Cleanup();
+        }
+
+        // Remove all vertices that have no faces.
+        private void Cleanup()
+        {
+            if (Faces == null)
+                return;
+
+            List<Vertex> newVertices = new List<Vertex>();
+
+            foreach (Vertex vertex in Vertices)
+            {
+                bool contained = false;
+
+                foreach (Face face in Faces)
+                {
+                    if (face.Contains(vertex))
+                    {
+                        contained = true;
+                        break;
+                    }
+                }
+
+                if (contained)
+                    newVertices.Add(vertex);
+            }
+
+            Vertices = newVertices.ToArray();
+        }
+
         // Converts a radiant brush to an obj object.
         public static ObjObject CreateFromBrush(string name, Brush brush)
         {
@@ -153,6 +200,7 @@ private static Face[] CreateFaces(Vertex[] vertices, ClippingPlane[] planes)
                 foreach (Face face in BowyerWatson(verts))
                 {
                     FixNormal(face, planes[i].Normal);
+                    face.SetTexture(planes[i].Texture);
                     faces.Add(face);
                 }
             }
@@ -251,7 +299,7 @@ private static Face FindSuperTriangle(Vertex[] vertices)
                     maxZ = v.Z;
             }
 
-            ClippingPlane plane = new ClippingPlane(vertices[0], vertices[1], vertices[2]);
+            Plane plane = new Plane(vertices[0], vertices[1], vertices[2]);
 
             Vertex a = new Vertex(minX, minY, minZ);
             Vertex b = new Vertex(maxX, maxY, maxZ);

src/Plane.cs

@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+
+namespace RadiantMapToWavefrontObj
+{
+    public class Plane
+    {
+        public readonly double D;
+        public readonly Vector Normal;
+
+        public double A => Normal.X;
+        public double B => Normal.Y;
+        public double C => Normal.Z;
+
+        // Constructor for a plane.
+        public Plane(Vertex v1, Vertex v2, Vertex v3)
+        {
+            Vector vector1 = new Vector(v2.X - v1.X, v2.Y - v1.Y, v2.Z - v1.Z).Unit();
+            Vector vector2 = new Vector(v3.X - v1.X, v3.Y - v1.Y, v3.Z - v1.Z).Unit();
+
+            Normal = Vector.CrossProduct(vector1, vector2).Unit();
+            D = -(A * v2.X + B * v2.Y + C * v2.Z);
+        }
+
+        // Returns the object as a string.
+        public override string ToString()
+        {
+            return "<" + A + ", " + B + ", " + C + ", " + D + ">";
+        }
+
+        // Creates an array of all vertices that lie on this plane.
+        public Vertex[] FindVerticesInPlane(Vertex[] vertices)
+        {
+            List<Vertex> res = new List<Vertex>();
+            foreach (Vertex v in vertices)
+            {
+                if (v.OnPlane(this))
+                    res.Add(v);
+            }
+            return res.ToArray();
+        }
+    }
+}

src/Program.cs

@@ -9,6 +9,7 @@ internal class Program
     {
         private static double _scale = 0.01;
         private static bool _autoclose = false;
+        private static string[] _textureFilter = new string[0];
 
         static void Main(string[] args)
         {
@@ -49,6 +50,9 @@ private static void ConvertFile(string path)
             RadiantMap map = RadiantMap.Parse(path);
             WavefrontObj obj = WavefrontObj.CreateFromRadiantMap(map);
 
+            if (_textureFilter.Length > 0)
+                obj.FilterTextures(_textureFilter);
+
             obj.SaveFile(Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path)) + ".obj", _scale);
 
             DateTime endTime = DateTime.Now;
@@ -58,7 +62,7 @@ private static void ConvertFile(string path)
         // Handle a settings argument.
         private static void HandleArgument(string arg)
         {
-            string pattern = @"-(\w+)=(\w+)";
+            string pattern = @"-(\w+)=(\S+)";
             Regex regex = new Regex(pattern, RegexOptions.IgnoreCase);
             Match m = regex.Match(arg);
             if (m.Success)
@@ -79,6 +83,11 @@ private static void HandleArgument(string arg)
                     if (Double.TryParse(mode, out scale))
                         _scale = scale;
                 }
+                else if (type == "filter")
+                {
+                    if (File.Exists(mode))
+                        _textureFilter = File.ReadAllLines(mode);
+                }
             }
         }
     }

src/RadiantMapToWavefrontObj.csproj

@@ -108,6 +108,7 @@
     <Compile Include="ArrayExtension.cs" />
     <Compile Include="Brush.cs" />
     <Compile Include="ClippingPlane.cs" />
+    <Compile Include="Plane.cs" />
     <Compile Include="Edge.cs" />
     <Compile Include="Face.cs" />
     <Compile Include="LineSegment.cs" />

src/Vertex.cs

@@ -43,7 +43,7 @@ public static Vertex CreateFromCode(string code)
         }
 
         // Check if this vertex lies on a certain clipping plane.
-        public bool OnPlane(ClippingPlane plane)
+        public bool OnPlane(Plane plane)
         {
             double left = X * plane.A + Y * plane.B + Z * plane.C;
             double right = plane.D;

src/WavefrontObj.cs

@@ -5,27 +5,23 @@ namespace RadiantMapToWavefrontObj
 {
     public class WavefrontObj
     {
-        public readonly ObjObject[] Objects;
+        public ObjObject[] Objects { get; private set; }
 
         // Constructor for an entire wavefront .obj file object.
         public WavefrontObj(ObjObject[] objects)
         {
             Objects = objects;
+            Cleanup();
         }
 
-        // Converts a RadiantMap object to a WavefrontObj object.
-        public static WavefrontObj CreateFromRadiantMap(RadiantMap map)
+        // Removes all faces containing a texture listed in the filter from all subobjects.
+        public void FilterTextures(string[] filter)
         {
-            List<ObjObject> objects = new List<ObjObject>();
-
-            for (int i = 0; i < map.Brushes.Length; ++i)
+            foreach (ObjObject obj in Objects)
             {
-                Brush brush = map.Brushes[i];
-                ObjObject obj = ObjObject.CreateFromBrush("Brush_" + i, brush);
-                objects.Add(obj);
+                obj.FilterTextures(filter);
             }
-
-            return new WavefrontObj(objects.ToArray());
+            Cleanup();
         }
 
         // Returns .obj formatted text of this object.
@@ -50,5 +46,35 @@ public void SaveFile(string path, double scale)
         {
             File.WriteAllText(path, ToCode(scale));
         }
+
+        // Removes objects that lack faces or vertices.
+        private void Cleanup()
+        {
+            List<ObjObject> newObjects = new List<ObjObject>();
+
+            foreach (ObjObject obj in Objects)
+            {
+                if (obj.Faces != null && obj.Faces.Length > 0 && obj.Vertices.Length > 0)
+                    newObjects.Add(obj);
+            }
+
+            Objects = newObjects.ToArray();
+
+        }
+
+        // Converts a RadiantMap object to a WavefrontObj object.
+        public static WavefrontObj CreateFromRadiantMap(RadiantMap map)
+        {
+            List<ObjObject> objects = new List<ObjObject>();
+
+            for (int i = 0; i < map.Brushes.Length; ++i)
+            {
+                Brush brush = map.Brushes[i];
+                ObjObject obj = ObjObject.CreateFromBrush("Brush_" + i, brush);
+                objects.Add(obj);
+            }
+
+            return new WavefrontObj(objects.ToArray());
+        }
     }
 }