Merge branch 'master' of github.com:openscad/openscad into issue159

1 files changed, 6 insertions, 3 deletions

diff --git a/src/CGAL_Nef_polyhedron.h b/src/CGAL_Nef_polyhedron.h
index 694b420..d949a2a 100644
--- a/src/CGAL_Nef_polyhedron.h
+++ b/src/CGAL_Nef_polyhedron.h
@@ -8,19 +8,22 @@
 class CGAL_Nef_polyhedron
 {
 public:
-	CGAL_Nef_polyhedron() : dim(0) {}
+	CGAL_Nef_polyhedron(int dim = 0) : dim(dim) {}
 	CGAL_Nef_polyhedron(CGAL_Nef_polyhedron2 *p);
 	CGAL_Nef_polyhedron(CGAL_Nef_polyhedron3 *p);
 	~CGAL_Nef_polyhedron() {}
 
-	bool empty() const { return (dim == 0 || (!p2 && !p3)); }
+  // Empty means it is a geometric node which has zero area/volume
+	bool isEmpty() const { return (dim > 0 && !p2 && !p3); }
+  // Null means the node doesn't contain any geometry (for whatever reason)
+	bool isNull() const { return !p2 && !p3; }
 	void reset() { dim=0; p2.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);
 	CGAL_Nef_polyhedron &minkowski(const CGAL_Nef_polyhedron &other);
 	CGAL_Nef_polyhedron copy() const;
-	std::string dump_p2() const;
+	std::string dump() const;
 	int weight() const;
 	class PolySet *convertToPolyset();
 	class DxfData *convertToDxfData() const;