* Reads ascii correctly. Time for a refactor.

AsciiSTL.cc

@@ -31,7 +31,7 @@ static Vertex readVertex(std::istream& in, const string expected) {
 static Triangle readTriangle(std::istream& in, Mesh& mesh) {
   Triangle t;
   expect(in, "facet");
-  Vertex n = readVertex(in,"normal");
+  t.normal() = readVertex(in,"normal");
 
   expect(in, "outer");
   expect(in, "loop");

BinarySTL.cc

@@ -45,10 +45,10 @@ Mesh loadBinarySTL(std::istream& in) {
   for (int f = 0; f < facets && !in.eof(); f++) {
     // TODO: check that file is long enough! We can't have this
     // block.
-    // Read normal and discard (for now)
-    Vertex normal = readVertex(in);
-    Vertex v[3];
+    // Read normal
     Triangle t;
+    t.normal() = readVertex(in);
+    Vertex v[3];
     for (int i =0; i < 3; i++) {
       v[i] = readVertex(in);
       t[i] = mesh.vertices.addVertex(v[i]);

Mesh.hh

@@ -52,10 +52,12 @@ public:
 class Triangle {
 private:
   int v[3];
+  Vertex normalVect;
 public:
   Triangle() {}
   int& operator[](int idx) { return v[idx]; }
   const int& operator[](int idx) const { return v[idx]; }
+  Vertex& normal() { return normalVect; }
 };
 
 typedef std::pair<int,int> intpair;