Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 19 insertions, 0 deletions

diff --git a/src/OffscreenContext.h b/src/OffscreenContext.h
new file mode 100644
index 0000000..e74e104
--- /dev/null
+++ b/src/OffscreenContext.h
@@ -0,0 +1,19 @@
+#ifndef OFFSCREENCONTEXT_H_
+#define OFFSCREENCONTEXT_H_
+
+// Here we implement a 'portability' pattern but since we are mixing
+// Objective-C with C++, it is a bit different. The main struct
+// isn't defined in the header, but instead inside the source code files
+
+#include <iostream>
+#include <fstream>
+#include <string>
+#include "fbo.h"
+
+struct OffscreenContext *create_offscreen_context(int w, int h);
+bool teardown_offscreen_context(OffscreenContext *ctx);
+bool save_framebuffer(OffscreenContext *ctx, const char * filename);
+bool save_framebuffer(OffscreenContext *ctx, std::ostream &output);
+std::string offscreen_context_getinfo(OffscreenContext *ctx);
+
+#endif