Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 0 insertions, 45 deletions

diff --git a/tests/OffscreenView.h b/tests/OffscreenView.h
deleted file mode 100644
index 8b98b29..0000000
--- a/tests/OffscreenView.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef OFFSCREENVIEW_H_
-#define OFFSCREENVIEW_H_
-
-#include "OffscreenContext.h"
-#include <Eigen/Core>
-#include <Eigen/Geometry>
-#include <string>
-#ifndef _MSC_VER
-#include <stdint.h>
-#endif
-
-class OffscreenView
-{
-public:
-	OffscreenView(size_t width, size_t height);
-	~OffscreenView();
-	void setRenderer(class Renderer* r);
-
-	void setCamera(const Eigen::Vector3d &pos, const Eigen::Vector3d &center);
-	void initializeGL();
-	void resizeGL(int w, int h);
-	void setupPerspective();
-	void setupOrtho(bool offset=false);
-	void paintGL();
-	bool save(const char *filename);
-	std::string getInfo();
-
-	GLint shaderinfo[11];
-	OffscreenContext *ctx;
-	size_t width;
-	size_t height;
-private:
-	Renderer *renderer;
-	double w_h_ratio;
-	Eigen::Vector3d object_rot;
-	Eigen::Vector3d camera_eye;
-	Eigen::Vector3d camera_center;
-
-	bool orthomode;
-	bool showaxes;
-	bool showfaces;
-	bool showedges;
-};
-
-#endif