From 44634eb42dbef7ffe41504ae88529d04b691f7d3 Mon Sep 17 00:00:00 2001
From: Ken Arroyo Ohori <g.a.k.arroyoohori@tudelft.nl>
Date: Wed, 8 Feb 2017 17:12:56 -0600
Subject: [PATCH] Remove implemented throws, add faces and materials

---
 src/ifcgeom/kernels/cgal/CgalConversionResult.cpp | 10 +++++-----
 src/ifcgeom/kernels/cgal/CgalConversionResult.h   |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp b/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp
index 529e692abb..7f16e43073 100644
--- a/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp
+++ b/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp
@@ -6,9 +6,9 @@ void IfcGeom::CgalShape::Triangulate(const IfcGeom::IteratorSettings & settings,
   const cgal_placement_t& trsf = dynamic_cast<const CgalPlacement*>(place)->trsf();
   
   // Apply transformation
-  for (auto &vertex: vertices(s)) {
-    vertex->point() = vertex->point().transform(trsf);
-  }
+//  for (auto &vertex: vertices(s)) {
+//    vertex->point() = vertex->point().transform(trsf);
+//  }
   
   // Triangulate the shape and compute the normals
   std::map<cgal_vertex_descriptor_t, Kernel::Vector_3> vertex_normals;
@@ -36,11 +36,11 @@ void IfcGeom::CgalShape::Triangulate(const IfcGeom::IteratorSettings & settings,
                    CGAL::to_double(current_halfedge->vertex()->point().cartesian(1)),
                    CGAL::to_double(current_halfedge->vertex()->point().cartesian(2)));
       for (int i = 0; i < 3; ++i) t->normals().push_back(CGAL::to_double(face_normals_map[face].cartesian(i)));
-//      t->faces().push_back(num_vertices);
+      t->faces().push_back(num_vertices);
       ++num_vertices;
       ++current_halfedge;
     } while (current_halfedge != face->facet_begin());
-//    t->material_ids().push_back(surface_style_id);
+    t->material_ids().push_back(surface_style_id);
     ++num_faces;
   }
 }
diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.h b/src/ifcgeom/kernels/cgal/CgalConversionResult.h
index 6a6e6157e8..940a598b67 100644
--- a/src/ifcgeom/kernels/cgal/CgalConversionResult.h
+++ b/src/ifcgeom/kernels/cgal/CgalConversionResult.h
@@ -40,12 +40,10 @@ namespace IfcGeom {
 		virtual void Multiply(const ConversionResultPlacement* other) {
 			// TODO: Check
       trsf_ = ((CgalPlacement *)other)->trsf_ * trsf_;
-			throw std::runtime_error("Not implemented");
 		}
 		virtual void PreMultiply(const ConversionResultPlacement* other) {
 			// TODO: Check
       trsf_ = trsf_ * ((CgalPlacement *)other)->trsf_;
-			throw std::runtime_error("Not implemented");
 		}
 		virtual ConversionResultPlacement* clone() const {
 			return new CgalPlacement(trsf_);