Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 31 insertions, 0 deletions

diff --git a/src/OffscreenView.h b/src/OffscreenView.h
new file mode 100644
index 0000000..8a3daaf
--- /dev/null
+++ b/src/OffscreenView.h
@@ -0,0 +1,31 @@
+#ifndef OFFSCREENVIEW_H_
+#define OFFSCREENVIEW_H_
+
+#include "OffscreenContext.h"
+#include <Eigen/Core>
+#include <Eigen/Geometry>
+#include <string>
+#ifndef _MSC_VER
+#include <stdint.h>
+#endif
+#include "system-gl.h"
+#include <iostream>
+#include "GLView.h"
+
+class OffscreenView : public GLView
+{
+public:
+	OffscreenView(size_t width, size_t height);
+	~OffscreenView();
+	bool save(std::ostream &output);
+	OffscreenContext *ctx;
+
+	// overrides
+	bool save(const char *filename);
+	std::string getRendererInfo() const;
+#ifdef ENABLE_OPENCSG
+	void display_opencsg_warning();
+#endif
+};
+
+#endif