merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 28 insertions, 0 deletions

diff --git a/src/CGALCache.h b/src/CGALCache.h
new file mode 100644
index 0000000..7d3a2d9
--- /dev/null
+++ b/src/CGALCache.h
@@ -0,0 +1,28 @@
+#ifndef CGALCACHE_H_
+#define CGALCACHE_H_
+
+#include "myqhash.h"
+#include <QCache>
+
+/*!
+*/
+class CGALCache
+{
+public:	
+	CGALCache(size_t limit = 100000) : cache(limit) {}
+
+	static CGALCache *instance() { if (!inst) inst = new CGALCache; return inst; }
+
+	bool contains(const std::string &id) const { return this->cache.contains(id); }
+	const class CGAL_Nef_polyhedron &get(const std::string &id) const { return *this->cache[id]; }
+	void insert(const std::string &id, const CGAL_Nef_polyhedron &N);
+	void clear() { cache.clear(); }
+	void print();
+
+private:
+	static CGALCache *inst;
+
+	QCache<std::string, CGAL_Nef_polyhedron> cache;
+};
+
+#endif