small cleanup - removed redundant dim field

src/CGAL_Nef_polyhedron.cc

@@ -6,37 +6,31 @@
 
 CGAL_Nef_polyhedron::CGAL_Nef_polyhedron(CGAL_Nef_polyhedron3 *p)
 {
-	if (p) {
+	if (p) p3.reset(p);
-		dim = 3;
-		p3.reset(p);
-	}
-	else {
-		dim = 0;
-	}
 }
 
 
 CGAL_Nef_polyhedron& CGAL_Nef_polyhedron::operator+=(const CGAL_Nef_polyhedron &other)
 {
-	if (this->dim == 3) (*this->p3) += (*other.p3);
+	(*this->p3) += (*other.p3);
 	return *this;
 }
 
 CGAL_Nef_polyhedron& CGAL_Nef_polyhedron::operator*=(const CGAL_Nef_polyhedron &other)
 {
-	if (this->dim == 3) (*this->p3) *= (*other.p3);
+	(*this->p3) *= (*other.p3);
 	return *this;
 }
 
 CGAL_Nef_polyhedron& CGAL_Nef_polyhedron::operator-=(const CGAL_Nef_polyhedron &other)
 {
-	if (this->dim == 3) (*this->p3) -= (*other.p3);
+	(*this->p3) -= (*other.p3);
 	return *this;
 }
 
 CGAL_Nef_polyhedron &CGAL_Nef_polyhedron::minkowski(const CGAL_Nef_polyhedron &other)
 {
-	if (this->dim == 3) (*this->p3) = CGAL::minkowski_sum_3(*this->p3, *other.p3);
+	(*this->p3) = CGAL::minkowski_sum_3(*this->p3, *other.p3);
 	return *this;
 }
 
@@ -45,7 +39,7 @@ size_t CGAL_Nef_polyhedron::memsize() const
 	if (this->isEmpty()) return 0;
 
 	size_t memsize = sizeof(CGAL_Nef_polyhedron);
-	if (this->dim == 3) memsize += this->p3->bytes();
+	memsize += this->p3->bytes();
 	return memsize;
 }
 
@@ -56,9 +50,8 @@ size_t CGAL_Nef_polyhedron::memsize() const
 */
 PolySet *CGAL_Nef_polyhedron::convertToPolyset() const
 {
-	if (this->isEmpty()) return new PolySet(this->dim);
+	if (this->isEmpty()) return new PolySet(3);
 	PolySet *ps = NULL;
-	if (this->dim == 3) {
 	CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION);
 	ps = new PolySet(3);
 	ps->setConvexity(this->convexity);
@@ -83,7 +76,6 @@ PolySet *CGAL_Nef_polyhedron::convertToPolyset() const
 		delete ps; ps = NULL;
 	}
 	CGAL::set_error_behaviour(old_behaviour);
-	}
 	return ps;
 }
 

src/CGAL_Nef_polyhedron.h

@@ -10,19 +10,18 @@
 class CGAL_Nef_polyhedron : public Geometry
 {
 public:
-	CGAL_Nef_polyhedron(int dim = 0) : dim(dim) {}
+	CGAL_Nef_polyhedron(CGAL_Nef_polyhedron3 *p = NULL);
-	CGAL_Nef_polyhedron(CGAL_Nef_polyhedron3 *p);
 	~CGAL_Nef_polyhedron() {}
 
 	virtual size_t memsize() const;
 	// FIXME: Implement, but we probably want a high-resolution BBox..
 	virtual BoundingBox getBoundingBox() const { assert(false && "not implemented"); }
 	virtual std::string dump() const;
-	virtual unsigned int getDimension() const { return this->dim; }
+	virtual unsigned int getDimension() const { return 3; }
   // Empty means it is a geometric node which has zero area/volume
 	virtual bool isEmpty() const { return !p3; }
 
-	void reset() { dim=0; p3.reset(); }
+	void reset() { p3.reset(); }
 	CGAL_Nef_polyhedron &operator+=(const CGAL_Nef_polyhedron &other);
 	CGAL_Nef_polyhedron &operator*=(const CGAL_Nef_polyhedron &other);
 	CGAL_Nef_polyhedron &operator-=(const CGAL_Nef_polyhedron &other);
@@ -31,8 +30,6 @@ public:
 	class PolySet *convertToPolyset() const;
 	void transform( const Transform3d &matrix );
 	shared_ptr<CGAL_Nef_polyhedron3> p3;
-protected:
-	int dim;
 };
 
 #endif

src/CGAL_Nef_polyhedron_DxfData.cc

@@ -38,17 +38,13 @@
 
 std::string CGAL_Nef_polyhedron::dump() const
 {
-	if (this->dim==3)
 	return OpenSCAD::dump_svg( *this->p3 );
-	else
-		return std::string("Nef Polyhedron with dimension != 2 or 3");
 }
 
 
 void CGAL_Nef_polyhedron::transform( const Transform3d &matrix )
 {
 	if (!this->isEmpty()) {
-		if (this->dim == 3) {
 		if (matrix.matrix().determinant() == 0) {
 			PRINT("Warning: Scaling a 3D object with 0 - removing object");
 			this->reset();
@@ -62,6 +58,5 @@ void CGAL_Nef_polyhedron::transform( const Transform3d &matrix )
 		}
 	}
 }
-}
 
 #endif // ENABLE_CGAL

src/GeometryEvaluator.cc

@@ -103,7 +103,7 @@ GeometryEvaluator::ResultObject GeometryEvaluator::applyToChildren3D(const Abstr
 		const shared_ptr<const Geometry> &chgeom = item.second;
 		shared_ptr<const CGAL_Nef_polyhedron> chN;
 		if (!chgeom) {
-			chN.reset(new CGAL_Nef_polyhedron(3)); // Create null polyhedron
+			chN.reset(new CGAL_Nef_polyhedron); // Create null polyhedron
 		}
 		else {
 			chN = dynamic_pointer_cast<const CGAL_Nef_polyhedron>(chgeom);

src/cgalutils.cc

@@ -402,7 +402,7 @@ void ZRemover::visit( CGAL_Nef_polyhedron3::Halffacet_const_handle hfacet )
 static CGAL_Nef_polyhedron *createNefPolyhedronFromPolySet(const PolySet &ps)
 {
 	assert(ps.getDimension() == 3);
-	if (ps.isEmpty()) return new CGAL_Nef_polyhedron(3);
+	if (ps.isEmpty()) return new CGAL_Nef_polyhedron();
 
 	CGAL_Nef_polyhedron3 *N = NULL;
 	bool plane_error = false;